julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed style and colors

Browse Source
This commit is contained in:
= 2018-02-14 16:04:53 +01:00
parent 5302ac0d00
commit ee7536ba5f
31 changed files with 226 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View File

@ -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;

10
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

1
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -18,7 +18,6 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" >
<activity
android:name="de.frajul.endlessroll.main.GameActivity"

152
app/build/intermediates/symbols/debug/R.txt
View File

@ -253,48 +253,48 @@ int color accent_material_dark 0x7f05000e
int color accent_material_light 0x7f05000f
int color background_floating_material_dark 0x7f050010
int color background_floating_material_light 0x7f050011
int color background_levelup_message 0x7f050012
int color background_material_dark 0x7f050013
int color background_material_light 0x7f050014
int color background_material_dark 0x7f050012
int color background_material_light 0x7f050013
int color background_message 0x7f050014
int color background_short_menu 0x7f050015
int color background_tutorial 0x7f050016
int color bright_foreground_disabled_material_dark 0x7f050017
int color bright_foreground_disabled_material_light 0x7f050018
int color bright_foreground_inverse_material_dark 0x7f050019
int color bright_foreground_inverse_material_light 0x7f05001a
int color bright_foreground_material_dark 0x7f05001b
int color bright_foreground_material_light 0x7f05001c
int color button_material_dark 0x7f05001d
int color button_material_light 0x7f05001e
int color countdown1 0x7f05001f
int color countdown2 0x7f050020
int color countdown3 0x7f050021
int color dim_foreground_disabled_material_dark 0x7f050022
int color dim_foreground_disabled_material_light 0x7f050023
int color dim_foreground_material_dark 0x7f050024
int color dim_foreground_material_light 0x7f050025
int color foreground_material_dark 0x7f050026
int color foreground_material_light 0x7f050027
int color game_over 0x7f050028
int color game_progress_text 0x7f050029
int color highlighted_text_material_dark 0x7f05002a
int color highlighted_text_material_light 0x7f05002b
int color hint_foreground_material_dark 0x7f05002c
int color hint_foreground_material_light 0x7f05002d
int color level_finished 0x7f05002e
int color material_blue_grey_800 0x7f05002f
int color material_blue_grey_900 0x7f050030
int color material_blue_grey_950 0x7f050031
int color material_deep_teal_200 0x7f050032
int color material_deep_teal_500 0x7f050033
int color material_grey_100 0x7f050034
int color material_grey_300 0x7f050035
int color material_grey_50 0x7f050036
int color material_grey_600 0x7f050037
int color material_grey_800 0x7f050038
int color material_grey_850 0x7f050039
int color material_grey_900 0x7f05003a
int color message_views 0x7f05003b
int color black 0x7f050017
int color bright_foreground_disabled_material_dark 0x7f050018
int color bright_foreground_disabled_material_light 0x7f050019
int color bright_foreground_inverse_material_dark 0x7f05001a
int color bright_foreground_inverse_material_light 0x7f05001b
int color bright_foreground_material_dark 0x7f05001c
int color bright_foreground_material_light 0x7f05001d
int color button_material_dark 0x7f05001e
int color button_material_light 0x7f05001f
int color countdown1 0x7f050020
int color countdown2 0x7f050021
int color countdown3 0x7f050022
int color dim_foreground_disabled_material_dark 0x7f050023
int color dim_foreground_disabled_material_light 0x7f050024
int color dim_foreground_material_dark 0x7f050025
int color dim_foreground_material_light 0x7f050026
int color foreground_material_dark 0x7f050027
int color foreground_material_light 0x7f050028
int color highlighted_text_material_dark 0x7f050029
int color highlighted_text_material_light 0x7f05002a
int color hint_foreground_material_dark 0x7f05002b
int color hint_foreground_material_light 0x7f05002c
int color material_blue_grey_800 0x7f05002d
int color material_blue_grey_900 0x7f05002e
int color material_blue_grey_950 0x7f05002f
int color material_deep_teal_200 0x7f050030
int color material_deep_teal_500 0x7f050031
int color material_grey_100 0x7f050032
int color material_grey_300 0x7f050033
int color material_grey_50 0x7f050034
int color material_grey_600 0x7f050035
int color material_grey_800 0x7f050036
int color material_grey_850 0x7f050037
int color material_grey_900 0x7f050038
int color message_buttons 0x7f050039
int color primary 0x7f05003a
int color primary_dark 0x7f05003b
int color primary_dark_material_dark 0x7f05003c
int color primary_dark_material_light 0x7f05003d
int color primary_material_dark 0x7f05003e
@ -303,29 +303,33 @@ int color primary_text_default_material_dark 0x7f050040
int color primary_text_default_material_light 0x7f050041
int color primary_text_disabled_material_dark 0x7f050042
int color primary_text_disabled_material_light 0x7f050043
int color retry 0x7f050044
int color red 0x7f050044
int color ripple_material_dark 0x7f050045
int color ripple_material_light 0x7f050046
int color secondary_text_default_material_dark 0x7f050047
int color secondary_text_default_material_light 0x7f050048
int color secondary_text_disabled_material_dark 0x7f050049
int color secondary_text_disabled_material_light 0x7f05004a
int color switch_thumb_disabled_material_dark 0x7f05004b
int color switch_thumb_disabled_material_light 0x7f05004c
int color switch_thumb_material_dark 0x7f05004d
int color switch_thumb_material_light 0x7f05004e
int color switch_thumb_normal_material_dark 0x7f05004f
int color switch_thumb_normal_material_light 0x7f050050
int color toolbuttonActiveNotReady 0x7f050051
int color toolbuttonActiveReady 0x7f050052
int color toolbuttonInactiveNotReady 0x7f050053
int color toolbuttonInactiveReady 0x7f050054
int color toolbuttonLocked 0x7f050055
int color toolslotDisabled 0x7f050056
int color toolslotDisabledSelected 0x7f050057
int color toolslotEnabled 0x7f050058
int color toolslotEnabledSelected 0x7f050059
int color topbar 0x7f05005a
int color secondary 0x7f050047
int color secondary_dark 0x7f050048
int color secondary_light 0x7f050049
int color secondary_text_default_material_dark 0x7f05004a
int color secondary_text_default_material_light 0x7f05004b
int color secondary_text_disabled_material_dark 0x7f05004c
int color secondary_text_disabled_material_light 0x7f05004d
int color secondary_transparent 0x7f05004e
int color switch_thumb_disabled_material_dark 0x7f05004f
int color switch_thumb_disabled_material_light 0x7f050050
int color switch_thumb_material_dark 0x7f050051
int color switch_thumb_material_light 0x7f050052
int color switch_thumb_normal_material_dark 0x7f050053
int color switch_thumb_normal_material_light 0x7f050054
int color toolbuttonActiveNotReady 0x7f050055
int color toolbuttonActiveReady 0x7f050056
int color toolbuttonInactiveNotReady 0x7f050057
int color toolbuttonInactiveReady 0x7f050058
int color toolbuttonLocked 0x7f050059
int color toolslotDisabled 0x7f05005a
int color toolslotDisabledSelected 0x7f05005b
int color toolslotEnabled 0x7f05005c
int color toolslotEnabledSelected 0x7f05005d
int color white 0x7f05005e
int dimen abc_action_bar_content_inset_material 0x7f060000
int dimen abc_action_bar_default_height_material 0x7f060001
int dimen abc_action_bar_default_padding_end_material 0x7f060002
@ -557,18 +561,20 @@ int drawable xml_background_game_over_message_button 0x7f070094
int drawable xml_background_levelbutton 0x7f070095
int drawable xml_background_toolslot 0x7f070096
int drawable xml_background_toolupgrade 0x7f070097
int drawable xml_background_tutorialimageview 0x7f070098
int drawable xml_background_tutorialtextview 0x7f070099
int drawable xml_background_worldbutton 0x7f07009a
int drawable xml_layers_toolprogressbar 0x7f07009b
int drawable xml_selector_gamebutton 0x7f07009c
int drawable xml_selector_music 0x7f07009d
int drawable xml_selector_pricebutton 0x7f07009e
int drawable xml_selector_settingsbutton 0x7f07009f
int drawable xml_selector_shapeshopbutton 0x7f0700a0
int drawable xml_selector_sound 0x7f0700a1
int drawable xml_selector_toolshopbutton 0x7f0700a2
int drawable xml_shape_inspector_checkbox 0x7f0700a3
int drawable xml_background_topbar 0x7f070098
int drawable xml_background_tutorialimageview 0x7f070099
int drawable xml_background_tutorialtextview 0x7f07009a
int drawable xml_background_worldbutton 0x7f07009b
int drawable xml_layers_levelprogressbar 0x7f07009c
int drawable xml_layers_toolprogressbar 0x7f07009d
int drawable xml_selector_gamebutton 0x7f07009e
int drawable xml_selector_music 0x7f07009f
int drawable xml_selector_pricebutton 0x7f0700a0
int drawable xml_selector_settingsbutton 0x7f0700a1
int drawable xml_selector_shapeshopbutton 0x7f0700a2
int drawable xml_selector_sound 0x7f0700a3
int drawable xml_selector_toolshopbutton 0x7f0700a4
int drawable xml_shape_inspector_checkbox 0x7f0700a5
int id action0 0x7f080000
int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002

