Small fix for themes

D4rK7355608 · Jun 18, 2024 · c9d90b8 · c9d90b8
1 parent 2cf93f5
commit c9d90b8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 125 deletions.
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt b/app/src/main/kotlin/com/d4rk/cleaner/MainComposable.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.EventNote
-import androidx.compose.material.icons.automirrored.outlined.Help
+import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.automirrored.outlined.ListAlt
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material.icons.outlined.Image
@@ -75,7 +75,7 @@ fun MainComposable() {
         ),
         NavigationItem(
             title = R.string.help_and_feedback,
-            selectedIcon = Icons.AutoMirrored.Outlined.Help,
+            selectedIcon = Icons.AutoMirrored.Outlined.HelpOutline,
         ),
         NavigationItem(
             title = R.string.updates,

diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml
@@ -1,22 +1,10 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
+    <style name="AppThemeActionBar" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="popupMenuBackground">@drawable/bg_popup</item>
-        <item name="android:alertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="materialAlertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="panelMenuListTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="actionBarStyle">@style/ActionBarTheme</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-night-v28/themes.xml b/app/src/main/res/values-night-v28/themes.xml
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,21 +1,9 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowLightStatusBar">false</item>
+    <style name="AppThemeActionBar" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="popupMenuBackground">@drawable/bg_popup</item>
-        <item name="materialAlertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="android:fontFamily">@font/font_poppins</item>
-    </style>
-
-    <style name="AppThemeNoActionBar" parent="AppTheme">
-        <item name="android:colorPrimaryDark">?attr/colorSurface</item>
-        <item name="windowActionBar">false</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="windowNoTitle">true</item>
+        <item name="actionBarStyle">@style/ActionBarTheme</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -1,22 +1,10 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
+    <style name="AppThemeActionBar" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="popupMenuBackground">@drawable/bg_popup</item>
-        <item name="android:alertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="materialAlertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="panelMenuListTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="actionBarStyle">@style/ActionBarTheme</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v28/themes.xml b/app/src/main/res/values-v28/themes.xml
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,29 +1,18 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:fontFamily">@font/font_poppins</item>
-        <item name="popupMenuBackground">@drawable/bg_popup</item>
-        <item name="android:alertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="materialAlertDialogTheme">
-            @style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
-        <item name="panelMenuListTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered
-        </item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppThemeNoActionBar" parent="AppTheme">
-        <item name="android:colorPrimaryDark">?attr/colorSurface</item>
-        <item name="windowActionBar">false</item>
+    <style name="AppThemeActionBar" parent="Theme.Material3.DynamicColors.DayNight">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="windowNoTitle">true</item>
+        <item name="actionBarStyle">@style/ActionBarTheme</item>
+    </style>
+
+    <style name="ActionBarTheme" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+        <item name="background">@android:color/transparent</item>
     </style>
 </resources>