Android: Switch all activities to AppCompat-based Material themes, and use Support Library version of Floating Action Button.

4 files changed, 37 insertions, 39 deletions

diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
deleted file mode 100644
index fbdfec87f5..0000000000
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_accent.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="?android:colorAccent"/>
-        </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 53ac5d614e..cf91a6dac6 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
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
@@ -26,17 +27,18 @@
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"/>
 
-        <ImageButton
+        <android.support.design.widget.FloatingActionButton
             android:id="@+id/button_add_directory"
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:layout_alignBottom="@+id/image_game_screen"
             android:layout_alignEnd="@+id/text_game_title"
             android:layout_marginBottom="28dp"
-            android:background="@drawable/oval_ripple_accent"
             android:src="@drawable/ic_add"
-            android:stateListAnimator="@anim/button_elevation"
-            android:elevation="4dp"
+            app:borderWidth="0dp"
+            app:rippleColor="?android:colorPrimaryDark"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
             android:layout_gravity="bottom|right"
             android:layout_marginRight="@dimen/activity_horizontal_margin"/>
     </FrameLayout>
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 1d7b63468b..ca33e56007 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
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_height="match_parent"
              android:layout_width="match_parent"
@@ -113,17 +114,20 @@
             android:gravity="center_vertical"
             tools:text="Nintendo"/>
 
-        <ImageButton
+        <android.support.design.widget.FloatingActionButton
             android:id="@+id/button_launch"
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:layout_alignBottom="@+id/image_game_screen"
             android:layout_alignEnd="@+id/text_game_title"
             android:layout_marginBottom="-28dp"
-            android:background="@drawable/oval_ripple_accent"
             android:src="@drawable/ic_play"
             android:stateListAnimator="@anim/button_elevation"
-            android:elevation="4dp"/>
+            app:rippleColor="?android:colorPrimaryDark"
+            app:borderWidth="0dp"
+            app:elevation="6dp"
+            app:pressedTranslationZ="12dp"
+            />
     </RelativeLayout>
 
 
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index bec7fc0035..374ec4d628 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- inherit from the material theme -->
-    <style name="DolphinBase" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="DolphinBase" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Main theme colors -->
         <!--   your app branding color for the app bar -->
-        <item name="android:colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimary">@color/dolphin_blue</item>
         <!--   darker variant for the status bar and contextual app bars -->
-        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
-    <style name="DolphinSettingsBase" parent="android:Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/dolphin_blue</item>
-        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    <style name="DolphinSettingsBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
     </style>
 
     <!-- Inherit from the Base Dolphin Theme-->
     <style name="DolphinWii" parent="DolphinBase">
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+        <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
     <style name="DolphinGamecube" parent="DolphinBase">
-        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
     </style>
 
     <style name="DolphinWiiware" parent="DolphinBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+        <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
     <!-- Inherit from the Base Dolphin Settings Theme-->
     <style name="DolphinSettingsWii" parent="DolphinSettingsBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+        <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
     <style name="DolphinSettingsGamecube" parent="DolphinSettingsBase">
-        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
     </style>
 
     <style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+        <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
     <!-- Themes for Dialogs -->
-    <style name="DolphinDialogBase" parent="android:Theme.Material.Light.Dialog">
-        <item name="android:colorPrimary">@color/dolphin_blue</item>
-        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    <style name="DolphinDialogBase" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
     </style>
 
     <!-- Inherit from the Base Dolphin Dialog Theme-->
     <style name="DolphinDialogWii" parent="DolphinDialogBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+        <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
     <style name="DolphinDialogGamecube" parent="DolphinDialogBase">
-        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
     </style>
 
     <style name="DolphinDialogWiiware" parent="DolphinDialogBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+        <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
-    <style name="DolphinEmulationBase" parent="android:Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/dolphin_blue</item>
-        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    <style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <!-- Inherit from the Base Dolphin Emulation Theme-->
     <style name="DolphinEmulationWii" parent="DolphinEmulationBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+        <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
     <style name="DolphinEmulationGamecube" parent="DolphinEmulationBase">
-        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
     </style>
 
     <style name="DolphinEmulationWiiware" parent="DolphinEmulationBase">
-        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+        <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 </resources>
\ No newline at end of file