2
app/src/main/java/de/frajul/endlessroll/main/screens/LevelsScreen.java
View File

@ -39,7 +39,7 @@ public class LevelsScreen extends Screen<LinearLayout> 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())

2
app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
View File

@ -62,7 +62,7 @@ public class ToolShopScreen extends Screen<RelativeLayout> 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;

2
app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
View File

@ -29,7 +29,7 @@ public class WorldsScreen extends Screen<RelativeLayout> 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);

2
app/src/main/java/de/frajul/endlessroll/views/LevelupMessage.java
View File

@ -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 + "");

2
app/src/main/java/de/frajul/endlessroll/views/PlayerShapeButton.java
View File

@ -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;

2
app/src/main/java/de/frajul/endlessroll/views/TaskCompletedMessage.java
View File

@ -35,7 +35,7 @@ public class TaskCompletedMessage implements View.OnClickListener, BountyMessage
}
public void show(List<PlayerShape> 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)

BIN
app/src/main/res/drawable/currency_star.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable/currency_star_empty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable/tutorial_to_toolshop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 26 KiB

2
app/src/main/res/drawable/xml_background_exit_confirm_dialog.xml
View File

@ -6,5 +6,5 @@
android:color="@android:color/white"/>
<stroke
android:width="3dp"
android:color="#ff6f00" />
android:color="@color/secondary" />
</shape>

