Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android: Change the color of the selected slot to make it more visible #5160

Merged
merged 1 commit into from
Mar 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions Source/Android/app/src/main/res/color/button_text_color.xml
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions Source/Android/app/src/main/res/layout/fragment_state_load.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 6 additions & 6 deletions Source/Android/app/src/main/res/layout/fragment_state_save.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 4 additions & 0 deletions Source/Android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>