From 0e0aedcd342199bf8e4381a0580826f39f3a1ac8 Mon Sep 17 00:00:00 2001
From: MrLetsplay <mr@cringe-studios.com>
Date: Sat, 24 Jun 2023 23:41:45 +0200
Subject: [PATCH] Fix themes

---
 .../fragment/SettingsFragment.java            |  1 -
 .../util/NavigationUtil.java                  |  1 +
 app/src/main/res/values-night/themes.xml      |  5 +---
 app/src/main/res/values-v23/themes.xml        |  1 -
 app/src/main/res/values/themes.xml            | 28 +++++++++----------
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/SettingsFragment.java b/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/SettingsFragment.java
index 4fa1347..f3d9843 100644
--- a/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cringe_studios/cringe_authenticator/fragment/SettingsFragment.java
@@ -52,7 +52,6 @@ public class SettingsFragment extends Fragment {
                 Integer themeID = SettingsUtil.THEMES.get(theme);
                 if(themeID == null) return;
 
-                Log.e("AMOGUS", "REstarting activity");
                 requireActivity().setTheme(themeID);
                 requireActivity().recreate();
             }
diff --git a/app/src/main/java/com/cringe_studios/cringe_authenticator/util/NavigationUtil.java b/app/src/main/java/com/cringe_studios/cringe_authenticator/util/NavigationUtil.java
index 66fd920..c53cbe4 100644
--- a/app/src/main/java/com/cringe_studios/cringe_authenticator/util/NavigationUtil.java
+++ b/app/src/main/java/com/cringe_studios/cringe_authenticator/util/NavigationUtil.java
@@ -1,5 +1,6 @@
 package com.cringe_studios.cringe_authenticator.util;
 
+import android.content.Context;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e4aaeec..f1b8847 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,9 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Base.Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator_Base">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+    <style name="Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator">
         <item name="android:textColor">@color/white</item>
         <item name="colorOnBackground">@color/background_grey</item>
-
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 7c092e0..5fa3656 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -1,5 +1,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-
     <style name="Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator">
         <!-- Transparent system bars for edge-to-edge. -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d500207..fdf63aa 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,42 +1,42 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.CringeAuthenticator_Base" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.CringeAuthenticator" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@android:color/transparent</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+
         <item name="colorTheme1">#FF00FF</item>
         <item name="colorTheme2">#000000</item>
         <item name="android:textColor">@color/black</item>
         <item name="colorOnBackground">@color/background_light_grey</item>
     </style>
 
-    <style name="Base.Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator_Base">
-        <!--<item name="android:textColor">@color/black</item>
-        <item name="colorOnBackground">@color/white</item>-->
-        <!--<item name="colorTheme1">@color/color_blue_green_1</item>
-        <item name="colorTheme2">@color/color_blue_green_2</item>-->
-    </style>
+    <style name="Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator" />
 
-    <style name="Theme.CringeAuthenticator.None" parent="Base.Theme.CringeAuthenticator" />
+    <style name="Theme.CringeAuthenticator.None" />
 
-    <style name="Theme.CringeAuthenticator.Blue_Green" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Blue_Green">
         <item name="colorTheme1">@color/color_blue</item>
         <item name="colorTheme2">@color/color_light_green</item>
     </style>
-    <style name="Theme.CringeAuthenticator.Red_Blue" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Red_Blue">
         <item name="colorTheme1">@color/color_red</item>
         <item name="colorTheme2">@color/color_blue</item>
     </style>
-    <style name="Theme.CringeAuthenticator.Pink_Green" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Pink_Green">
         <item name="colorTheme1">@color/color_pink</item>
         <item name="colorTheme2">@color/color_green</item>
     </style>
-    <style name="Theme.CringeAuthenticator.Blue_Yellow" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Blue_Yellow">
         <item name="colorTheme1">@color/color_blue</item>
         <item name="colorTheme2">@color/color_yellow</item>
     </style>
-    <style name="Theme.CringeAuthenticator.Green_Yellow" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Green_Yellow">
         <item name="colorTheme1">@color/color_green</item>
         <item name="colorTheme2">@color/color_yellow</item>
     </style>
-    <style name="Theme.CringeAuthenticator.Orange_Turquoise" parent="Base.Theme.CringeAuthenticator">
+    <style name="Theme.CringeAuthenticator.Orange_Turquoise">
         <item name="colorTheme1">@color/color_orange</item>
         <item name="colorTheme2">@color/color_turquoise</item>
     </style>