12
app/src/main/res/drawable/xml_background_levelbutton.xml
View File

@ -2,13 +2,19 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="47dp" />
<solid android:color="#a997f0" />
<gradient
android:centerX="0%"
android:centerY="0%"
android:endColor="@color/secondary_light"
android:startColor="@color/secondary_dark"
android:angle="90"
android:type="linear" />
<padding
android:bottom="10dp"
android:left="15dp"
android:right="15dp"
android:top="10dp" />
<stroke
android:width="5dp"
android:color="#b11a1a" />
android:width="2dp"
android:color="@color/secondary" />
</shape>

14
app/src/main/res/drawable/xml_background_topbar.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/primary"/>
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp"/>
<stroke
android:width="2dp"
android:color="@color/primary_dark"/>
</shape>

6
app/src/main/res/drawable/xml_background_worldbutton.xml
View File

@ -5,8 +5,8 @@
<gradient
android:centerX="0%"
android:centerY="0%"
android:endColor="#fd9400"
android:startColor="#f0fd00"
android:endColor="@color/secondary_dark"
android:startColor="@color/secondary_light"
android:angle="315"
android:type="linear" />
<padding
@ -16,5 +16,5 @@
android:top="10dp" />
<stroke
android:width="4dp"
android:color="#74ff8800" />
android:color="@color/secondary" />
</shape>

19
app/src/main/res/drawable/xml_layers_levelprogressbar.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="20dp"/>
<solid android:color="#9c000000"/>
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="20dp"/>
<solid android:color="@color/secondary"/>
</shape>
</clip>
</item>
</layer-list>

4
app/src/main/res/layout/game.xml
View File

@ -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"/>
<TextView
@ -40,7 +40,7 @@
android:layout_alignStart="@+id/game_playerprogress"
android:layout_below="@+id/game_playerprogress"
android:text="@string/game_playerspeed_placeholder"
android:textColor="@color/game_progress_text"
android:textColor="@color/secondary"
android:textSize="22sp"/>
<TextView

8
app/src/main/res/layout/game_over_message.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_levelup_message"
android:background="@color/background_message"
android:orientation="vertical">
<include
@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:textColor="@color/message_buttons"
android:background="@drawable/xml_background_game_over_message_button"
android:textSize="40sp"/>
@ -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"/>
<RelativeLayout
@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_try_again"
android:textColor="@color/message_views"
android:textColor="@color/message_buttons"
android:textSize="40sp"/>
</RelativeLayout>

6
app/src/main/res/layout/goal_message.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_levelup_message"
android:background="@color/background_message"
android:orientation="vertical">
<include
@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_level_finished"
android:textColor="@color/level_finished"
android:textColor="@color/secondary"
android:textSize="55sp"/>
<RelativeLayout
@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:textColor="@color/message_buttons"
android:background="@drawable/xml_background_game_over_message_button"
android:textSize="40sp"/>
</RelativeLayout>

