From 600e8d5dd040f67876344a1a0deb3e0a4b4a33b9 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 3 Jan 2021 18:18:36 +1000
Subject: [PATCH] Android: Fix fab background colour in dark mode

---
 .../github/stenzek/duckstation/GamePropertiesActivity.java    | 2 +-
 android/app/src/main/res/layout/activity_main.xml             | 4 ++--
 android/app/src/main/res/values-night/colors.xml              | 1 +
 android/app/src/main/res/values/colors.xml                    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java
index e8ac7b70b..1062cf3b9 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java
@@ -74,7 +74,7 @@ public class GamePropertiesActivity extends AppCompatActivity {
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-        
+
         setTitle(mGameListEntry.getTitle());
     }
 
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index a034d7c7e..dcf582e14 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -42,7 +42,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginBottom="@dimen/fab_margin"
         android:layout_marginRight="96dp"
-        app:backgroundTint="@android:color/background_light"
+        app:backgroundTint="@color/fab_background"
         app:srcCompat="@drawable/ic_baseline_play_arrow_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:backgroundTint="@android:color/background_light"
+        app:backgroundTint="@color/fab_background"
         app:srcCompat="@android:drawable/ic_input_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 523e487ed..bfd159873 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -5,4 +5,5 @@
     <color name="colorAccent">#03A9F4</color>
 
     <color name="black_overlay">#66000000</color>
+    <color name="fab_background">#222222</color>
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index a0ede428c..8e72cdfb5 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -5,4 +5,5 @@
     <color name="colorAccent">#D81B60</color>
 
     <color name="black_overlay">#66000000</color>
+    <color name="fab_background">#ffffffff</color>
 </resources>