From add5d851317bf200eaf724e357c91b75c8aaf159 Mon Sep 17 00:00:00 2001
From: vinnyhoward <vincenguyenhoward@gmail.com>
Date: Tue, 1 Oct 2024 13:02:35 -0600
Subject: [PATCH 1/2] fix: updated android .xml files so that alerts respect
 dark/light themes

---
 android/app/src/main/res/values-night/colors.xml |  2 ++
 android/app/src/main/res/values-night/styles.xml | 12 ++++++++++++
 android/app/src/main/res/values/colors.xml       |  2 ++
 android/app/src/main/res/values/styles.xml       | 12 ++++++++++++
 android/app/src/qa/res/values-night/colors.xml   |  2 ++
 android/app/src/qa/res/values-night/styles.xml   | 11 +++++++++++
 android/app/src/qa/res/values/colors.xml         |  2 ++
 android/app/src/qa/res/values/styles.xml         | 11 +++++++++++
 8 files changed, 54 insertions(+)

diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 4483fb4874b..5219ed36746 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -4,4 +4,6 @@
 	<color name="themeInverse">#FFFFFF</color>
 	<color name="navBar">#000000</color>
 	<color name="lightgray">#EBEBED</color>
+	<color name="alertTextColor">#000000</color>
+    <color name="alertBackground">#FFFFFF</color>
 </resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 6d59e168d49..918526519d4 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -20,4 +20,16 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
+		<!-- Custom Alert Dialog Theme -->
+   <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:background">@color/theme</item>
+        <item name="android:textColor">@color/alertTextColor</item>
+        <item name="android:textColorPrimary">@color/alertTextColor</item>
+        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+    </style>
+
+    <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/alertTextColor</item>
+    </style>
+	
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 0dc4d5454dc..ac52d4d960b 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
 	<color name="themeInverse">#000000</color>
 	<color name="navBar">#000000</color>
 	<color name="lightgray">#EBEBED</color>
+	<color name="alertTextColor">#000000</color>
+    <color name="alertBackground">#FFFFFF</color>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index db2cc884a80..65aebd35a6d 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -21,4 +21,16 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
+	<!-- Custom Alert Dialog Theme -->
+   <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:background">@color/theme</item>
+        <item name="android:textColor">@color/alertTextColor</item>
+        <item name="android:textColorPrimary">@color/alertTextColor</item>
+        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+    </style>
+
+    <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/alertTextColor</item>
+    </style>
+
 </resources>
diff --git a/android/app/src/qa/res/values-night/colors.xml b/android/app/src/qa/res/values-night/colors.xml
index 4483fb4874b..5219ed36746 100644
--- a/android/app/src/qa/res/values-night/colors.xml
+++ b/android/app/src/qa/res/values-night/colors.xml
@@ -4,4 +4,6 @@
 	<color name="themeInverse">#FFFFFF</color>
 	<color name="navBar">#000000</color>
 	<color name="lightgray">#EBEBED</color>
+	<color name="alertTextColor">#000000</color>
+    <color name="alertBackground">#FFFFFF</color>
 </resources>
diff --git a/android/app/src/qa/res/values-night/styles.xml b/android/app/src/qa/res/values-night/styles.xml
index 6d59e168d49..db8104765a0 100644
--- a/android/app/src/qa/res/values-night/styles.xml
+++ b/android/app/src/qa/res/values-night/styles.xml
@@ -20,4 +20,15 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
+	<!-- Custom Alert Dialog Theme -->
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:background">@color/theme</item>
+        <item name="android:textColor">@color/alertTextColor</item>
+        <item name="android:textColorPrimary">@color/alertTextColor</item>
+        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+    </style>
+
+    <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/alertTextColor</item>
+    </style>
 </resources>
diff --git a/android/app/src/qa/res/values/colors.xml b/android/app/src/qa/res/values/colors.xml
index 0dc4d5454dc..ac52d4d960b 100644
--- a/android/app/src/qa/res/values/colors.xml
+++ b/android/app/src/qa/res/values/colors.xml
@@ -4,4 +4,6 @@
 	<color name="themeInverse">#000000</color>
 	<color name="navBar">#000000</color>
 	<color name="lightgray">#EBEBED</color>
+	<color name="alertTextColor">#000000</color>
+    <color name="alertBackground">#FFFFFF</color>
 </resources>
