mirror of
https://github.com/mihonapp/mihon.git
synced 2025-11-03 15:48:56 +01:00
More themes cleanup (#5410)
* More themes cleanup * Tweak some things * Fix 'Clear History' icon * Split out ripple colored to its own drawable * Tidy up things * Unify background dim amount * Use primaryColor for Account login button * More colored ripples * use colorOnPrimary for selected comfortable library item title Co-authored-by: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
Ivan Iskandar
GitHub
@@ -17,14 +17,17 @@
|
||||
<attr name="summary" format="reference|string" />
|
||||
</declare-styleable>
|
||||
|
||||
<attr name="colorLibrarySelection" format="reference|integer"/>
|
||||
<attr name="colorLibrarySelectionActive" format="reference|integer"/>
|
||||
<attr name="colorFilterActive" format="reference|integer"/>
|
||||
<attr name="colorBackgroundSplash" format="reference|integer"/>
|
||||
<attr name="colorAccentOnPrimary" format="reference|integer"/>
|
||||
<attr name="colorTertiary" format="reference|integer"/>
|
||||
<attr name="colorOnTertiary" format="reference|integer"/>
|
||||
<attr name="rippleSecondaryColor" format="reference|integer"/>
|
||||
<attr name="rippleToolbarColor" format="reference|integer"/>
|
||||
|
||||
<!-- Ripple color for toolbar elements -->
|
||||
<attr name="rippleColorToolbar" format="reference|color"/>
|
||||
|
||||
<!-- Toolbar color. Not actually used by the toolbar. -->
|
||||
<attr name="colorToolbar" format="reference|color"/>
|
||||
|
||||
<!-- For anything that is drawn on the toolbar -->
|
||||
<attr name="colorOnToolbar" format="reference|integer"/>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -1,104 +1,59 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Application Colors -->
|
||||
<color name="colorPrimary">#54759E</color>
|
||||
<color name="colorPrimaryDark">#435E7E</color>
|
||||
<color name="colorPrimary_70">#B354759E</color>
|
||||
|
||||
<!-- Dark Application Colors -->
|
||||
<color name="colorDarkPrimary">#242529</color>
|
||||
<color name="colorDarkPrimaryDark">#202125</color>
|
||||
|
||||
<!-- AMOLED Application Colors -->
|
||||
<color name="colorAmoledPrimary">@color/md_black_1000</color>
|
||||
|
||||
<!-- Splash Color -->
|
||||
<color name="splashBackgroundColor">@color/colorPrimary</color>
|
||||
<color name="splash">@color/accent_lightblue</color>
|
||||
|
||||
<!-- Light Theme -->
|
||||
<color name="colorAccentLight">@color/md_blue_A400</color>
|
||||
<color name="textColorPrimaryLight">@color/md_black_1000_87</color>
|
||||
<color name="textColorSecondaryLight">@color/md_black_1000_54</color>
|
||||
<color name="textColorHintLight">@color/md_black_1000_38</color>
|
||||
<color name="dividerLight">@color/md_black_1000_12</color>
|
||||
<color name="rippleColorLight">@color/md_black_1000_6</color>
|
||||
<color name="rippleSecondaryColorLight">@color/md_blue_A400_4</color>
|
||||
<color name="rippleToolbarColorLight">@color/rippleColorLight</color>
|
||||
<color name="backgroundLight">@color/md_grey_50</color>
|
||||
<color name="dialogLight">@color/md_white_1000</color>
|
||||
<color name="selectorColorLight">@color/md_blue_A400_75</color>
|
||||
<color name="accent_light">@color/md_blue_A400</color>
|
||||
<color name="divider_light">@color/md_black_1000_12</color>
|
||||
<color name="surface_light">@color/md_white_1000</color>
|
||||
<color name="background_light">@color/md_grey_50</color>
|
||||
|
||||
<!-- Light Blue Theme -->
|
||||
<color name="accent_lightblue">#54759E</color>
|
||||
<color name="ripple_colored_lightblue">#1F54759E</color>
|
||||
|
||||
<!-- Strawberry Daiquiri Theme -->
|
||||
<color name="colorAccentStrawberry">#ED4A65</color>
|
||||
<color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
|
||||
<color name="selectorColorStrawberry">#BFED4A65</color>
|
||||
<color name="accent_strawberry">#ED4A65</color>
|
||||
|
||||
<!-- Yotsuba Theme -->
|
||||
<color name="colorAccentYotsuba">#FC8C5C</color>
|
||||
<color name="rippleSecondaryColorYotsuba">#0AFC8C5C</color>
|
||||
<color name="selectorColorYotsuba">#BFFC8C5C</color>
|
||||
<color name="accent_yotsuba">#FC8C5C</color>
|
||||
|
||||
<!-- Dark Theme -->
|
||||
<color name="colorAccentDark">#3399FF</color>
|
||||
<color name="textColorPrimaryDark">@color/md_white_1000</color>
|
||||
<color name="textColorSecondaryDark">@color/md_white_1000_70</color>
|
||||
<color name="textColorHintDark">@color/md_white_1000_50</color>
|
||||
<color name="dividerDark">@android:color/transparent</color>
|
||||
<color name="rippleColorDark">@color/md_white_1000_6</color>
|
||||
<color name="rippleSecondaryColorDark">#0A3399FF</color>
|
||||
<color name="rippleToolbarColorDark">@color/rippleColorDark</color>
|
||||
<color name="backgroundDark">@color/colorDarkPrimaryDark</color>
|
||||
<color name="dialogDark">@color/colorDarkPrimary</color>
|
||||
<color name="selectorColorDark">@color/md_blue_A200_50</color>
|
||||
<color name="accent_dark">#3399FF</color>
|
||||
<color name="divider_dark">@color/md_white_1000_12</color>
|
||||
<color name="surface_dark">#242529</color>
|
||||
<color name="background_dark">#202125</color>
|
||||
|
||||
<!-- Dark Blue Theme -->
|
||||
<color name="accent_darkblue">#54759E</color>
|
||||
<color name="ripple_colored_darkblue">#1F54759E</color>
|
||||
|
||||
<!-- Green Apple Theme -->
|
||||
<color name="colorAccentApple">#48E484</color>
|
||||
<color name="colorOnSecondaryApple">@color/md_black_1000</color>
|
||||
<color name="rippleSecondaryColorApple">#0A48E484</color>
|
||||
<color name="selectorColorApple">#BF48E484</color>
|
||||
<color name="accent_greenapple">#48E484</color>
|
||||
|
||||
<!-- Midnight Dusk Theme -->
|
||||
<color name="colorAccentDusk">#F02475</color>
|
||||
<color name="textColorPrimaryDusk">@color/md_white_1000</color>
|
||||
<color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
|
||||
<color name="textColorHintDusk">@color/md_white_1000_50</color>
|
||||
<color name="dividerDusk">#12ffffff</color>
|
||||
<color name="rippleSecondaryColorDusk">#0FF02475</color>
|
||||
<color name="backgroundDusk">#16151D</color>
|
||||
<color name="dialogDusk">#201F27</color>
|
||||
<color name="selectorColorDusk">#BFF02475</color>
|
||||
<color name="accent_midnightdusk">#F02475</color>
|
||||
<color name="background_midnightdusk">#16151D</color>
|
||||
<color name="surface_midnightdusk">#201F27</color>
|
||||
|
||||
<!-- AMOLED Theme -->
|
||||
<color name="colorAccentAmoled">#3399FF</color>
|
||||
<color name="textColorPrimaryAmoled">@color/md_white_1000</color>
|
||||
<color name="textColorSecondaryAmoled">@color/md_white_1000_70</color>
|
||||
<color name="textColorHintAmoled">@color/md_white_1000_50</color>
|
||||
<color name="dividerAmoled">@android:color/transparent</color>
|
||||
<color name="rippleColorAmoled">@color/md_white_1000_8</color>
|
||||
<color name="rippleSecondaryColorAmoled">#0A3399FF</color>
|
||||
<color name="rippleToolbarColorAmoled">@color/rippleColorAmoled</color>
|
||||
<color name="backgroundAmoled">@color/colorAmoledPrimary</color>
|
||||
<color name="dialogAmoled">@color/colorAmoledPrimary</color>
|
||||
<color name="selectorColorAmoled">@color/md_blue_A200_75</color>
|
||||
<color name="accent_amoled">#3399FF</color>
|
||||
<color name="divider_amoled">@android:color/transparent</color>
|
||||
<color name="surface_amoled">@color/md_black_1000</color>
|
||||
<color name="background_amoled">@color/md_black_1000</color>
|
||||
|
||||
<!-- Hot Pink Theme -->
|
||||
<color name="colorAccentPink">#FF3399</color>
|
||||
<color name="textColorPrimaryPink">@color/md_white_1000</color>
|
||||
<color name="textColorSecondaryPink">@color/md_white_1000_70</color>
|
||||
<color name="textColorHintPink">@color/md_white_1000_50</color>
|
||||
<color name="rippleSecondaryColorPink">#0AFF3399</color>
|
||||
<color name="selectorColorPink">#BFFF69B4</color>
|
||||
<color name="accent_hotpink">#FF3399</color>
|
||||
|
||||
<!-- Reader Theme -->
|
||||
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
|
||||
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
|
||||
<color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
|
||||
<color name="reader_toolbar">#242529</color>
|
||||
|
||||
<color name="filterColorLight">#FFC107</color>
|
||||
<color name="filterColorDark">#FFEB3B</color>
|
||||
<color name="filterColorAmoled">#FFEB3B</color>
|
||||
|
||||
<!-- Text Colors -->
|
||||
<!-- Material Design Colors -->
|
||||
<color name="md_black_1000">#000000</color>
|
||||
<color name="md_black_1000_87">#DE000000</color>
|
||||
<color name="md_black_1000_54">#8A000000</color>
|
||||
<color name="md_black_1000_38">#61000000</color>
|
||||
@@ -115,9 +70,6 @@
|
||||
<color name="md_white_1000_8">#14FFFFFF</color>
|
||||
<color name="md_white_1000_6">#0FFFFFFF</color>
|
||||
|
||||
<!-- Material Design Colors -->
|
||||
<color name="md_black_1000">#000000</color>
|
||||
|
||||
<color name="md_grey_50">#FAFAFA</color>
|
||||
<color name="md_grey_50_75">#BFFAFAFA</color>
|
||||
<color name="md_grey_100">#F5F5F5</color>
|
||||
@@ -133,7 +85,7 @@
|
||||
<color name="md_blue_A400">#2979FF</color>
|
||||
<color name="md_blue_A400_75">#BF2979FF</color>
|
||||
<color name="md_blue_A400_38">#612979FF</color>
|
||||
<color name="md_blue_A400_4">#0A2979FF</color>
|
||||
<color name="md_blue_A400_12">#1F2979FF</color>
|
||||
|
||||
<color name="md_blue_grey_900">#263238</color>
|
||||
<color name="md_blue_grey_800">#37474F</color>
|
||||
|
||||
@@ -17,4 +17,7 @@
|
||||
<dimen name="screen_edge_margin">16dp</dimen>
|
||||
|
||||
<dimen name="tablet_horizontal_cover_margin">128dp</dimen>
|
||||
|
||||
<!-- material-dialogs button radius -->
|
||||
<dimen name="md_action_button_corner_radius">4dp</dimen>
|
||||
</resources>
|
||||
|
||||
@@ -4,96 +4,40 @@
|
||||
<!--========-->
|
||||
<!--Toolbars-->
|
||||
<!--========-->
|
||||
<style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
|
||||
|
||||
<style name="Theme.Toolbar.Custom.Light" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
|
||||
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
|
||||
<style name="ThemeOverlay.Tachiyomi.ActionBar" parent="ThemeOverlay.MaterialComponents.ActionBar">
|
||||
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Toolbar.Custom.Dark" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
|
||||
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
|
||||
<style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
|
||||
<item name="tint">?attr/colorOnToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Toolbar.Custom.Amoled" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
|
||||
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
|
||||
<style name="Widget.Tachiyomi.ActionMode" parent="Widget.AppCompat.ActionMode">
|
||||
<item name="background">?attr/colorToolbar</item>
|
||||
<item name="titleTextStyle">@style/TextAppearance.Tachiyomi.ActionMode.Title</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Toolbar.Custom.PopupTheme" parent="Theme.Toolbar.Custom.Dark">
|
||||
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
|
||||
<style name="Theme.Tachiyomi.ActionMode.CloseButton" parent="Widget.AppCompat.ActionButton.CloseMode">
|
||||
<item name="android:tint">?attr/colorOnToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Toolbar.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
|
||||
<item name="tint">?attr/colorOnPrimary</item>
|
||||
<style name="Theme.Tachiyomi.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||
<item name="android:tint">?attr/colorOnToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.ActionMode" parent="Base.Widget.AppCompat.ActionMode">
|
||||
<item name="background">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.ActionMode.CloseButton" parent="Base.Widget.AppCompat.ActionButton.CloseMode">
|
||||
<item name="android:tint">?attr/colorOnPrimary</item>
|
||||
<style name="Widget.Tachiyomi.Toolbar.Primary" parent="Widget.MaterialComponents.Toolbar.Primary">
|
||||
<item name="android:elevation">0dp</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!--===========-->
|
||||
<!--AlertDialog-->
|
||||
<!--===========-->
|
||||
<style name="Theme.AlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
|
||||
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
|
||||
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
|
||||
|
||||
<style name="ThemeOverlay.Tachiyomi.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
|
||||
<item name="android:background">?attr/colorSurface</item>
|
||||
<item name="shapeAppearanceOverlay">@style/Theme.MaterialAlertDialog.Style.ShapeAppearance</item>
|
||||
|
||||
<item name="materialAlertDialogTitleTextStyle">@style/Theme.MaterialAlertDialog.Style.Title</item>
|
||||
<item name="android:textColorPrimary">?attr/colorOnSurface</item>
|
||||
<item name="android:textColor">?attr/colorOnSurface</item>
|
||||
|
||||
<item name="buttonBarPositiveButtonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="buttonBarNegativeButtonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="buttonBarNeutralButtonStyle">@style/Theme.Widget.Button</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.MaterialAlertDialog.Style.ShapeAppearance" parent="">
|
||||
<item name="cornerSize">@dimen/dialog_radius</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.MaterialAlertDialog.Style.Title" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">@dimen/md_title_textsize</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Light" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentLight</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Light.StrawberryDaiquiri" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentStrawberry</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Light.Yotsuba" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Dark" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentDark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Dark.GreenApple" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentApple</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Dark.MidnightDusk" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentDusk</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Amoled" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentAmoled</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.AlertDialog.Amoled.HotPink" parent="Theme.AlertDialog">
|
||||
<item name="colorAccent">@color/colorAccentPink</item>
|
||||
</style>
|
||||
|
||||
|
||||
@@ -101,19 +45,16 @@
|
||||
<!--BottomSheet-->
|
||||
<!--===========-->
|
||||
|
||||
<style name="Theme.BottomSheet" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
|
||||
<item name="android:windowIsFloating">false</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:navigationBarColor">?attr/colorSurface</item>
|
||||
<item name="bottomSheetStyle">@style/Theme.BottomSheet.Style</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.BottomSheetDialog</item>
|
||||
<style name="ThemeOverlay.Tachiyomi.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
|
||||
<item name="bottomSheetStyle">@style/Widget.Tachiyomi.BottomSheet.Modal</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.Tachiyomi.BottomSheetDialog</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.BottomSheet.Style" parent="Widget.MaterialComponents.BottomSheet">
|
||||
<item name="shapeAppearanceOverlay">@style/Theme.BottomSheet.Style.ShapeAppearance</item>
|
||||
<style name="Widget.Tachiyomi.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
|
||||
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Tachiyomi.BottomSheet</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.BottomSheet.Style.ShapeAppearance" parent="">
|
||||
<style name="ShapeAppearanceOverlay.Tachiyomi.BottomSheet" parent="">
|
||||
<item name="cornerFamily">rounded</item>
|
||||
<item name="cornerSizeTopRight">@dimen/dialog_radius</item>
|
||||
<item name="cornerSizeTopLeft">@dimen/dialog_radius</item>
|
||||
@@ -121,7 +62,7 @@
|
||||
<item name="cornerSizeBottomLeft">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Animation.BottomSheetDialog" parent="Animation.AppCompat.Dialog">
|
||||
<style name="Animation.Tachiyomi.BottomSheetDialog" parent="Animation.AppCompat.Dialog">
|
||||
<item name="android:windowEnterAnimation">@anim/bottom_sheet_slide_in</item>
|
||||
<item name="android:windowExitAnimation">@anim/bottom_sheet_slide_out</item>
|
||||
</style>
|
||||
@@ -130,7 +71,7 @@
|
||||
<!--===============-->
|
||||
<!--Text Appearance-->
|
||||
<!--===============-->
|
||||
<style name="TextAppearance" parent="@android:style/TextAppearance">
|
||||
<style name="TextAppearance" parent="android:TextAppearance">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
@@ -185,7 +126,7 @@
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Widget.Button" parent="TextAppearance.MaterialComponents.Button">
|
||||
<item name="android:letterSpacing">0</item>
|
||||
<item name="android:letterSpacing">-0.006</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
@@ -198,25 +139,16 @@
|
||||
<item name="android:letterSpacing">0</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Tachiyomi.ActionMode.Title" parent="TextAppearance.MaterialComponents.Headline6">
|
||||
<item name="android:textColor">?attr/colorOnToolbar</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!--=======-->
|
||||
<!--Widgets-->
|
||||
<!--=======-->
|
||||
<style name="Theme.Widget" />
|
||||
|
||||
<style name="Theme.Widget.FAB" parent="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="fabCustomSize">@dimen/fab_size</item>
|
||||
<item name="android:minWidth">@dimen/fab_size</item>
|
||||
<item name="android:layout_gravity">bottom|end</item>
|
||||
<item name="android:layout_margin">16dp</item>
|
||||
<item name="android:scaleType">fitCenter</item>
|
||||
<item name="layout_anchorGravity">bottom|right|end</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.CardView" parent="CardView">
|
||||
<style name="Widget.Tachiyomi.CardView" parent="CardView">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:padding">16dp</item>
|
||||
@@ -229,19 +161,19 @@
|
||||
<item name="cardElevation">2dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.CardView.Item">
|
||||
<style name="Widget.Tachiyomi.CardView.Item">
|
||||
<item name="android:layout_marginTop">@dimen/space_between_cards</item>
|
||||
<item name="android:layout_marginBottom">@dimen/space_between_cards</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.GridView">
|
||||
<style name="Widget.Tachiyomi.GridView" parent="android:Widget">
|
||||
<item name="android:smoothScrollbar">true</item>
|
||||
<item name="android:numColumns">auto_fit</item>
|
||||
<item name="android:stretchMode">columnWidth</item>
|
||||
<item name="android:scrollbarStyle">outsideOverlay</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.GridView.Source">
|
||||
<style name="Widget.Tachiyomi.GridView.Source">
|
||||
<item name="android:gravity">top|left</item>
|
||||
<item name="android:smoothScrollbar">true</item>
|
||||
<item name="android:cacheColorHint">?android:attr/textColorHint</item>
|
||||
@@ -251,26 +183,27 @@
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
|
||||
<style name="Widget.Tachiyomi.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
|
||||
<item name="android:textColor">?attr/colorOnSurface</item>
|
||||
<item name="android:background">@drawable/list_item_selector</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Widget.Snackbar" parent="Widget.MaterialComponents.Snackbar">
|
||||
<style name="Widget.Tachiyomi.Snackbar" parent="Widget.MaterialComponents.Snackbar">
|
||||
<item name="android:background">@drawable/snackbar_background</item>
|
||||
<item name="actionTextColorAlpha">1</item>
|
||||
</style>
|
||||
<style name="Theme.Widget.Snackbar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
|
||||
<style name="Widget.Tachiyomi.Snackbar.TextView" parent="Widget.MaterialComponents.Snackbar.TextView">
|
||||
<item name="android:textColor">?attr/colorOnSurface</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Widget.Chip" parent="Widget.MaterialComponents.Chip.Action">
|
||||
<style name="Widget.Tachiyomi.Chip.Action" parent="Widget.MaterialComponents.Chip.Action">
|
||||
<item name="chipStrokeWidth">1dp</item>
|
||||
<item name="chipStrokeColor">?attr/colorAccent</item>
|
||||
<item name="chipBackgroundColor">@color/background_color_chip_state</item>
|
||||
<item name="android:textColor">?attr/colorAccent</item>
|
||||
<item name="chipStrokeColor">?attr/colorPrimary</item>
|
||||
<item name="chipBackgroundColor">@android:color/transparent</item>
|
||||
<item name="android:textColor">?attr/colorPrimary</item>
|
||||
<item name="rippleColor">?attr/colorControlHighlight</item>
|
||||
|
||||
<!-- Custom chip states -->
|
||||
<item name="android:clickable">true</item>
|
||||
@@ -286,79 +219,29 @@
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Widget.BasicSwitch" parent="Widget.MaterialComponents.CompoundButton.Switch">
|
||||
<style name="Widget.Tachiyomi.BasicSwitch" parent="Widget.MaterialComponents.CompoundButton.Switch">
|
||||
<item name="useMaterialThemeColors">false</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.Widget.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator">
|
||||
<item name="indicatorColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
<style name="Theme.Widget.CircularProgressIndicator.Small" parent="Theme.Widget.CircularProgressIndicator">
|
||||
<style name="Widget.Tachiyomi.CircularProgressIndicator.Small" parent="Widget.MaterialComponents.CircularProgressIndicator">
|
||||
<item name="indicatorSize">16dp</item>
|
||||
<item name="trackThickness">2dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
|
||||
<item name="indicatorColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!--=======================-->
|
||||
<!--Widgets.TextInputLayout-->
|
||||
<!--=======================-->
|
||||
|
||||
<style name="ThemeOverlay.Widget.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
|
||||
<item name="colorControlActivated">?attr/colorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.TextInputLayout.OutlinedBox" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.Widget.TextInputEditText.OutlinedBox</item>
|
||||
<item name="boxStrokeColor">@color/text_input_stroke</item>
|
||||
<item name="hintTextColor">?attr/colorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.TextInputLayout.OutlinedBox.Dense" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.Widget.TextInputEditText.OutlinedBox</item>
|
||||
<item name="boxStrokeColor">@color/text_input_stroke</item>
|
||||
<item name="hintTextColor">?attr/colorSecondary</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!--==============-->
|
||||
<!--Widgets.Button-->
|
||||
<!--==============-->
|
||||
<style name="Theme.Widget.Button" parent="Widget.MaterialComponents.Button.TextButton">
|
||||
<item name="android:textColor">?attr/colorAccent</item>
|
||||
<item name="rippleColor">?attr/rippleSecondaryColor</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.Button.FilledAccent" parent="Widget.MaterialComponents.Button">
|
||||
<item name="android:textColor">?attr/colorOnSecondary</item>
|
||||
<item name="backgroundTint">?attr/colorAccent</item>
|
||||
<item name="rippleColor">?attr/rippleColor</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.Button.Action" parent="Widget.MaterialComponents.Button.UnelevatedButton.Icon">
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
|
||||
<item name="backgroundTint">@android:color/transparent</item>
|
||||
<item name="rippleColor">?attr/rippleColor</item>
|
||||
|
||||
<style name="Widget.Tachiyomi.Button.ActionButton" parent="Widget.MaterialComponents.Button.TextButton.Icon">
|
||||
<item name="iconGravity">top</item>
|
||||
<item name="iconTint">@color/button_action_selector</item>
|
||||
<item name="iconPadding">4dp</item>
|
||||
<item name="android:textColor">@color/button_action_selector</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Widget.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
|
||||
<item name="android:letterSpacing">0.0</item>
|
||||
<item name="android:textColor">?attr/colorAccent</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
|
||||
<style name="Widget.Tachiyomi.Button.InlineButton" parent="Widget.MaterialComponents.Button.TextButton">
|
||||
<item name="android:minHeight">0dp</item>
|
||||
<item name="android:minWidth">0dp</item>
|
||||
<item name="android:paddingTop">0dp</item>
|
||||
@@ -375,18 +258,26 @@
|
||||
<!--=================-->
|
||||
<!--Widgets.TabLayout-->
|
||||
<!--=================-->
|
||||
<style name="Theme.Widget.Tabs" parent="Widget.MaterialComponents.TabLayout.Colored">
|
||||
<style name="Widget.Tachiyomi.TabLayout" parent="Widget.MaterialComponents.TabLayout">
|
||||
<item name="tabGravity">center</item>
|
||||
<item name="tabIndicator">@drawable/tab_indicator</item>
|
||||
<item name="tabIndicatorColor">?attr/colorAccentOnPrimary</item>
|
||||
<item name="tabTextColor">@color/tabs_selector</item>
|
||||
<item name="tabIndicatorFullWidth">false</item>
|
||||
<item name="tabIndicatorHeight">3dp</item>
|
||||
<item name="tabInlineLabel">true</item>
|
||||
<item name="tabMinWidth">75dp</item>
|
||||
<item name="tabMode">scrollable</item>
|
||||
<item name="tabTextAppearance">@style/TextAppearance.Widget.Tab</item>
|
||||
<item name="tabRippleColor">?attr/rippleSecondaryColor</item>
|
||||
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Tachiyomi.TabLayout.Colored" parent="Widget.MaterialComponents.TabLayout.Colored">
|
||||
<item name="tabGravity">center</item>
|
||||
<item name="tabIndicator">@drawable/tab_indicator</item>
|
||||
<item name="tabIndicatorFullWidth">false</item>
|
||||
<item name="tabIndicatorHeight">3dp</item>
|
||||
<item name="tabInlineLabel">true</item>
|
||||
<item name="tabMinWidth">75dp</item>
|
||||
<item name="tabMode">scrollable</item>
|
||||
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
|
||||
</style>
|
||||
|
||||
|
||||
@@ -406,12 +297,19 @@
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
|
||||
<!--================================-->
|
||||
<!--material-dialogs style overrides-->
|
||||
<!--================================-->
|
||||
<style name="MD_Light" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
|
||||
<item name="md_divider_color">@color/md_divider_light_theme</item>
|
||||
<item name="md_item_selector">@drawable/md_item_selector</item>
|
||||
<item name="md_button_selector">@drawable/md_btn_selector</item>
|
||||
</style>
|
||||
|
||||
<!--===============-->
|
||||
<!--Custom Selector-->
|
||||
<!--===============-->
|
||||
<style name="PreferenceThemeCustom" parent="@style/PreferenceThemeOverlay">
|
||||
<item name="android:selectableItemBackground">@drawable/ripple_background</item>
|
||||
<style name="MD_Dark" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
|
||||
<item name="md_divider_color">@color/md_divider_dark_theme</item>
|
||||
<item name="md_item_selector">@drawable/md_item_selector_dark</item>
|
||||
<item name="md_button_selector">@drawable/md_btn_selector_dark</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -5,49 +5,30 @@
|
||||
<!-- Base Theme -->
|
||||
<!--============-->
|
||||
|
||||
<!--== Theme ==-->
|
||||
<style name="Theme" />
|
||||
|
||||
<!--== Theme base ==-->
|
||||
<style name="Theme.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<!-- AppBar -->
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<style name="Theme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<!-- Disallow 'Force dark theme' -->
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
|
||||
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/md_white_1000</item>
|
||||
<item name="colorOnPrimary">@color/md_black_1000</item>
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentLight</item>
|
||||
<item name="colorPrimaryVariant">@color/md_white_1000</item>
|
||||
<item name="colorSecondary">@color/colorAccentLight</item>
|
||||
<item name="colorOnSecondary">@color/md_white_1000</item>
|
||||
<item name="colorPrimary">@color/accent_light</item>
|
||||
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
|
||||
<item name="colorOnPrimary">@color/md_white_1000</item>
|
||||
<item name="colorSecondary">?attr/colorPrimary</item>
|
||||
<item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
|
||||
<item name="colorOnSecondary">?attr/colorOnPrimary</item>
|
||||
<item name="colorTertiary">@color/green</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@color/dialogLight</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryLight</item>
|
||||
<item name="colorOnBackground">@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:colorEdgeEffect">?attr/colorAccent</item>
|
||||
|
||||
<item name="android:divider">@color/dividerLight</item>
|
||||
<item name="colorToolbar">?attr/colorSurface</item>
|
||||
<item name="colorOnToolbar">?attr/colorOnSurface</item>
|
||||
<item name="colorSurface">@color/surface_light</item>
|
||||
<item name="android:colorBackground">@color/background_light</item>
|
||||
<item name="android:divider">@color/divider_light</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>
|
||||
<item name="android:colorControlHighlight">@color/rippleColorLight</item>
|
||||
<item name="colorControlHighlight">@color/ripple_colored</item>
|
||||
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
|
||||
|
||||
<!-- Handles RTL text -->
|
||||
<item name="android:textAlignment">gravity</item>
|
||||
@@ -58,42 +39,38 @@
|
||||
<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>
|
||||
<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.Light</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeCustom</item>
|
||||
<item name="dialogTheme">@style/Theme.AlertDialog.Light</item>
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
|
||||
<item name="chipStyle">@style/Theme.Widget.Chip</item>
|
||||
<item name="buttonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
|
||||
<item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
<item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
|
||||
<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
|
||||
<item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
|
||||
<item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
|
||||
<item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
|
||||
<item name="android:backgroundDimAmount">0.32</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
|
||||
<item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
|
||||
<item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
|
||||
<item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
|
||||
<item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
|
||||
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
|
||||
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
|
||||
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
|
||||
|
||||
<!-- Text Appearances -->
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
|
||||
<!-- Material Dialogs -->
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
<item name="md_color_title">?attr/colorOnSurface</item>
|
||||
<item name="md_color_content">?attr/colorOnSurface</item>
|
||||
<item name="md_color_button_text">?attr/colorAccent</item>
|
||||
<item name="md_ripple_color">?attr/rippleColor</item>
|
||||
<item name="md_color_button_text">?attr/colorPrimary</item>
|
||||
<item name="md_button_casing">literal</item>
|
||||
<item name="md_corner_radius">@dimen/dialog_radius</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelection">?attr/colorAccent</item>
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
|
||||
<item name="colorFilterActive">@color/filterColorLight</item>
|
||||
</style>
|
||||
|
||||
@@ -102,11 +79,10 @@
|
||||
<!--==============-->
|
||||
|
||||
<!--== Light base ==-->
|
||||
<style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base">
|
||||
<style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base.Light">
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
<item name="android:statusBarColor">?attr/colorSurface</item>
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
<item name="background">@color/dialogLight</item>
|
||||
</style>
|
||||
|
||||
<!--== Light theme ==-->
|
||||
@@ -115,63 +91,46 @@
|
||||
<!--== Light Blue theme ==-->
|
||||
<style name="Theme.Tachiyomi.Light.Blue">
|
||||
<!-- Theme colors -->
|
||||
<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="colorPrimary">@color/accent_lightblue</item>
|
||||
<item name="colorFilterActive">@color/filterColorDark</item>
|
||||
<item name="colorToolbar">?attr/colorPrimary</item>
|
||||
<item name="colorOnToolbar">?attr/colorOnPrimary</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="background">@color/colorPrimary</item>
|
||||
<item name="background">@color/accent_lightblue</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/md_white_1000_6</item>
|
||||
<item name="rippleToolbarColor">@color/md_white_1000_12</item>
|
||||
<item name="colorControlHighlight">@color/ripple_colored_lightblue</item>
|
||||
<item name="rippleColorToolbar">@color/md_white_1000_12</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.PopupTheme</item>
|
||||
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
|
||||
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
|
||||
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
|
||||
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
|
||||
|
||||
|
||||
<!-- Status/Navigation bar -->
|
||||
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
|
||||
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<!--== Strawberry Daiquiri theme ==-->
|
||||
<style name="Theme.Tachiyomi.Light.StrawberryDaiquiri">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentStrawberry</item>
|
||||
<item name="colorSecondary">@color/colorAccentStrawberry</item>
|
||||
<item name="colorPrimary">@color/accent_strawberry</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorAccent">@color/colorAccentStrawberry</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorStrawberry</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light.StrawberryDaiquiri</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
|
||||
</style>
|
||||
|
||||
<!--== Yotsuba theme ==-->
|
||||
<style name="Theme.Tachiyomi.Light.Yotsuba">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentYotsuba</item>
|
||||
<item name="colorSecondary">@color/colorAccentYotsuba</item>
|
||||
<item name="colorPrimary">@color/accent_yotsuba</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorYotsuba</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light.Yotsuba</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorYotsuba</item>
|
||||
</style>
|
||||
|
||||
<!--=============-->
|
||||
@@ -180,154 +139,121 @@
|
||||
|
||||
<!--== Dark base ==-->
|
||||
<style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<!-- Disallow 'Force dark theme' -->
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
|
||||
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/colorDarkPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentDark</item>
|
||||
<item name="colorPrimaryVariant">@color/colorDarkPrimary</item>
|
||||
<item name="colorSecondary">@color/colorAccentDark</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimary">@color/accent_dark</item>
|
||||
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
|
||||
<item name="colorOnPrimary">@color/md_white_1000</item>
|
||||
<item name="colorSecondary">?attr/colorPrimary</item>
|
||||
<item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
|
||||
<item name="colorOnSecondary">?attr/colorOnPrimary</item>
|
||||
<item name="colorTertiary">@color/green</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@color/dialogDark</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryDark</item>
|
||||
<item name="colorOnBackground">@color/textColorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccentDark</item>
|
||||
<item name="colorToolbar">?attr/colorSurface</item>
|
||||
<item name="colorOnToolbar">?attr/colorOnSurface</item>
|
||||
<item name="colorSurface">@color/surface_dark</item>
|
||||
<item name="android:colorBackground">@color/background_dark</item>
|
||||
<item name="android:divider">@color/divider_dark</item>
|
||||
<item name="android:listDivider">@drawable/line_divider</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="colorControlHighlight">@color/ripple_colored</item>
|
||||
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
|
||||
|
||||
<!-- Handles RTL text -->
|
||||
<item name="android:textAlignment">gravity</item>
|
||||
<item name="android:textDirection">locale</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:colorEdgeEffect">?attr/colorAccent</item>
|
||||
<item name="background">@color/colorDarkPrimaryDark</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>
|
||||
<item name="android:colorControlHighlight">@color/rippleColorDark</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>
|
||||
<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.Dark</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeCustom</item>
|
||||
<item name="dialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
|
||||
<item name="chipStyle">@style/Theme.Widget.Chip</item>
|
||||
<item name="buttonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
|
||||
<item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
<item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
|
||||
<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
|
||||
<item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
|
||||
<item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
|
||||
<item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
|
||||
<item name="android:backgroundDimAmount">0.32</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
|
||||
<item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
|
||||
<item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
|
||||
<item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
|
||||
<item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
|
||||
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
|
||||
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
|
||||
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
|
||||
<item name="elevationOverlayEnabled">false</item>
|
||||
|
||||
<!-- Text Appearances -->
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
|
||||
<!-- Material Dialogs -->
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
<item name="md_color_title">?attr/colorOnSurface</item>
|
||||
<item name="md_color_content">?attr/colorOnSurface</item>
|
||||
<item name="md_color_button_text">?attr/colorAccent</item>
|
||||
<item name="md_ripple_color">?attr/rippleColor</item>
|
||||
<item name="md_color_button_text">?attr/colorPrimary</item>
|
||||
<item name="md_button_casing">literal</item>
|
||||
<item name="md_corner_radius">@dimen/dialog_radius</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelection">?attr/colorAccent</item>
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
|
||||
<item name="colorFilterActive">@color/filterColorDark</item>
|
||||
</style>
|
||||
|
||||
<!--== Dark theme ==-->
|
||||
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
|
||||
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
|
||||
<item name="android:statusBarColor">?attr/colorSurface</item>
|
||||
<item name="android:navigationBarColor">?attr/colorSurface</item>
|
||||
</style>
|
||||
|
||||
<!--== Dark Blue theme ==-->
|
||||
<style name="Theme.Tachiyomi.Dark.Blue">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimaryVariant">@color/colorPrimary</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="background">@color/colorPrimary</item>
|
||||
<item name="colorPrimary">@color/accent_darkblue</item>
|
||||
<item name="colorToolbar">?attr/colorPrimary</item>
|
||||
<item name="colorOnToolbar">?attr/colorOnPrimary</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/md_black_1000_6</item>
|
||||
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
|
||||
<item name="colorControlHighlight">@color/ripple_colored_darkblue</item>
|
||||
<item name="rippleColorToolbar">@color/md_white_1000_12</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
|
||||
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
|
||||
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
|
||||
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
|
||||
|
||||
<!-- Status/Navigation bar -->
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<!--== Green Apple theme ==-->
|
||||
<style name="Theme.Tachiyomi.Dark.GreenApple">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentApple</item>
|
||||
<item name="colorSecondary">@color/colorAccentApple</item>
|
||||
<item name="colorOnSecondary">@color/colorOnSecondaryApple</item>
|
||||
<item name="colorPrimary">@color/accent_greenapple</item>
|
||||
<item name="colorOnPrimary">@color/md_black_1000</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorAccent">@color/colorAccentApple</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorApple</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark.GreenApple</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorApple</item>
|
||||
</style>
|
||||
|
||||
<!--== Midnight Dusk theme ==-->
|
||||
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
|
||||
<style name="Theme.Tachiyomi.Dark.MidnightDusk">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/dialogDusk</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
|
||||
<item name="colorPrimaryVariant">@color/dialogDusk</item>
|
||||
<item name="colorSecondary">@color/colorAccentDusk</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryDusk</item>
|
||||
<item name="colorPrimary">@color/accent_midnightdusk</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@color/dialogDusk</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryDusk</item>
|
||||
<item name="colorOnBackground">@color/textColorPrimaryDusk</item>
|
||||
<item name="colorAccent">@color/colorAccentDusk</item>
|
||||
<item name="colorSurface">@color/surface_midnightdusk</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/backgroundDusk</item>
|
||||
<item name="background">@color/backgroundDusk</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorDusk</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Dark.MidnightDusk</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorDusk</item>
|
||||
<item name="android:colorBackground">@color/background_midnightdusk</item>
|
||||
</style>
|
||||
|
||||
<!--===============-->
|
||||
@@ -336,86 +262,74 @@
|
||||
|
||||
<!--== AMOLED base ==-->
|
||||
<style name="Theme.Base.Amoled" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<!-- Disallow 'Force dark theme' -->
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
|
||||
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/colorAmoledPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryAmoled</item>
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentAmoled</item>
|
||||
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
|
||||
<item name="colorSecondary">@color/colorAccentAmoled</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryAmoled</item>
|
||||
<item name="colorSurface">@color/dialogAmoled</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryAmoled</item>
|
||||
<item name="colorOnBackground">@color/textColorPrimaryAmoled</item>
|
||||
<item name="colorAccent">@color/colorAccentAmoled</item>
|
||||
<item name="colorPrimary">@color/accent_amoled</item>
|
||||
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
|
||||
<item name="colorOnPrimary">@color/md_white_1000</item>
|
||||
<item name="colorSecondary">?attr/colorPrimary</item>
|
||||
<item name="colorSecondaryVariant">?attr/colorPrimaryVariant</item>
|
||||
<item name="colorOnSecondary">?attr/colorOnPrimary</item>
|
||||
<item name="colorTertiary">@color/green</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorToolbar">?attr/colorSurface</item>
|
||||
<item name="colorOnToolbar">?attr/colorOnSurface</item>
|
||||
<item name="colorSurface">@color/surface_amoled</item>
|
||||
<item name="android:colorBackground">@color/background_amoled</item>
|
||||
<item name="android:divider">@color/divider_amoled</item>
|
||||
<item name="android:listDivider">@drawable/line_divider</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="colorControlHighlight">@color/ripple_colored</item>
|
||||
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
|
||||
|
||||
<!-- Handles RTL text -->
|
||||
<item name="android:textAlignment">gravity</item>
|
||||
<item name="android:textDirection">locale</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
|
||||
<item name="android:textColorPrimary">@color/textColorPrimaryAmoled</item>
|
||||
<item name="android:textColorSecondary">@color/textColorSecondaryAmoled</item>
|
||||
<item name="android:textColorHint">@color/textColorHintAmoled</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:colorEdgeEffect">?attr/colorAccent</item>
|
||||
<item name="background">@color/colorAmoledPrimary</item>
|
||||
|
||||
<item name="android:divider">@color/dividerAmoled</item>
|
||||
<item name="android:listDivider">@drawable/line_divider</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleColor">@color/rippleColorAmoled</item>
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorAmoled</item>
|
||||
<item name="rippleToolbarColor">@color/rippleToolbarColorAmoled</item>
|
||||
<item name="android:colorControlHighlight">@color/rippleColorAmoled</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||
<item name="android:statusBarColor">?attr/colorSurface</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>
|
||||
<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.Amoled</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Theme.Toolbar.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeCustom</item>
|
||||
<item name="dialogTheme">@style/Theme.AlertDialog.Amoled</item>
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.BottomSheet</item>
|
||||
<item name="chipStyle">@style/Theme.Widget.Chip</item>
|
||||
<item name="buttonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
|
||||
<item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
|
||||
<item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
<item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
|
||||
<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
|
||||
<item name="swipeRefreshLayoutProgressSpinnerBackgroundColor">?attr/colorAccent</item>
|
||||
<item name="circularProgressIndicatorStyle">@style/Theme.Widget.CircularProgressIndicator</item>
|
||||
<item name="linearProgressIndicatorStyle">@style/Theme.Widget.LinearProgressIndicator</item>
|
||||
<item name="android:backgroundDimAmount">0.32</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
|
||||
<item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
|
||||
<item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
|
||||
<item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
|
||||
<item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
|
||||
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
|
||||
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
|
||||
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
|
||||
<item name="elevationOverlayEnabled">false</item>
|
||||
|
||||
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
|
||||
<item name="android:navigationBarColor">#000001</item>
|
||||
|
||||
<!-- Text Appearances -->
|
||||
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
|
||||
|
||||
<!-- Material Dialogs -->
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
<item name="md_color_title">?attr/colorOnSurface</item>
|
||||
<item name="md_color_content">?attr/colorOnSurface</item>
|
||||
<item name="md_color_button_text">?attr/colorAccent</item>
|
||||
<item name="md_ripple_color">?attr/rippleColor</item>
|
||||
<item name="md_color_button_text">?attr/colorPrimary</item>
|
||||
<item name="md_button_casing">literal</item>
|
||||
<item name="md_corner_radius">@dimen/dialog_radius</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelection">?attr/colorAccent</item>
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorAmoled</item>
|
||||
<item name="colorFilterActive">@color/filterColorAmoled</item>
|
||||
|
||||
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
|
||||
<item name="android:navigationBarColor">#000001</item>
|
||||
</style>
|
||||
|
||||
<!--== AMOLED theme ==-->
|
||||
@@ -424,24 +338,8 @@
|
||||
<!--== Hot Pink theme ==-->
|
||||
<style name="Theme.Tachiyomi.Amoled.HotPink">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryPink</item>
|
||||
<item name="colorAccentOnPrimary">@color/colorAccentPink</item>
|
||||
<item name="colorSecondary">@color/colorAccentPink</item>
|
||||
<item name="colorOnSecondary">@color/textColorPrimaryPink</item>
|
||||
<item name="colorPrimary">@color/accent_hotpink</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||
<item name="colorOnSurface">@color/textColorPrimaryPink</item>
|
||||
<item name="colorOnBackground">@color/textColorPrimaryPink</item>
|
||||
<item name="colorAccent">@color/colorAccentPink</item>
|
||||
|
||||
<!-- Ripples -->
|
||||
<item name="rippleSecondaryColor">@color/rippleSecondaryColorPink</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Amoled.HotPink</item>
|
||||
|
||||
<!-- Custom Attributes-->
|
||||
<item name="colorLibrarySelectionActive">@color/selectorColorPink</item>
|
||||
</style>
|
||||
|
||||
<!--===============-->
|
||||
@@ -449,24 +347,22 @@
|
||||
<!--===============-->
|
||||
|
||||
<!--== Light Reader base ==-->
|
||||
<style name="Theme.Base.Reader.Light" parent="Theme.Base">
|
||||
<style name="Theme.Base.Reader.Light" parent="Theme.Base.Light">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimaryVariant">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorSurface">@color/md_white_1000</item>
|
||||
<item name="colorToolbar">@color/reader_toolbar</item>
|
||||
<item name="colorOnToolbar">@color/md_white_1000</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/md_white_1000</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
|
||||
<item name="android:statusBarColor">?attr/colorToolbar</item>
|
||||
<item name="android:navigationBarColor">?attr/colorToolbar</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<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>
|
||||
<item name="android:alertDialogTheme">@style/Theme.AlertDialog.Light</item>
|
||||
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
|
||||
<item name="switchStyle">@style/Widget.Tachiyomi.BasicSwitch</item>
|
||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
|
||||
</style>
|
||||
|
||||
<!--== Light Reader ==-->
|
||||
@@ -475,22 +371,18 @@
|
||||
<!--== Dark Reader base ==-->
|
||||
<style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||
<item name="colorPrimaryVariant">@color/readerColorDarkPrimary</item>
|
||||
<item name="colorSurface">@color/md_black_1000</item>
|
||||
<item name="colorToolbar">@color/reader_toolbar</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/md_black_1000</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
|
||||
<item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
|
||||
<item name="android:statusBarColor">?attr/colorToolbar</item>
|
||||
<item name="android:navigationBarColor">?attr/colorToolbar</item>
|
||||
|
||||
<!-- Themes -->
|
||||
<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>
|
||||
<item name="android:alertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
|
||||
<item name="switchStyle">@style/Widget.Tachiyomi.BasicSwitch</item>
|
||||
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
|
||||
</style>
|
||||
|
||||
<!--== Dark Reader ==-->
|
||||
@@ -499,14 +391,13 @@
|
||||
<!--== Dark Grey Reader ==-->
|
||||
<style name="Theme.Reader.Dark.Grey" parent="Theme.Base.Reader.Dark">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorSurface">@color/backgroundDark</item>
|
||||
<item name="colorSurface">@color/background_dark</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:colorBackground">@color/backgroundDark</item>
|
||||
<item name="android:colorBackground">@color/background_dark</item>
|
||||
|
||||
<!-- Alert Dialog -->
|
||||
<item name="android:alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
|
||||
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.Tachiyomi.MaterialAlertDialog</item>
|
||||
</style>
|
||||
|
||||
<!--===============-->
|
||||
@@ -515,13 +406,9 @@
|
||||
|
||||
<!--== Splash theme ==-->
|
||||
<style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorBackgroundSplash">@color/colorPrimary</item>
|
||||
|
||||
<!-- Base background/text colors -->
|
||||
<item name="android:windowBackground">@drawable/splash_background</item>
|
||||
<item name="android:statusBarColor">?attr/colorBackgroundSplash</item>
|
||||
<item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user