Migrate to MaterialComponents themes
This commit is contained in:
arkon
@@ -9,38 +9,48 @@
|
||||
<!--==============-->
|
||||
<!-- Light Themes -->
|
||||
<!--=======-======-->
|
||||
<style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<style name="Theme.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<!-- AppBar -->
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorSecondary">@color/colorAccentLight</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorSurface">@color/dialogLight</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryLight</item>
|
||||
<item name="colorAccent">@color/colorAccentLight</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/backgroundLight</item>
|
||||
<item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
|
||||
<item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
|
||||
<item name="android:textColorHint">@color/textColorHintLight</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
|
||||
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
|
||||
<item name="android:textColorHintInverse">@color/textColorHintDark</item>
|
||||
<item name="android:colorBackground">@color/backgroundLight</item>
|
||||
<item name="android:listSelector">?colorAccent</item>
|
||||
<item name="rippleColor">@color/rippleColorLight</item>
|
||||
|
||||
<item name="android:divider">@color/dividerLight</item>
|
||||
<item name="android:listDivider">@drawable/line_divider_light</item>
|
||||
<item name="android:listDivider">@drawable/line_divider</item>
|
||||
|
||||
<!-- Handles RTL text -->
|
||||
<item name="android:textAlignment">gravity</item>
|
||||
<item name="android:textDirection">locale</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="android:forceDarkAllowed">false</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionBarTheme">@style/Theme.ActionBar.Light</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="alertDialogTheme">@style/Theme.AlertDialog.Light</item>
|
||||
<item name="dialogTheme">@style/Theme.AlertDialog.Light</item>
|
||||
<item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
|
||||
<item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
|
||||
<item name="text_color_primary">@color/textColorPrimaryLight</item>
|
||||
<item name="background_card">@color/dialogLight</item>
|
||||
<item name="tabBarIconColor">@android:color/white</item>
|
||||
<item name="tabBarIconInactive">@color/textColorHintDark</item>
|
||||
</style>
|
||||
|
||||
<!--===========-->
|
||||
@@ -55,20 +65,28 @@
|
||||
<!--=============-->
|
||||
<!-- Dark Themes -->
|
||||
<!--=============-->
|
||||
<style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar">
|
||||
<style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/colorDarkPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
|
||||
<item name="colorSecondary">@color/colorAccentDark</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorSurface">@color/dialogDark</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccentDark</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/backgroundDark</item>
|
||||
<item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
|
||||
<item name="android:textColorHint">@color/textColorHintDark</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
|
||||
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
|
||||
<item name="android:textColorHintInverse">@color/textColorHintLight</item>
|
||||
<item name="android:colorBackground">@color/backgroundDark</item>
|
||||
<item name="android:listSelector">?colorAccent</item>
|
||||
<item name="rippleColor">@color/rippleColorDark</item>
|
||||
|
||||
<item name="android:divider">@color/dividerDark</item>
|
||||
<item name="android:listDivider">@drawable/line_divider_dark</item>
|
||||
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
@@ -76,19 +94,15 @@
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="md_background_color">@color/dialogDark</item>
|
||||
<item name="dialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
<item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
|
||||
<item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
|
||||
<item name="text_color_primary">@color/textColorPrimaryDark</item>
|
||||
<item name="background_card">@color/dialogDark</item>
|
||||
<item name="tabBarIconColor">@android:color/white</item>
|
||||
<item name="tabBarIconInactive">@color/textColorHintDark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
|
||||
@@ -110,7 +124,9 @@
|
||||
<style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
|
||||
<item name="colorPrimary">@color/colorAmoledPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
|
||||
<item name="android:colorBackground">@color/md_black_1000</item>
|
||||
<item name="colorSurface">@color/colorAmoledPrimary</item>
|
||||
|
||||
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
|
||||
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
@@ -118,12 +134,9 @@
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="md_background_color">@color/colorAmoledPrimary</item>
|
||||
<item name="alertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
|
||||
<item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item>
|
||||
<item name="background_card">@color/colorAmoledPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
|
||||
@@ -136,19 +149,19 @@
|
||||
<style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
|
||||
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/readerColorDarkPrimary</item>
|
||||
<item name="android:colorBackground">@android:color/black</item>
|
||||
<item name="colorSurface">@android:color/black</item>
|
||||
|
||||
<item name="android:statusBarColor">?colorPrimaryDark</item>
|
||||
<item name="android:navigationBarColor">?colorPrimaryDark</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Base.Reader.Light" parent="Theme.Base">
|
||||
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/readerColorDarkPrimary</item>
|
||||
<item name="android:colorBackground">@android:color/white</item>
|
||||
<item name="colorSurface">@android:color/white</item>
|
||||
|
||||
<item name="android:statusBarColor">?colorPrimaryDark</item>
|
||||
<item name="android:navigationBarColor">?colorPrimaryDark</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Reader" parent="Theme.Base.Reader.Dark">
|
||||
@@ -171,5 +184,4 @@
|
||||
<item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
|
||||
</style>
|
||||
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user