2
app/src/main/res/layout/goal_message_levelbutton.xml
View File

@ -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"/>
<LinearLayout

2
app/src/main/res/layout/levelup_message.xml
View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/background_levelup_message">
android:background="@color/background_message">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/pre_start_screen.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#41a6d1">
android:background="@color/primary">
<TextView
android:layout_width="wrap_content"

2
app/src/main/res/layout/shape_inspector.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/shape_inspector_width"
android:layout_height="match_parent"
android:background="#e6ffc936"
android:background="@color/secondary_transparent"
android:orientation="vertical"
android:padding="10dp">

6
app/src/main/res/layout/short_menu.xml
View File

@ -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"/>
<TextView
@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/message_restart"
android:textColor="@color/level_finished"
android:textColor="@color/secondary"
android:textSize="40sp"/>
<TextView
@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/short_menu_exit"
android:textColor="@color/level_finished"
android:textColor="@color/secondary"
android:textSize="40sp"/>
</LinearLayout>

4
app/src/main/res/layout/tool_inspector.xml
View File

@ -2,9 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/tool_inspector_width"
android:layout_height="match_parent"
android:background="#e6ffc936"
android:orientation="vertical"
android:background="@color/secondary_transparent"
android:clipChildren="false"
android:orientation="vertical"
android:padding="10dp">
<TextView

7
app/src/main/res/layout/topbar.xml
View File

@ -3,7 +3,7 @@
android:id="@+id/topbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/topbar">
android:background="@drawable/xml_background_topbar">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topbar_levellayout"
@ -17,6 +17,7 @@
<TextView
android:id="@+id/topbar_leveldisplay"
android:layout_marginTop="-5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/topbar_level_placeholder"
@ -26,7 +27,9 @@
android:id="@+id/topbar_levelprogress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="6dp"
android:layout_marginBottom="5dp"
android:progressDrawable="@drawable/xml_layers_levelprogressbar"
android:progress="50"/>
</LinearLayout>

2
app/src/main/res/layout/world_button.xml
View File

@ -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"/>
<RelativeLayout

31
app/src/main/res/values/colors.xml
View File

@ -1,10 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="level_finished">#ffda45</color>
<color name="game_over">#f11e6f</color>
<color name="retry">#39be27</color>
<color name="game_progress_text">#ffb405</color>
<color name="message_views">#daf10d</color>
<!--primary blue: 4a90ff-->
<!--35b0f2-->
<color name="primary">#17b3f5</color>
<color name="primary_dark">#1791f5</color>
<color name="secondary">#ffb637</color>
<color name="secondary_light">#ffeb37</color>
<color name="secondary_dark">#ff8e37</color>
<color name="secondary_transparent">#e2ffb637</color>
<color name="red">#ff0000</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>
<color name="message_buttons">#daf10d</color>
<color name="toolbuttonInactiveNotReady">#db911c0f</color>
<color name="toolbuttonInactiveReady">#dbfff200</color>
<color name="toolbuttonActiveNotReady">#e5dc1522</color>
@ -14,11 +24,12 @@
<color name="toolslotDisabledSelected">#60715f</color>
<color name="toolslotEnabled">#db41e42b</color>
<color name="toolslotEnabledSelected">#b3d700</color>
<color name="countdown3">#f0f41e02</color>
<color name="countdown2">#f0f28117</color>
<color name="countdown1">#f0d7b106</color>
<color name="background_levelup_message">#9d000000</color>
<color name="countdown3">#f41602</color>
<color name="countdown2">#f47b02</color>
<color name="countdown1">#f4d802</color>
<color name="background_message">#9d000000</color>
<color name="background_short_menu">#5b000000</color>
<color name="background_tutorial">#3d000000</color>
<color name="topbar">#cf664c</color>
</resources>

6
app/src/main/res/values/styles.xml
View File

@ -2,7 +2,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:buttonStyle">@style/GameButton</item>
<item name="android:textColor">#000000</item>
<item name="android:textColor">@color/black</item>
</style>
<style name="GameButton">
@ -17,13 +17,13 @@
<style name="DialogButton" parent="android:Widget.Holo.Button.Borderless">
<item name="android:background">@drawable/xml_background_dialog_button</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">15sp</item>
</style>
<style name="TutorialTextView">
<item name="android:background">@drawable/xml_background_tutorialtextview</item>
<item name="android:textColor">#000000</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">15sp</item>
</style>