feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Android: Make floating action buttons use the correct accent color programmatically.

Browse Source
This commit is contained in:
Eder Bastos
2015-05-17 09:47:56 -04:00
parent 91c1c0b1b3
commit 4f6a5e0293
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml → Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
View File

@@ -2,7 +2,7 @@
android:color="?android:colorControlHighlight">
<item>
<shape android:shape="oval">
<solid android:color="@color/dolphin_accent_wii"/>
<solid android:color="?android:colorAccent"/>
</shape>
</item>
</ripple>

8
Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
View File

@@ -1,8 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item>
<shape android:shape="oval">
<solid android:color="@color/dolphin_accent_gamecube"/>
</shape>
</item>
</ripple>

2
Source/Android/app/src/main/res/layout/activity_game_grid.xml
View File

@@ -33,7 +33,7 @@
android:layout_alignBottom="@+id/image_game_screen"
android:layout_alignEnd="@+id/text_game_title"
android:layout_marginBottom="28dp"
android:background="@drawable/oval_ripple_gc"
android:background="@drawable/oval_ripple_accent"
android:src="@drawable/ic_add"
android:stateListAnimator="@anim/button_elevation"
android:elevation="4dp"

4
Source/Android/app/src/main/res/layout/dialog_game_details.xml
View File

@@ -18,7 +18,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="24dp"
tools:src="@drawable/placeholder_banner"
app:border_color="#ffcccccc"
app:border_color="?android:colorAccent"
app:border_width="2dp"
/>
@@ -120,7 +120,7 @@
android:layout_alignBottom="@+id/image_game_screen"
android:layout_alignEnd="@+id/text_game_title"
android:layout_marginBottom="-28dp"
android:background="@drawable/oval_ripple_wii"
android:background="@drawable/oval_ripple_accent"
android:src="@drawable/ic_play"
android:stateListAnimator="@anim/button_elevation"
android:elevation="4dp"/>

25
Source/Android/app/src/main/res/values/styles.xml
View File

@@ -46,4 +46,29 @@
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<!-- Themes for Dialogs -->
<style name="DolphinDialogBase" parent="android:Theme.Material.Light.Dialog">
<!-- Main theme colors -->
<!-- your app branding color for the app bar -->
<item name="android:colorPrimary">@color/dolphin_blue</item>
<!-- darker variant for the status bar and contextual app bars -->
<item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Inherit from the Base Dolphin Dialog Theme-->
<style name="DolphinDialogWii" parent="DolphinDialogBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinDialogGamecube" parent="DolphinDialogBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinDialogWiiware" parent="DolphinDialogBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
</style>
</resources>