summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2017-03-31 03:57:32 -0400
committerGitHub <noreply@github.com>2017-03-31 03:57:32 -0400
commit542fb347f1718e596368c284888d03fb0f8fbe54 (patch)
tree16942d77d19febf641c26eeb225d277fd83ec0be /Source/Android
parent9b2c6e9a9a5cadd8321da299a182f1ac84602448 (diff)
parentf1fd336a0374182572ebb45e2a195b6c6c064e11 (diff)
Merge pull request #5160 from mahdihijazi/enhance_style
android: Change the color of the selected slot to make it more visible
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/src/main/res/color/button_text_color.xml9
-rw-r--r--Source/Android/app/src/main/res/layout/fragment_state_load.xml12
-rw-r--r--Source/Android/app/src/main/res/layout/fragment_state_save.xml12
-rw-r--r--Source/Android/app/src/main/res/values/styles.xml4
4 files changed, 25 insertions, 12 deletions
diff --git a/Source/Android/app/src/main/res/color/button_text_color.xml b/Source/Android/app/src/main/res/color/button_text_color.xml
new file mode 100644
index 0000000000..6a2e41bfff
--- /dev/null
+++ b/Source/Android/app/src/main/res/color/button_text_color.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:color="@color/dolphin_blue_dark"
+ android:state_focused="true"/>
+ <item
+ android:color="@android:color/white"/>
+</selector>
diff --git a/Source/Android/app/src/main/res/layout/fragment_state_load.xml b/Source/Android/app/src/main/res/layout/fragment_state_load.xml
index b3074c469d..ec8d80def1 100644
--- a/Source/Android/app/src/main/res/layout/fragment_state_load.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_state_load.xml
@@ -18,42 +18,42 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot1"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_2"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot2"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_3"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot3"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_4"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot4"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_5"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot5"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_load_6"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot6"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
</GridLayout>
diff --git a/Source/Android/app/src/main/res/layout/fragment_state_save.xml b/Source/Android/app/src/main/res/layout/fragment_state_save.xml
index 2c7b4a8298..c2e2abc243 100644
--- a/Source/Android/app/src/main/res/layout/fragment_state_save.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_state_save.xml
@@ -18,42 +18,42 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot1"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_2"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot2"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_3"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot3"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_4"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot4"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_5"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot5"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
<Button
android:id="@+id/menu_emulation_save_6"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot6"
- style="@style/InGameMenuOption"/>
+ style="@style/OverlayInGameMenuOption"/>
</GridLayout>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 6a411910ab..ae7a869223 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -155,4 +155,8 @@
<item name="android:layout_margin">0dp</item>
</style>
+ <style name="OverlayInGameMenuOption" parent="InGameMenuOption">
+ <item name="android:textColor">@color/button_text_color</item>
+ </style>
+
</resources> \ No newline at end of file