From 4f6a5e0293d2522d80ed88966fabb33c32eb886c Mon Sep 17 00:00:00 2001
From: Eder Bastos <bastos.eder@gmail.com>
Date: Sun, 17 May 2015 09:47:56 -0400
Subject: [PATCH] Android: Make floating action buttons use the correct accent
 color programmatically.

---
 ..._ripple_wii.xml => oval_ripple_accent.xml} |  2 +-
 .../src/main/res/drawable/oval_ripple_gc.xml  |  8 ------
 .../main/res/layout/activity_game_grid.xml    |  2 +-
 .../main/res/layout/dialog_game_details.xml   |  4 +--
 .../app/src/main/res/values/styles.xml        | 25 +++++++++++++++++++
 5 files changed, 29 insertions(+), 12 deletions(-)
 rename Source/Android/app/src/main/res/drawable/{oval_ripple_wii.xml => oval_ripple_accent.xml} (76%)
 delete mode 100644 Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml

diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
similarity index 76%
rename from Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
rename to Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
index 644876eda3..fbdfec87f5 100644
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
@@ -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>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
deleted file mode 100644
index 167d3ef13a..0000000000
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_game_grid.xml b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
index 2dc6416a94..8186490004 100644
--- a/Source/Android/app/src/main/res/layout/activity_game_grid.xml
+++ b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
@@ -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"
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
index 940c69cdc1..1d7b63468b 100644
--- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -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"/>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index efc39de62c..2752458eb2 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -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>
\ No newline at end of file