|
@@ -47,8 +47,9 @@
|
|
|
<item name="android:textDirection">locale</item>
|
|
|
|
|
|
<!-- Themes -->
|
|
|
- <item name="android:statusBarColor">?attr/colorPrimary</item>
|
|
|
- <item name="android:navigationBarColor">?attr/colorPrimary</item>
|
|
|
+ <item name="android:statusBarColor">@color/md_black_1000</item>
|
|
|
+ <item name="android:navigationBarColor">@color/md_black_1000</item>
|
|
|
+ <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
|
|
|
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
|
|
|
<item name="windowActionModeOverlay">true</item>
|
|
|
<item name="elevationOverlayEnabled">false</item>
|
|
@@ -84,28 +85,24 @@
|
|
|
<!-- Custom Attributes-->
|
|
|
<item name="colorLibrarySelection">?attr/colorAccent</item>
|
|
|
<item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
|
|
|
- <item name="colorFilterActive">@color/filterColorDark</item>
|
|
|
+ <item name="colorFilterActive">@color/filterColorLight</item>
|
|
|
</style>
|
|
|
|
|
|
<!--===========-->
|
|
|
<!-- Main Theme-->
|
|
|
<!--===========-->
|
|
|
- <style name="Theme.Tachiyomi.Light" parent="Theme.Base">
|
|
|
- <item name="android:statusBarColor">@color/md_black_1000</item>
|
|
|
- <item name="android:navigationBarColor">@color/md_black_1000_54</item>
|
|
|
+ <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base" />
|
|
|
+ <style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
|
|
|
|
|
|
- <item name="colorFilterActive">@color/filterColorLight</item>
|
|
|
- </style>
|
|
|
-
|
|
|
- <style name="Theme.Tachiyomi.LightBlue" parent="Theme.Base">
|
|
|
+ <style name="Theme.Tachiyomi.Light.Blue">
|
|
|
<item name="colorPrimary">@color/colorPrimary</item>
|
|
|
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
|
|
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
|
|
|
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
|
|
|
-
|
|
|
+ <item name="colorFilterActive">@color/filterColorDark</item>
|
|
|
<item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
|
|
|
-
|
|
|
- <item name="android:navigationBarColor">@color/colorPrimary_70</item>
|
|
|
+ <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
|
|
|
+ <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
|
|
|
</style>
|
|
|
|
|
|
<!--=============-->
|
|
@@ -145,6 +142,7 @@
|
|
|
<!-- Themes -->
|
|
|
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
|
|
<item name="android:navigationBarColor">?attr/colorPrimary</item>
|
|
|
+ <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
|
|
|
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
|
|
|
<item name="windowActionModeOverlay">true</item>
|
|
|
<item name="elevationOverlayEnabled">false</item>
|
|
@@ -184,16 +182,15 @@
|
|
|
<item name="colorFilterActive">@color/filterColorDark</item>
|
|
|
</style>
|
|
|
|
|
|
- <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
|
|
|
- </style>
|
|
|
+ <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
|
|
|
|
|
|
- <style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
|
|
|
+ <style name="Theme.Tachiyomi.Dark.Blue">
|
|
|
<item name="colorPrimary">@color/colorPrimary</item>
|
|
|
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
|
|
|
<item name="colorPrimaryVariant">@color/colorPrimary</item>
|
|
|
</style>
|
|
|
|
|
|
- <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Dark">
|
|
|
+ <style name="Theme.Tachiyomi.Dark.Amoled">
|
|
|
<item name="colorPrimary">@color/colorAmoledPrimary</item>
|
|
|
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
|
|
|
<item name="colorSurface">@color/colorAmoledPrimary</item>
|
|
@@ -255,7 +252,7 @@
|
|
|
<!--===============-->
|
|
|
<!-- Launch Screen -->
|
|
|
<!--===============-->
|
|
|
- <style name="Theme.Splash" parent="Theme.Tachiyomi.LightBlue">
|
|
|
+ <style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
|
|
|
<item name="colorBackgroundSplash">@color/colorPrimary</item>
|
|
|
|
|
|
<item name="android:windowBackground">@drawable/splash_background</item>
|