From 700225f8c8898406fa8cc655891f15b0fe3f6d3d Mon Sep 17 00:00:00 2001
From: Eder Bastos <bastos.eder@gmail.com>
Date: Fri, 8 May 2015 19:57:44 -0400
Subject: [PATCH] Add floating action button to GameGridActivity.

---
 .../{oval_ripple.xml => oval_ripple_gc.xml}   |  3 +-
 .../src/main/res/drawable/oval_ripple_wii.xml |  8 +++++
 .../main/res/layout/activity_game_grid.xml    | 31 +++++++++++++++----
 .../main/res/layout/dialog_game_details.xml   |  2 +-
 .../app/src/main/res/values/colors.xml        | 10 +++---
 .../app/src/main/res/values/styles.xml        |  4 +--
 6 files changed, 43 insertions(+), 15 deletions(-)
 rename Source/Android/app/src/main/res/drawable/{oval_ripple.xml => oval_ripple_gc.xml} (66%)
 create mode 100644 Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml

diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
similarity index 66%
rename from Source/Android/app/src/main/res/drawable/oval_ripple.xml
rename to Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
index 554d5f834a..0477ba84fe 100644
--- a/Source/Android/app/src/main/res/drawable/oval_ripple.xml
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
@@ -1,9 +1,8 @@
-<!-- res/drawable/oval_ripple.xml -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="?android:colorControlHighlight">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dolphin_wii"/>
+            <solid android:color="@color/dolphin_gamecube_accent"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
new file mode 100644
index 0000000000..35c767805c
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dolphin_wii_accent"/>
+        </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 f026322f3d..e87f859787 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
@@ -13,12 +13,31 @@
         android:minHeight="?android:attr/actionBarSize"
         android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"/>
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/grid_games"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/grid_card_game"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/grid_games"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/grid_card_game"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+
+        <ImageButton
+            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_wii"
+            android:src="@drawable/ic_play"
+            android:stateListAnimator="@anim/button_elevation"
+            android:elevation="4dp"
+            android:layout_gravity="bottom|right"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+    </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
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 a135c99c86..b431991baf 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
@@ -124,7 +124,7 @@
             android:layout_alignBottom="@+id/image_game_screen"
             android:layout_alignEnd="@+id/text_game_title"
             android:layout_marginBottom="-28dp"
-            android:background="@drawable/oval_ripple"
+            android:background="@drawable/oval_ripple_wii"
             android:src="@drawable/ic_play"
             android:stateListAnimator="@anim/button_elevation"
             android:elevation="4dp"/>
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index 608cc9afd7..a4174647c7 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="dolphin_wii">#5bc0de</color>
-    <color name="dolphin_wii_dark">#428bca</color>
+    <color name="dolphin_wii">#2196f3</color>
+    <color name="dolphin_wii_dark">#1976d2</color>
+    <color name="dolphin_wii_accent">#651fff</color>
 
-    <color name="dolphin_gamecube">#663399</color>
-    <color name="dolphin_gamecube_dark">#311b92</color>
+    <color name="dolphin_gamecube">#673ab7</color>
+    <color name="dolphin_gamecube_dark">#512da8</color>
+    <color name="dolphin_gamecube_accent">#2979ff</color>
 </resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 40d406b20f..a0bfbb1865 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -8,13 +8,13 @@
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="android:colorPrimaryDark">@color/dolphin_wii_dark</item>
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="android:colorAccent">@color/dolphin_gamecube</item>
+        <item name="android:colorAccent">@color/dolphin_wii_accent</item>
     </style>
 
     <style name="DolphinGamecube" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:colorPrimary">@color/dolphin_gamecube</item>
         <item name="android:colorPrimaryDark">@color/dolphin_gamecube_dark</item>
-        <item name="android:colorAccent">@color/dolphin_wii</item>
+        <item name="android:colorAccent">@color/dolphin_gamecube_accent</item>
 
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>