From 249c1010f52cd43f44481dcdb7c45b417739da3c Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Thu, 26 Oct 2023 09:06:31 -0500
Subject: [PATCH] Simplify the BaseTheme and remove the night styles.xml.
 (#165)

---
 .../values-night/ic_launcher_background.xml   |  4 +++
 app/src/main/res/values-night/styles.xml      | 35 -------------------
 .../res/values/ic_launcher_background.xml     |  2 +-
 app/src/main/res/values/styles.xml            | 21 ++---------
 4 files changed, 8 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/res/values-night/ic_launcher_background.xml
 delete mode 100644 app/src/main/res/values-night/styles.xml

diff --git a/app/src/main/res/values-night/ic_launcher_background.xml b/app/src/main/res/values-night/ic_launcher_background.xml
new file mode 100644
index 000000000..93629affd
--- /dev/null
+++ b/app/src/main/res/values-night/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">@color/dark_gray</color>
+</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
deleted file mode 100644
index 213e3b902..000000000
--- a/app/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="BaseTheme" parent="android:Theme.Material">
-        <item name="android:buttonStyle">@style/ButtonStyle</item>
-        <item name="android:colorAccent">@color/dark_primary</item>
-        <item name="android:colorActivatedHighlight">@android:color/transparent</item>
-        <item name="android:colorControlNormal">@color/dark_border</item>
-        <item name="android:colorPrimaryDark">@color/dark_notification_bar</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:popupTheme">@android:style/ThemeOverlay.Material</item>
-        <item name="android:textCursorDrawable">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
-    </style>
-
-    <style name="ButtonStyle" parent="android:Widget.Material.Button">
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <!-- Launch theme (for auto dark/light based on system) -->
-    <style name="LaunchTheme" parent="Theme.SplashScreen">
-        <item name="postSplashScreenTheme">@style/BaseTheme</item>
-        <item name="windowSplashScreenAnimatedIcon">
-            @drawable/logo_rounded
-        </item>
-        <item name="windowSplashScreenBackground">
-            @color/dark_gray
-        </item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index a8a787f8f..e53878f02 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#175DDC</color>
+    <color name="ic_launcher_background">@color/blue_175DDC</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 813889753..6ccdb8150 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="BaseTheme" parent="android:Theme.Material.Light.DarkActionBar">
-        <item name="android:buttonStyle">@style/ButtonStyle</item>
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorActivatedHighlight">@android:color/transparent</item>
-        <item name="android:colorControlNormal">@color/border</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/notification_bar</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:popupTheme">@android:style/ThemeOverlay.Material.Light</item>
         <item name="android:textCursorDrawable">@null</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowBackground">@null</item>
@@ -19,18 +12,10 @@
         <item name="android:windowLayoutInDisplayCutoutMode">default</item>
     </style>
 
-    <style name="ButtonStyle" parent="android:Widget.Material.Button">
-        <item name="android:textAllCaps">false</item>
-    </style>
-
     <!-- Launch theme (for auto dark/light based on system) -->
     <style name="LaunchTheme" parent="Theme.SplashScreen">
         <item name="postSplashScreenTheme">@style/BaseTheme</item>
-        <item name="windowSplashScreenAnimatedIcon">
-            @drawable/logo_rounded
-        </item>
-        <item name="windowSplashScreenBackground">
-            @color/ic_launcher_background
-        </item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/logo_rounded</item>
+        <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
     </style>
 </resources>