From 7080e307dd7c0d4bc971fc0e890bf7b93bfd15b3 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 8 May 2021 03:25:13 +1000
Subject: [PATCH] Android: Improve pause menu in light theme

---
 .../res/layout/fragment_emulation_activity_overlay.xml    | 8 +++++++-
 android/app/src/main/res/values-night/colors.xml          | 1 -
 android/app/src/main/res/values/colors.xml                | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
index b81ea5af6..b9356576c 100644
--- a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
+++ b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
@@ -8,7 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/emulationActivityPauseTitleBackground"
+        android:background="@color/colorPrimary"
         android:orientation="horizontal">
 
         <ImageView
@@ -28,6 +28,7 @@
             android:layout_marginTop="4dp"
             android:text="Title"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textColor="?android:textColorPrimary"
             android:scrollHorizontally="true"
             android:ellipsize="end"
             android:maxLines="1"
@@ -43,6 +44,7 @@
             android:layout_marginEnd="4dp"
             android:layout_marginBottom="4dp"
             android:text="Code - Path"
+            android:textColor="?android:textColorPrimary"
             android:scrollHorizontally="true"
             android:ellipsize="end"
             android:maxLines="1"
@@ -66,6 +68,7 @@
                 android:layout_height="60dp"
                 android:layout_marginEnd="5dp"
                 android:background="?android:attr/selectableItemBackground"
+                android:tint="?android:textColorPrimary"
                 android:contentDescription="Pause Menu"
                 android:src="@drawable/ic_baseline_menu_24" />
 
@@ -75,6 +78,7 @@
                 android:layout_height="60dp"
                 android:layout_marginEnd="5dp"
                 android:background="?android:attr/selectableItemBackground"
+                android:tint="?android:textColorPrimary"
                 android:contentDescription="Controller Settings"
                 android:src="@drawable/ic_baseline_gamepad_24" />
 
@@ -84,6 +88,7 @@
                 android:layout_height="60dp"
                 android:layout_marginEnd="5dp"
                 android:background="?android:attr/selectableItemBackground"
+                android:tint="?android:textColorPrimary"
                 android:contentDescription="Settings"
                 android:src="@drawable/ic_baseline_settings_24" />
 
@@ -93,6 +98,7 @@
                 android:layout_height="60dp"
                 android:layout_marginEnd="5dp"
                 android:background="?android:attr/selectableItemBackground"
+                android:tint="?android:textColorPrimary"
                 android:contentDescription="Quit"
                 android:src="@drawable/ic_baseline_exit_to_app_24" />
 
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 591ae6935..6801baa94 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -9,5 +9,4 @@
     <color name="fab_background">#222222</color>
 
     <color name="emulationActivityPauseBackground">#cc000000</color>
-    <color name="emulationActivityPauseTitleBackground">#99111111</color>
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 4b3edbf22..a66a016b2 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -9,5 +9,4 @@
     <color name="fab_background">#ffffffff</color>
 
     <color name="emulationActivityPauseBackground">#eeffffff</color>
-    <color name="emulationActivityPauseTitleBackground">#996200EE</color>
 </resources>