diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index bd53bc7..977c22e 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -256,38 +256,38 @@ public final class R {
public static final int accent_material_light = 0x7f05000f;
public static final int background_floating_material_dark = 0x7f050010;
public static final int background_floating_material_light = 0x7f050011;
- public static final int background_material_dark = 0x7f050013;
- public static final int background_material_light = 0x7f050014;
- public static final int bright_foreground_disabled_material_dark = 0x7f050017;
- public static final int bright_foreground_disabled_material_light = 0x7f050018;
- public static final int bright_foreground_inverse_material_dark = 0x7f050019;
- public static final int bright_foreground_inverse_material_light = 0x7f05001a;
- public static final int bright_foreground_material_dark = 0x7f05001b;
- public static final int bright_foreground_material_light = 0x7f05001c;
- public static final int button_material_dark = 0x7f05001d;
- public static final int button_material_light = 0x7f05001e;
- public static final int dim_foreground_disabled_material_dark = 0x7f050022;
- public static final int dim_foreground_disabled_material_light = 0x7f050023;
- public static final int dim_foreground_material_dark = 0x7f050024;
- public static final int dim_foreground_material_light = 0x7f050025;
- public static final int foreground_material_dark = 0x7f050026;
- public static final int foreground_material_light = 0x7f050027;
- public static final int highlighted_text_material_dark = 0x7f05002a;
- public static final int highlighted_text_material_light = 0x7f05002b;
- public static final int hint_foreground_material_dark = 0x7f05002c;
- public static final int hint_foreground_material_light = 0x7f05002d;
- public static final int material_blue_grey_800 = 0x7f05002f;
- public static final int material_blue_grey_900 = 0x7f050030;
- public static final int material_blue_grey_950 = 0x7f050031;
- public static final int material_deep_teal_200 = 0x7f050032;
- public static final int material_deep_teal_500 = 0x7f050033;
- public static final int material_grey_100 = 0x7f050034;
- public static final int material_grey_300 = 0x7f050035;
- public static final int material_grey_50 = 0x7f050036;
- public static final int material_grey_600 = 0x7f050037;
- public static final int material_grey_800 = 0x7f050038;
- public static final int material_grey_850 = 0x7f050039;
- public static final int material_grey_900 = 0x7f05003a;
+ public static final int background_material_dark = 0x7f050012;
+ public static final int background_material_light = 0x7f050013;
+ public static final int bright_foreground_disabled_material_dark = 0x7f050018;
+ public static final int bright_foreground_disabled_material_light = 0x7f050019;
+ public static final int bright_foreground_inverse_material_dark = 0x7f05001a;
+ public static final int bright_foreground_inverse_material_light = 0x7f05001b;
+ public static final int bright_foreground_material_dark = 0x7f05001c;
+ public static final int bright_foreground_material_light = 0x7f05001d;
+ public static final int button_material_dark = 0x7f05001e;
+ public static final int button_material_light = 0x7f05001f;
+ public static final int dim_foreground_disabled_material_dark = 0x7f050023;
+ public static final int dim_foreground_disabled_material_light = 0x7f050024;
+ public static final int dim_foreground_material_dark = 0x7f050025;
+ public static final int dim_foreground_material_light = 0x7f050026;
+ public static final int foreground_material_dark = 0x7f050027;
+ public static final int foreground_material_light = 0x7f050028;
+ public static final int highlighted_text_material_dark = 0x7f050029;
+ public static final int highlighted_text_material_light = 0x7f05002a;
+ public static final int hint_foreground_material_dark = 0x7f05002b;
+ public static final int hint_foreground_material_light = 0x7f05002c;
+ public static final int material_blue_grey_800 = 0x7f05002d;
+ public static final int material_blue_grey_900 = 0x7f05002e;
+ public static final int material_blue_grey_950 = 0x7f05002f;
+ public static final int material_deep_teal_200 = 0x7f050030;
+ public static final int material_deep_teal_500 = 0x7f050031;
+ public static final int material_grey_100 = 0x7f050032;
+ public static final int material_grey_300 = 0x7f050033;
+ public static final int material_grey_50 = 0x7f050034;
+ public static final int material_grey_600 = 0x7f050035;
+ public static final int material_grey_800 = 0x7f050036;
+ public static final int material_grey_850 = 0x7f050037;
+ public static final int material_grey_900 = 0x7f050038;
public static final int primary_dark_material_dark = 0x7f05003c;
public static final int primary_dark_material_light = 0x7f05003d;
public static final int primary_material_dark = 0x7f05003e;
@@ -298,16 +298,16 @@ public final class R {
public static final int primary_text_disabled_material_light = 0x7f050043;
public static final int ripple_material_dark = 0x7f050045;
public static final int ripple_material_light = 0x7f050046;
- public static final int secondary_text_default_material_dark = 0x7f050047;
- public static final int secondary_text_default_material_light = 0x7f050048;
- public static final int secondary_text_disabled_material_dark = 0x7f050049;
- public static final int secondary_text_disabled_material_light = 0x7f05004a;
- public static final int switch_thumb_disabled_material_dark = 0x7f05004b;
- public static final int switch_thumb_disabled_material_light = 0x7f05004c;
- public static final int switch_thumb_material_dark = 0x7f05004d;
- public static final int switch_thumb_material_light = 0x7f05004e;
- public static final int switch_thumb_normal_material_dark = 0x7f05004f;
- public static final int switch_thumb_normal_material_light = 0x7f050050;
+ public static final int secondary_text_default_material_dark = 0x7f05004a;
+ public static final int secondary_text_default_material_light = 0x7f05004b;
+ public static final int secondary_text_disabled_material_dark = 0x7f05004c;
+ public static final int secondary_text_disabled_material_light = 0x7f05004d;
+ public static final int switch_thumb_disabled_material_dark = 0x7f05004f;
+ public static final int switch_thumb_disabled_material_light = 0x7f050050;
+ public static final int switch_thumb_material_dark = 0x7f050051;
+ public static final int switch_thumb_material_light = 0x7f050052;
+ public static final int switch_thumb_normal_material_dark = 0x7f050053;
+ public static final int switch_thumb_normal_material_light = 0x7f050054;
}
public static final class dimen {
public static final int abc_action_bar_content_inset_material = 0x7f060000;
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 6d734bf..e8ea3e2 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1352,9 +1352,9 @@
Icy MountainsTestcaveMysterious fireworld
- #ffda45#f11e6f#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106#9d000000#5b000000#3d000000#cf664c170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.585.1%0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Task completedLevel UpGAME OVERLEVEL FINISHEDToolsTo menuTry againRestartNext levelRestart level %dNext level: %dGo to the next world:\n%sLOADING...ContinueRestartExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Time (Lv12)Level: 24Level: %dReset progressToolshopRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %d%1$s (Lv%2$d)NoneTimeRadiusForceMax.YesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedTo select a tool just click on itDrück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNächstes LevelNeustart: Level %dNächstes Level: %dGehe zur nächsten Welt:\n%sLÄDT...WeiterNeustartBeendenSpielenErste Welt abschließen!Zeit (Lv12)Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseNichtsZeitRadiusKraftJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelAufgabe abgeschlossenToolsToolshopNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neues Aussehen und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetzte die Rampe vor die Lücke
\ No newline at end of file
+ Drück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNächstes LevelNeustart: Level %dNächstes Level: %dGehe zur nächsten Welt:\n%sLÄDT...WeiterNeustartBeendenSpielenErste Welt abschließen!Zeit (Lv12)Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseNichtsZeitRadiusKraftJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelAufgabe abgeschlossenToolsToolshopNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neues Aussehen und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetzte die Rampe vor die Lücke
\ No newline at end of file
diff --git a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
index 4edcdd7..6651ffb 100644
--- a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -18,7 +18,6 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:testOnly="true"
android:theme="@style/AppTheme" >
implements LevelButtonOnC
int levelCount = levelPack.getLevels().size();
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(15, 15, 15, 15);
for (Level level : levelPack.getLevels())
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
index 792f49a..2193d2d 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
@@ -62,7 +62,7 @@ public class ToolShopScreen extends Screen implements View.OnCli
layout.findViewById(R.id.toolshop_toolinspector));
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(10, 0, 10, 0);
int i = 0;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
index be381dd..1d3ea39 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
@@ -29,7 +29,7 @@ public class WorldsScreen extends Screen implements WorldButtonO
topBar = super.createTopBar(R.id.worlds_topbar);
buttonLayout = (LinearLayout) layout.findViewById(R.id.worlds_layout);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.gravity = Gravity.CENTER_VERTICAL;
params.setMargins(25, 0, 25, 0);
diff --git a/app/src/main/java/de/frajul/endlessroll/views/LevelupMessage.java b/app/src/main/java/de/frajul/endlessroll/views/LevelupMessage.java
index 7fd32a0..fe43920 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/LevelupMessage.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/LevelupMessage.java
@@ -44,7 +44,7 @@ public class LevelupMessage implements View.OnClickListener, BountyMessage.Scree
}
public void show(int level) {
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 5, 0, 5);
levelView.setText(level + "");
diff --git a/app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java b/app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java
index 940af76..c371564 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java
@@ -48,7 +48,7 @@ public class PlayerShapeButton implements View.OnClickListener {
private LinearLayout.LayoutParams createLayoutParams(boolean marginToRight) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
if (marginToRight)
params.setMargins(0, 0, 60, 0);
return params;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/TaskCompletedMessage.java b/app/src/main/java/de/frajul/endlessroll/views/TaskCompletedMessage.java
index ca7281c..ae6a6f2 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/TaskCompletedMessage.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/TaskCompletedMessage.java
@@ -35,7 +35,7 @@ public class TaskCompletedMessage implements View.OnClickListener, BountyMessage
}
public void show(List shapes) {
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 8, 0, 8);
for (PlayerShape shape : shapes)
diff --git a/app/src/main/res/drawable/currency_star.png b/app/src/main/res/drawable/currency_star.png
index f4e10e2..8161dce 100644
Binary files a/app/src/main/res/drawable/currency_star.png and b/app/src/main/res/drawable/currency_star.png differ
diff --git a/app/src/main/res/drawable/currency_star_empty.png b/app/src/main/res/drawable/currency_star_empty.png
index 98c486b..9ecbcf1 100644
Binary files a/app/src/main/res/drawable/currency_star_empty.png and b/app/src/main/res/drawable/currency_star_empty.png differ
diff --git a/app/src/main/res/drawable/tutorial_to_toolshop.png b/app/src/main/res/drawable/tutorial_to_toolshop.png
index ac03f76..bb68f17 100644
Binary files a/app/src/main/res/drawable/tutorial_to_toolshop.png and b/app/src/main/res/drawable/tutorial_to_toolshop.png differ
diff --git a/app/src/main/res/drawable/xml_background_exit_confirm_dialog.xml b/app/src/main/res/drawable/xml_background_exit_confirm_dialog.xml
index b89df32..9fb5cd6 100644
--- a/app/src/main/res/drawable/xml_background_exit_confirm_dialog.xml
+++ b/app/src/main/res/drawable/xml_background_exit_confirm_dialog.xml
@@ -6,5 +6,5 @@
android:color="@android:color/white"/>
+ android:color="@color/secondary" />
diff --git a/app/src/main/res/drawable/xml_background_levelbutton.xml b/app/src/main/res/drawable/xml_background_levelbutton.xml
index f13fc43..637dc4f 100644
--- a/app/src/main/res/drawable/xml_background_levelbutton.xml
+++ b/app/src/main/res/drawable/xml_background_levelbutton.xml
@@ -2,13 +2,19 @@
-
+
+ android:width="2dp"
+ android:color="@color/secondary" />
diff --git a/app/src/main/res/drawable/xml_background_topbar.xml b/app/src/main/res/drawable/xml_background_topbar.xml
new file mode 100644
index 0000000..76bc41e
--- /dev/null
+++ b/app/src/main/res/drawable/xml_background_topbar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/xml_background_worldbutton.xml b/app/src/main/res/drawable/xml_background_worldbutton.xml
index 7d33c97..c32a156 100644
--- a/app/src/main/res/drawable/xml_background_worldbutton.xml
+++ b/app/src/main/res/drawable/xml_background_worldbutton.xml
@@ -5,8 +5,8 @@
+ android:color="@color/secondary" />
diff --git a/app/src/main/res/drawable/xml_layers_levelprogressbar.xml b/app/src/main/res/drawable/xml_layers_levelprogressbar.xml
new file mode 100644
index 0000000..6952ecf
--- /dev/null
+++ b/app/src/main/res/drawable/xml_layers_levelprogressbar.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/game.xml b/app/src/main/res/layout/game.xml
index bbb6518..51f904e 100644
--- a/app/src/main/res/layout/game.xml
+++ b/app/src/main/res/layout/game.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:text="@string/game_playerprogress_placeholder"
- android:textColor="@color/game_progress_text"
+ android:textColor="@color/secondary"
android:textSize="22sp"/>
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_game_over"
- android:textColor="@color/game_over"
+ android:textColor="@color/red"
android:textSize="55sp"/>
diff --git a/app/src/main/res/layout/goal_message.xml b/app/src/main/res/layout/goal_message.xml
index 65c43b5..81648e3 100644
--- a/app/src/main/res/layout/goal_message.xml
+++ b/app/src/main/res/layout/goal_message.xml
@@ -2,7 +2,7 @@
diff --git a/app/src/main/res/layout/goal_message_levelbutton.xml b/app/src/main/res/layout/goal_message_levelbutton.xml
index 9635614..755444e 100644
--- a/app/src/main/res/layout/goal_message_levelbutton.xml
+++ b/app/src/main/res/layout/goal_message_levelbutton.xml
@@ -12,7 +12,7 @@
android:layout_gravity="center_horizontal"
android:text="@string/placeholder_textview"
android:textAlignment="center"
- android:textColor="@color/message_views"
+ android:textColor="@color/message_buttons"
android:textSize="30sp"/>
+ android:background="@color/background_message">
+ android:background="@color/primary">
diff --git a/app/src/main/res/layout/short_menu.xml b/app/src/main/res/layout/short_menu.xml
index 060a1ed..ea2c16e 100644
--- a/app/src/main/res/layout/short_menu.xml
+++ b/app/src/main/res/layout/short_menu.xml
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/short_menu_continue"
- android:textColor="@color/level_finished"
+ android:textColor="@color/secondary"
android:textSize="40sp"/>
diff --git a/app/src/main/res/layout/tool_inspector.xml b/app/src/main/res/layout/tool_inspector.xml
index 9c2a85b..167233e 100644
--- a/app/src/main/res/layout/tool_inspector.xml
+++ b/app/src/main/res/layout/tool_inspector.xml
@@ -2,9 +2,9 @@
+ android:background="@drawable/xml_background_topbar">
diff --git a/app/src/main/res/layout/world_button.xml b/app/src/main/res/layout/world_button.xml
index 88fc644..5d6b876 100644
--- a/app/src/main/res/layout/world_button.xml
+++ b/app/src/main/res/layout/world_button.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/world_button_title_placeholder"
- android:textColor="#ff2200"
+ android:textColor="#ff0000"
android:textSize="30sp"/>
- #ffda45
- #f11e6f
- #39be27
- #ffb405
- #daf10d
+
+
+ #17b3f5
+ #1791f5
+ #ffb637
+ #ffeb37
+ #ff8e37
+ #e2ffb637
+
+ #ff0000
+ #000000
+ #ffffff
+
+ #daf10d
+
#db911c0f#dbfff200#e5dc1522
@@ -14,11 +24,12 @@
#60715f#db41e42b#b3d700
- #f0f41e02
- #f0f28117
- #f0d7b106
- #9d000000
+
+ #f41602
+ #f47b02
+ #f4d802
+
+ #9d000000#5b000000#3d000000
- #cf664c
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3295a5b..d2c52a1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@