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
Download Patch File Download Diff File Expand all files Collapse all files

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>