diff --git a/android/app/src/qa/res/values/styles.xml b/android/app/src/qa/res/values/styles.xml
index db2cc884a80..cc6b05fcc5b 100644
--- a/android/app/src/qa/res/values/styles.xml
+++ b/android/app/src/qa/res/values/styles.xml
@@ -21,4 +21,15 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:background">@color/theme</item>
+        <item name="android:textColor">@color/alertTextColor</item>
+        <item name="android:textColorPrimary">@color/alertTextColor</item>
+        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+    </style>
+
+    <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/alertTextColor</item>
+    </style>
+
 </resources>

From ad1287c5d68ed11973aa30f993732d067dd89d2c Mon Sep 17 00:00:00 2001
From: vinnyhoward <vincenguyenhoward@gmail.com>
Date: Tue, 1 Oct 2024 14:02:30 -0600
Subject: [PATCH 2/2] fix: adding in missing changes

---
 android/app/src/main/res/values-night/styles.xml | 16 ++++++++--------
 android/app/src/main/res/values/styles.xml       | 12 ++++++------
 android/app/src/qa/res/values-night/styles.xml   | 14 +++++++-------
 android/app/src/qa/res/values/styles.xml         | 12 ++++++------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 918526519d4..effab25c978 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
 	<!-- Base application theme. -->
-	<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+	<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
 	 <item name="android:windowDisablePreview">true</item>
 		<!-- Customize your theme here. -->
         <item name="android:windowBackground">@drawable/app_background</item>
@@ -20,13 +20,13 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
-		<!-- Custom Alert Dialog Theme -->
-   <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:background">@color/theme</item>
-        <item name="android:textColor">@color/alertTextColor</item>
-        <item name="android:textColorPrimary">@color/alertTextColor</item>
-        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
-    </style>
+	<!-- Custom Alert Dialog Theme -->
+	<style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="android:background">@color/alertBackground</item>
+		<item name="android:textColor">@color/alertTextColor</item>
+		<item name="android:textColorPrimary">@color/alertTextColor</item>
+		<item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+	</style>
 
     <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/alertTextColor</item>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 65aebd35a6d..c3fa11e5bde 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -22,12 +22,12 @@
 	</style>
 
 	<!-- Custom Alert Dialog Theme -->
-   <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:background">@color/theme</item>
-        <item name="android:textColor">@color/alertTextColor</item>
-        <item name="android:textColorPrimary">@color/alertTextColor</item>
-        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
-    </style>
+	<style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="android:background">@color/alertBackground</item>
+		<item name="android:textColor">@color/alertTextColor</item>
+		<item name="android:textColorPrimary">@color/alertTextColor</item>
+		<item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+	</style>
 
     <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/alertTextColor</item>
diff --git a/android/app/src/qa/res/values-night/styles.xml b/android/app/src/qa/res/values-night/styles.xml
index db8104765a0..eb80fa2c78f 100644
--- a/android/app/src/qa/res/values-night/styles.xml
+++ b/android/app/src/qa/res/values-night/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
 	<!-- Base application theme. -->
-	<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+	<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
 	 <item name="android:windowDisablePreview">true</item>
 		<!-- Customize your theme here. -->
         <item name="android:windowBackground">@drawable/app_background</item>
@@ -21,12 +21,12 @@
 	</style>
 
 	<!-- Custom Alert Dialog Theme -->
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:background">@color/theme</item>
-        <item name="android:textColor">@color/alertTextColor</item>
-        <item name="android:textColorPrimary">@color/alertTextColor</item>
-        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
-    </style>
+	<style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="android:background">@color/alertBackground</item>
+		<item name="android:textColor">@color/alertTextColor</item>
+		<item name="android:textColorPrimary">@color/alertTextColor</item>
+		<item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+	</style>
 
     <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/alertTextColor</item>
diff --git a/android/app/src/qa/res/values/styles.xml b/android/app/src/qa/res/values/styles.xml
index cc6b05fcc5b..b14c8bb69fa 100644
--- a/android/app/src/qa/res/values/styles.xml
+++ b/android/app/src/qa/res/values/styles.xml
@@ -21,12 +21,12 @@
 		<item name="android:textColor">@color/themeInverse</item>
 	</style>
 
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:background">@color/theme</item>
-        <item name="android:textColor">@color/alertTextColor</item>
-        <item name="android:textColorPrimary">@color/alertTextColor</item>
-        <item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
-    </style>
+	<style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="android:background">@color/alertBackground</item>
+		<item name="android:textColor">@color/alertTextColor</item>
+		<item name="android:textColorPrimary">@color/alertTextColor</item>
+		<item name="android:buttonBarButtonStyle">@style/AlertButtonStyle</item>
+	</style>
 
     <style name="AlertButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">@color/alertTextColor</item>