lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify theme color application logic

Browse Source
This commit is contained in:
MM20
2021-12-13 17:34:13 +01:00
parent cb72b9180f
commit 9ebac9684b
13 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/src/main/res/values-night-v31/color-schemes.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<resources>
<style name="DefaultColors" parent="BaseTheme">
<style name="DefaultColors">
<item name="colorPrimary">@android:color/system_accent1_200</item>
<item name="colorOnPrimary">@android:color/system_accent1_800</item>
<item name="colorPrimaryContainer">@android:color/system_accent1_700</item>
base/src/main/res/values-night/color-schemes.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<resources>
<style name="DefaultColors" parent="BaseTheme">
<style name="DefaultColors">
<item name="colorPrimary">#72D1FF</item>
<item name="colorOnPrimary">#003549</item>
<item name="colorPrimaryContainer">#004D68</item>
@@ -29,7 +29,7 @@
<item name="elevationOverlayEnabled">true</item>
</style>
<style name="BlackWhiteColors" parent="BaseTheme">
<style name="BlackWhiteColors">
<item name="colorPrimary">@android:color/white</item>
<item name="colorOnPrimary">@android:color/black</item>
<item name="colorPrimaryContainer">@android:color/black</item>
base/src/main/res/values-night/themes.xml
+1 -6
View File
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="SettingsTheme.DefaultColors" parent="DefaultColors">
<item name="android:statusBarColor">?colorSurface</item>
<item name="android:windowLightStatusBar">false</item>
</style>
<style name="SettingsTheme.BlackWhiteColors" parent="BlackWhiteColors">
<style name="SettingsTheme" parent="BaseTheme">
<item name="android:statusBarColor">?colorSurface</item>
<item name="android:windowLightStatusBar">false</item>
</style>
base/src/main/res/values-v31/color-schemes.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<resources>
<style name="DefaultColors" parent="BaseTheme">
<style name="DefaultColors">
<item name="colorPrimary">@android:color/system_accent1_600</item>
<item name="colorOnPrimary">@android:color/system_accent1_0</item>
<item name="colorPrimaryContainer">@android:color/system_accent1_100</item>
base/src/main/res/values/color-schemes.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<resources>
<style name="DefaultColors" parent="BaseTheme">
<style name="DefaultColors">
<item name="colorPrimary">#006689</item>
<item name="colorOnPrimary">@android:color/white</item>
<item name="colorPrimaryContainer">#BFE8FF</item>
@@ -29,7 +29,7 @@
<item name="elevationOverlayEnabled">false</item>
</style>
<style name="BlackWhiteColors" parent="BaseTheme">
<style name="BlackWhiteColors">
<item name="colorPrimary">@android:color/black</item>
<item name="colorOnPrimary">@android:color/white</item>
<item name="colorPrimaryContainer">@android:color/white</item>
base/src/main/res/values/styles.xml
-29
View File
@@ -21,31 +21,6 @@
<item name="alertDialogTheme">@style/AlertDialogTheme</item>
</style>
<!-- Main theme. -->
<style name="LauncherTheme" parent="BaseLauncherTheme">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="android:colorPrimaryDark">#0000</item>
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="android:enforceNavigationBarContrast">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="SettingsTheme" parent="BaseLauncherTheme.Settings">
<item name="android:colorAccent">@color/blue</item>
<item name="colorAccent">@color/blue</item>
<item name="colorPrimary">@color/settings_color_primary</item>
<item name="colorPrimaryDark">@color/settings_color_primary_dark</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
</style>
<style name="AlertDialogTheme" parent="ThemeOverlay.Material3.Dialog.Alert">
<item name="buttonBarButtonStyle">@style/AlertDialogButtonStyle</item>
<item name="dialogCornerRadius">8dp</item>
@@ -96,10 +71,6 @@
<item name="android:textColor">@color/chip_textcolor</item>
</style>
<style name="BaseLauncherTheme.Settings">
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="LauncherTheme.IconStyle">
<item name="android:alpha">0.87</item>
<item name="android:tint">@color/icon_color</item>
base/src/main/res/values/themes.xml
+2 -22
View File
@@ -19,32 +19,12 @@
</style>
<style name="SettingsTheme.DefaultColors" parent="DefaultColors">
<style name="SettingsTheme" parent="BaseTheme">
<item name="android:statusBarColor">?colorSurface</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="SettingsTheme.BlackWhiteColors" parent="BlackWhiteColors">
<item name="android:statusBarColor">?colorSurface</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="LauncherTheme.DefaultColors" parent="DefaultColors">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="android:colorPrimaryDark">#0000</item>
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="android:enforceNavigationBarContrast">false</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="LauncherTheme.BlackWhiteColors" parent="BlackWhiteColors">
<style name="LauncherTheme" parent="BaseTheme">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="android:colorPrimaryDark">#0000</item>