From d164a51c9d8681e2b62ec231e9c3cf252f1a46c6 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 16 Sep 2024 00:05:59 +0200
Subject: [PATCH] themes: fix alert dialog colors

In night mode the input text and buttons
had the color of the background.
---
 app/src/main/kotlin/d/d/meshenger/QRScanActivity.kt |  2 +-
 app/src/main/res/values-night/themes.xml            | 13 -------------
 app/src/main/res/values/styles.xml                  |  4 ----
 app/src/main/res/values/themes.xml                  |  6 +++---
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/app/src/main/kotlin/d/d/meshenger/QRScanActivity.kt b/app/src/main/kotlin/d/d/meshenger/QRScanActivity.kt
index 76441e831..dd9923d9e 100644
--- a/app/src/main/kotlin/d/d/meshenger/QRScanActivity.kt
+++ b/app/src/main/kotlin/d/d/meshenger/QRScanActivity.kt
@@ -16,12 +16,12 @@ import com.journeyapps.barcodescanner.DefaultDecoderFactory
 import com.google.zxing.ResultPoint
 import com.google.zxing.BarcodeFormat
 import android.content.ComponentName
-import android.app.AlertDialog
 import android.app.Dialog
 import android.os.IBinder
 import android.view.View
 import android.widget.Button
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import org.json.JSONException
 
 class QRScanActivity : BaseActivity(), BarcodeCallback, ServiceConnection {
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 040eee073..000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- overwrite AppThemeBase with corrections for night mode -->
-    <style name="AppThemeBase" parent="Theme.AppCompat.DayNight">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:dropDownListViewStyle">@style/MySpinner</item>
-
-        <!-- overwritten entries -->
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f875b343a..53af4422a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -34,10 +34,6 @@
         <item name="android:textSize">@dimen/headline_text_size</item>
     </style>
 
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-         <item name="android:textColor">@android:color/black</item>
-    </style>
-
     <style name="MySpinner" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:dividerHeight">2dp</item>
         <item name="android:divider">#7C7B7B</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bbc98b81e..eb7078cd2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,9 +4,6 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:dropDownListViewStyle">@style/MySpinner</item>
-
-        <item name="android:textColor">@color/black</item>
-        <item name="android:textColorPrimary">@color/black</item>
     </style>
 
     <style name="AppTheme.FireRed" parent="AppThemeBase">
@@ -85,4 +82,7 @@
         <item name="tabSelectedTextColor">@color/black</item>
     </style>
 
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <!-- Nothing to do for now -->
+    </style>
 </resources>