From 1adf631725cb5665d05476d9c51192126c5ce047 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 14 Apr 2023 20:46:48 -0400
Subject: [PATCH 1/4] citra_android: Use primary color for FAB

---
 src/android/app/src/main/res/values/styles.xml | 9 +++++++++
 src/android/app/src/main/res/values/themes.xml | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xml
index 6788538c72..2a0ca8a78b 100644
--- a/src/android/app/src/main/res/values/styles.xml
+++ b/src/android/app/src/main/res/values/styles.xml
@@ -28,4 +28,13 @@
         <item name="labelBehavior">gone</item>
     </style>
 
+    <style name="Widget.Citra.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Citra.FloatingActionButton</item>
+    </style>
+
+    <style name="ThemeOverlay.Citra.FloatingActionButton" parent="">
+        <item name="colorContainer">@color/citra_primary</item>
+        <item name="colorOnContainer">@color/citra_onPrimary</item>
+    </style>
+
 </resources>
diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml
index d1f1522d93..dd66d30ebb 100644
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@@ -45,6 +45,7 @@
         <item name="popupMenuStyle">@style/CitraShapedPopup</item>
         <item name="popupTheme">@style/CitraPopup</item>
         <item name="sliderStyle">@style/CitraSlider</item>
+        <item name="floatingActionButtonStyle">@style/Widget.Citra.FloatingActionButton</item>
     </style>
 
 </resources>

From 8a3afaf9e6f520e2668ee6171119b8d0385c2e56 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 14 Apr 2023 20:49:47 -0400
Subject: [PATCH 2/4] citra_android: Fix background color on first launch

The incorrect background color could appear when the games fragment is not initialized as it is during first boot. Now it appears correctly as colorSurface.
---
 src/android/app/src/main/res/layout/activity_main.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xml
index c567abe698..f668ae7615 100644
--- a/src/android/app/src/main/res/layout/activity_main.xml
+++ b/src/android/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coordinator_main"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"

From 9aed0a14c7ff5aed64c4ecdf2315c3ac2d0d5441 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 14 Apr 2023 20:53:42 -0400
Subject: [PATCH 3/4] citra_android: Reduce the primary color's influence on
 the surface color in dark mode

---
 src/android/app/src/main/res/values-night/citra_colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/app/src/main/res/values-night/citra_colors.xml b/src/android/app/src/main/res/values-night/citra_colors.xml
index 54e6a913a7..8a379e703b 100644
--- a/src/android/app/src/main/res/values-night/citra_colors.xml
+++ b/src/android/app/src/main/res/values-night/citra_colors.xml
@@ -19,7 +19,7 @@
     <color name="citra_onErrorContainer">#FFDAD6</color>
     <color name="citra_background">#1E1B16</color>
     <color name="citra_onBackground">#E9E1D9</color>
-    <color name="citra_surface">#1E1B16</color>
+    <color name="citra_surface">#1C1C1B</color>
     <color name="citra_onSurface">#E9E1D9</color>
     <color name="citra_surfaceVariant">#4D4639</color>
     <color name="citra_onSurfaceVariant">#D0C5B4</color>

From 2e23a75fac2f3b2df8e01c5d331adc987da41320 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 14 Apr 2023 21:12:34 -0400
Subject: [PATCH 4/4] citra_android: Fix top app bar color in cheats activity

---
 src/android/app/src/main/res/layout/activity_cheats.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/res/layout/activity_cheats.xml b/src/android/app/src/main/res/layout/activity_cheats.xml
index 7b63b11c31..0d2a92f683 100644
--- a/src/android/app/src/main/res/layout/activity_cheats.xml
+++ b/src/android/app/src/main/res/layout/activity_cheats.xml
@@ -4,7 +4,8 @@
     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">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_cheats"