javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Create a toolbar variable for ripples (#5159)

Browse Source 
* Rename rippleNavColor to rippleSecondaryColor

It's not just for the navigation anymore

* Add a rippleToolbarColor for toolbar ripples

Fixes so you can use specialized colors in case of using a theme such as Dark Blue or Light Blue

* Add so text buttons are also themed secondary color

Apparently this is also a common Google app thing

* Changes variable name for Navigation Rail
This commit is contained in:
Soitora
2021-05-23 20:29:59 +02:00
committed by GitHub
parent 1b52acdad7
commit fed6f44995
6 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/themes.xml
+18 -10
View File
@@ -36,13 +36,16 @@
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
<item name="android:textColorHintInverse">@color/textColorHintDark</item>
<item name="rippleColor">@color/rippleColorLight</item>
<item name="rippleNavColor">@color/rippleNavColorLight</item>
<item name="android:colorEdgeEffect">?attr/colorAccent</item>
<item name="android:divider">@color/dividerLight</item>
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="rippleColor">@color/rippleColorLight</item>
<item name="rippleSecondaryColor">@color/rippleSecondaryColorLight</item>
<item name="rippleToolbarColor">@color/rippleToolbarColorLight</item>
<!-- Handles RTL text -->
<item name="android:textAlignment">gravity</item>
<item name="android:textDirection">locale</item>
@@ -57,6 +60,7 @@
<item name="actionModeStyle">@style/Theme.ActionMode</item>
<item name="actionModeCloseButtonStyle">@style/Theme.ActionMode.CloseButton</item>
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
<item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
<item name="preferenceTheme">@style/PreferenceThemeCustom</item>
@@ -104,7 +108,8 @@
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="colorFilterActive">@color/filterColorDark</item>
<item name="rippleNavColor">@color/md_white_1000_6</item>
<item name="rippleSecondaryColor">@color/md_white_1000_6</item>
<item name="rippleToolbarColor">@color/md_white_1000_12</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
@@ -138,13 +143,16 @@
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
<item name="android:textColorHintInverse">@color/textColorHintLight</item>
<item name="rippleNavColor">@color/rippleNavColorDark</item>
<item name="rippleColor">@color/rippleColorDark</item>
<item name="android:colorEdgeEffect">?attr/colorAccent</item>
<item name="android:divider">@color/dividerDark</item>
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="rippleColor">@color/rippleColorDark</item>
<item name="rippleSecondaryColor">@color/rippleSecondaryColorDark</item>
<item name="rippleToolbarColor">@color/rippleToolbarColorDark</item>
<!-- Themes -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item>
@@ -155,7 +163,7 @@
<item name="actionModeStyle">@style/Theme.ActionMode</item>
<item name="actionModeCloseButtonStyle">@style/Theme.ActionMode.CloseButton</item>
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
<item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
<item name="preferenceTheme">@style/PreferenceThemeCustom</item>
@@ -194,8 +202,8 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimary</item>
<item name="rippleNavColor">@color/md_white_1000_6</item>
<item name="rippleSecondaryColor">@color/md_black_1000_6</item>
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
</style>
<style name="Theme.Tachiyomi.Dark.Amoled">
@@ -226,7 +234,7 @@
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
<item name="switchStyle">@style/Theme.Widget.BasicSwitch</item>
<item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
@@ -242,7 +250,7 @@
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
<item name="switchStyle">@style/Theme.Widget.BasicSwitch</item>
<item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>