Update: Almost Full Rewrite of theme

This commit is contained in:
LooKeR
2021-10-16 18:57:01 +05:30
parent ac79953c7c
commit 524b804336
21 changed files with 86 additions and 94 deletions

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorError" format="color" />
<attr name="colorOnBackground" format="reference" />
<attr name="subTextColor" format="reference" />
</resources>

View File

@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="green50">#E8F5E9</color>
<color name="green200">#6EC898</color>
<color name="green300">#58C189</color>
<color name="green400">#3EDA86</color>
<color name="red200">#EF9A9A</color>
<color name="red300">#E57373</color>
<color name="default_green">#3EDA86</color>
<color name="default_green_dark">#36C378</color>
<color name="white">#FFFFFF</color>
<color name="black">#1E1E1E</color>
<color name="pitch_black">#000000</color>
<color name="black">#1E1E1E</color>
<color name="white">#FFFFFF</color>
<color name="grey_light">#333333</color>
<color name="grey_dark">#595959</color>
<color name="accent_default_dark">#69ECA6</color>
<color name="accent_default_light">#2C8756</color>
<color name="error_default_dark">#D36C6B</color>
<color name="error_default_light">#F48886</color>
</resources>

View File

@@ -6,66 +6,62 @@
</style>
<style name="Theme.Main.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:colorPrimary">@color/default_green</item>
<item name="android:colorPrimaryDark">@color/white</item>
<item name="colorPrimary">@color/green400</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorSurface">@color/green50</item>
<item name="colorOnSurface">@color/black</item>
<item name="android:colorBackground">@color/white</item>
<item name="colorOnBackground">@color/default_green</item>
<item name="colorOnBackground">@color/grey_dark</item>
<item name="android:colorAccent">@color/accent_light</item>
<item name="android:colorControlActivated">@color/default_green</item>
<item name="colorError">@color/error_light</item>
<item name="android:textColor">@color/black</item>
<item name="android:titleTextColor" tools:targetApi="m">@color/black</item>
<item name="subTextColor">@color/grey_light</item>
<item name="android:popupTheme">@style/Theme.Popup.Light</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="android:statusBarColor">@color/white</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar">
<item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:windowBackground">@color/black</item>
<item name="android:colorPrimary">@color/default_green_dark</item>
<item name="android:colorPrimaryDark">@color/black</item>
<item name="colorPrimary">@color/green200</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorSurface">@color/grey_dark</item>
<item name="colorOnSurface">@color/green50</item>
<item name="toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:colorBackground">@color/black</item>
<item name="colorOnBackground">@color/grey_light</item>
<item name="colorOnBackground">@color/green200</item>
<item name="android:colorAccent">@color/accent_dark</item>
<item name="android:colorControlActivated">@color/default_green_dark</item>
<item name="colorError">@color/error_dark</item>
<item name="android:titleTextColor" tools:targetApi="m">@color/default_green_dark</item>
<item name="android:textColorPrimary">@color/default_green</item>
<item name="android:textColorPrimary">@color/green400</item>
<item name="android:textColor">@color/white</item>
<item name="subTextColor">@color/grey_dark</item>
<item name="android:popupTheme">@style/Theme.Popup.Dark</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="Theme.Main.Amoled" parent="Theme.Material3.Dark.NoActionBar">
<item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:windowBackground">@color/pitch_black</item>
<item name="android:colorPrimary">@color/default_green_dark</item>
<item name="android:colorPrimaryDark">@color/pitch_black</item>
<item name="colorPrimary">@color/green200</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorSurface">@color/black</item>
<item name="colorOnSurface">@color/green50</item>
<item name="toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:colorBackground">@color/pitch_black</item>
<item name="colorOnBackground">@color/black</item>
<item name="colorOnBackground">@color/green50</item>
<item name="android:colorAccent">@color/accent_dark</item>
<item name="android:colorControlActivated">@color/default_green_dark</item>
<item name="colorError">@color/error_dark</item>
<item name="android:titleTextColor" tools:targetApi="m">@color/default_green_dark</item>
<item name="android:textColorPrimary">@color/default_green</item>
<item name="android:textColorPrimary">@color/green400</item>
<item name="android:textColor">@color/white</item>
<item name="subTextColor">@color/black</item>
<item name="android:popupTheme">@style/Theme.Popup.Dark</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="android:statusBarColor">@color/pitch_black</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="Widget.Main.Toolbar" parent="Widget.Material3.Toolbar">
@@ -77,14 +73,9 @@
</item>
</style>
<style name="Theme.Popup.Light" parent="Theme.Material3.Light.Dialog.Alert">
<item name="android:colorControlActivated">@color/default_green</item>
<item name="android:colorBackground">@color/white</item>
</style>
<style name="Theme.Popup.Dark" parent="Theme.Material3.Dark.Dialog.Alert">
<item name="android:colorControlActivated">@color/default_green_dark</item>
<item name="android:colorBackground">@color/black</item>
<style name="Theme.Alert" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
<item name="colorPrimary">?attr/colorOnSurface</item>
<item name="android:backgroundTint">?attr/colorSurface</item>
</style>
<style name="Theme.Switch" parent="Widget.Material3.CompoundButton.Switch">