Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "Midnight Dusk" and "Hot Pink" themes (#5161)

Browse Source 
* Organize and clarify themes file

Increases clarification with better commenting, should make it easier to add or modify current themes.

* Make AMOLED its own theme category

* Tweak ripples for AMOLED

* Add "Midnight Dusk" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Add "Hot Pink" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>

* Make AMOLED a base theme

* Final tweaks

Rename "Toolbar.Light" to "Custom.PopupTheme"
Changes placing of backgroundDusk

Removes HotPink and MidnightDusk custom Toolbars, I believe they are unnecessary.

* Rename a Midnight Dusk color

* Make AMOLED independent from Dark as a theme

Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
Co-authored-by: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>
(cherry picked from commit 176e984b56d66d1e47bd367d7dde03e4a024152c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/themes.xml
This commit is contained in:
Soitora 2021-05-24 17:16:32 +02:00 committed by Jobobby04
parent 97eda86ac4
commit 606101dc8b
11 changed files with 269 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
View File

@ -24,11 +24,11 @@ object PreferenceValues {
enum class DarkThemeVariant {
default,
blue,
amoledblue,
amoled,
red,
midnightdusk,
amoled,
hotpink,
amoledblue,
red,
}
/* ktlint-enable experimental:enum-entry-name-case */

8
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
View File

@ -25,11 +25,11 @@ abstract class BaseThemedActivity : AppCompatActivity() {
when (preferences.themeDark().get()) {
DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Dark_AmoledBlue
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Dark_Amoled
DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Dark_Red
DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Dark_HotPink
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Amoled_Blue
DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Dark_Red
}
} else {
when (preferences.themeLight().get()) {

14
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -156,20 +156,20 @@ class SettingsGeneralController : SettingsController() {
entriesRes = arrayOf(
R.string.theme_dark_default,
R.string.theme_dark_blue,
R.string.theme_dark_amoledblue,
R.string.theme_dark_amoled,
R.string.theme_dark_red,
R.string.theme_dark_midnightdusk,
R.string.theme_dark_hotpink,
R.string.theme_dark_amoled,
R.string.theme_dark_amoled_hotpink,
R.string.theme_dark_amoledblue,
R.string.theme_dark_red
)
entryValues = arrayOf(
Values.DarkThemeVariant.default.name,
Values.DarkThemeVariant.blue.name,
Values.DarkThemeVariant.amoledblue.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.red.name,
Values.DarkThemeVariant.midnightdusk.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.hotpink.name,
Values.DarkThemeVariant.amoledblue.name,
Values.DarkThemeVariant.red.name
)
defaultValue = Values.DarkThemeVariant.default.name
summary = "%s"

2
app/src/main/res/values-ru/strings_sy.xml
View File

@ -699,6 +699,4 @@
<!-- Themes -->
<string name="theme_dark_amoledblue">AMOLED синяя</string>
<string name="theme_dark_red">Чёрное и Красное</string>
<string name="theme_dark_midnightdusk">Полуночные Сумерки</string>
<string name="theme_dark_hotpink">Горячий Розовый</string>
</resources>

24
app/src/main/res/values/colors.xml
View File

@ -8,8 +8,11 @@
<!-- 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>
<!-- Light Theme -->
@ -48,19 +51,30 @@
<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="rippleColorDusk">#0FF02475</color>
<color name="rippleSecondaryColorDusk">#0FF02475</color>
<color name="backgroundDusk">#16151D</color>
<color name="dialogDusk">#201F27</color>
<color name="selectorColorDusk">#80F02475</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_50</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="rippleColorPink">#0FFF3399</color>
<color name="backgroundPink">@color/md_black_1000</color>
<color name="dialogPink">@color/md_black_1000</color>
<color name="rippleSecondaryColorPink">#0AFF3399</color>
<color name="selectorColorPink">#80FF69B4</color>
<!-- Reader Theme -->
@ -70,12 +84,14 @@
<color name="filterColorLight">#FFC107</color>
<color name="filterColorDark">#FFEB3B</color>
<color name="filterColorAmoled">#FFEB3B</color>
<!-- Text Colors -->
<color name="md_black_1000_87">#DE000000</color>
<color name="md_black_1000_54">#8A000000</color>
<color name="md_black_1000_38">#61000000</color>
<color name="md_black_1000_12">#1F000000</color>
<color name="md_black_1000_8">#14000000</color>
<color name="md_black_1000_6">#0F000000</color>
<color name="md_white_1000">#FFFFFFFF</color>

2
app/src/main/res/values/strings.xml
View File

@ -159,7 +159,9 @@
<string name="pref_theme_dark">Dark theme</string>
<string name="theme_dark_default">Default</string>
<string name="theme_dark_blue">Dark blue</string>
<string name="theme_dark_midnightdusk">Midnight dusk</string>
<string name="theme_dark_amoled">AMOLED black</string>
<string name="theme_dark_amoled_hotpink">Hot pink</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<string name="system_default">Default</string>

2
app/src/main/res/values/strings_sy.xml
View File

@ -172,8 +172,6 @@
<!-- General Settings -->
<string name="theme_dark_amoledblue">AMOLED blue</string>
<string name="theme_dark_red">Black-Red</string>
<string name="theme_dark_midnightdusk">Midnight Dusk</string>
<string name="theme_dark_hotpink">Hot Pink</string>
<string name="toggle_expand_search_filters">Expand all search filters by default</string>
<string name="auto_solve_captchas">Automatically solve captcha</string>
<string name="auto_solve_captchas_summary">Use HIGHLY EXPERIMENTAL automatic ReCAPTCHA solver. Will be grayed out if unsupported by your device.</string>

44
app/src/main/res/values/styles.xml
View File

@ -6,23 +6,7 @@
<!--========-->
<style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
<style name="Theme.Toolbar.Red" parent="Theme.Toolbar.Custom">
<item name="android:textColorPrimary">@color/red</item>
</style>
<style name="Theme.Toolbar.MidnightDusk" parent="Theme.Toolbar.Custom">
<item name="android:textColorPrimary">@color/md_white_1000</item>
</style>
<style name="Theme.Toolbar.HotPink" parent="Theme.Toolbar.Custom">
<item name="android:textColorPrimary">@color/md_white_1000</item>
</style>
<style name="Theme.Toolbar.Light" parent="Theme.Toolbar.Custom.Dark">
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
</style>
<style name="Theme.Toolbar.Custom" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
<style name="Theme.Toolbar.Custom.Light" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
</style>
@ -30,6 +14,14 @@
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
</style>
<style name="Theme.Toolbar.Custom.Amoled" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:colorControlHighlight">?attr/rippleToolbarColor</item>
</style>
<style name="Theme.Toolbar.Custom.PopupTheme" parent="Theme.Toolbar.Custom.Dark">
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
</style>
<style name="Theme.Toolbar.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?attr/colorOnPrimary</item>
</style>
@ -80,6 +72,10 @@
<item name="colorAccent">@color/colorAccentDark</item>
</style>
<style name="Theme.AlertDialog.Amoled" parent="Theme.AlertDialog">
<item name="colorAccent">@color/colorAccentAmoled</item>
</style>
<!--===========-->
<!--BottomSheet-->
@ -393,18 +389,4 @@
</style>
<!--==-->
<!--SY-->
<!--==-->
<style name="SheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<!--<item name="android:windowCloseOnTouchOutside">false</item>-->
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:colorBackground"> @android:color/transparent</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
</style>
</resources>

25
app/src/main/res/values/styles_sy.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--========-->
<!--Toolbars-->
<!--========-->
<style name="Theme.Toolbar.Custom.Amoled.Red" parent="Theme.Toolbar.Custom.Amoled">
<item name="android:textColorPrimary">@color/red</item>
</style>
<!--=====-->
<!--Sheet-->
<!--=====-->
<style name="SheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<!--<item name="android:windowCloseOnTouchOutside">false</item>-->
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:colorBackground"> @android:color/transparent</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
</style>
</resources>

232
app/src/main/res/values/themes.xml
View File

@ -4,16 +4,16 @@
<!--============-->
<!-- Base Theme -->
<!--============-->
<style name="Theme"/>
<!--==============-->
<!-- Light Themes -->
<!--=======-======-->
<!--== 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>
<!-- Disallow 'Force dark theme' -->
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
<!-- Theme colors -->
@ -60,7 +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="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>
@ -93,24 +93,41 @@
<item name="colorFilterActive">@color/filterColorLight</item>
</style>
<!--===========-->
<!-- Main Theme-->
<!--===========-->
<!--==============-->
<!-- Light Themes -->
<!--==============-->
<!--== Light base ==-->
<style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base">
<!-- Base background/text colors -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:windowLightStatusBar">true</item>
<item name="background">@color/dialogLight</item>
</style>
<!--== Light theme ==-->
<style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
<!--== 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="colorFilterActive">@color/filterColorDark</item>
<!-- Base background/text colors -->
<item name="background">@color/colorPrimary</item>
<!-- Ripples -->
<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>
<!-- Themes -->
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.PopupTheme</item>
<!-- Status/Navigation bar -->
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
</style>
@ -118,6 +135,8 @@
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<!--== Dark base ==-->
<style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
<!-- Theme colors -->
<item name="colorPrimary">@color/colorDarkPrimary</item>
@ -130,7 +149,6 @@
<item name="colorOnSurface">@color/textColorPrimaryDark</item>
<item name="colorOnBackground">@color/textColorPrimaryDark</item>
<item name="colorAccent">@color/colorAccentDark</item>
<item name="background">@color/colorDarkPrimaryDark</item>
<!-- Handles RTL text -->
<item name="android:textAlignment">gravity</item>
@ -145,6 +163,7 @@
<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>
@ -197,86 +216,219 @@
<item name="colorFilterActive">@color/filterColorDark</item>
</style>
<!--== Dark theme ==-->
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
<!--== 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>
<!-- Ripples -->
<item name="rippleSecondaryColor">@color/md_black_1000_6</item>
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
<item name="background">@color/colorPrimary</item>
</style>
<style name="Theme.Tachiyomi.Dark.Amoled">
<item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
<item name="colorSurface">@color/colorAmoledPrimary</item>
<item name="rippleColor">@color/md_white_1000_8</item>
<item name="rippleToolbarColor">@color/md_white_1000_8</item>
<item name="background">@color/colorAmoledPrimary</item>
<!--== Midnight Dusk theme ==-->
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
<!-- 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="colorSurface">@color/dialogDusk</item>
<item name="colorOnSurface">@color/textColorPrimaryDusk</item>
<item name="colorOnBackground">@color/textColorPrimaryDusk</item>
<item name="colorAccent">@color/colorAccentDusk</item>
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
<!-- Base background/text colors -->
<item name="android:colorBackground">@color/backgroundDusk</item>
<item name="background">@color/backgroundDusk</item>
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
<item name="android:navigationBarColor">#000001</item>
<!-- Ripples -->
<item name="rippleSecondaryColor">@color/rippleSecondaryColorDusk</item>
<!-- Custom Attributes-->
<!-- Custom Attributes -->
<item name="colorLibrarySelection">@color/selectorColorDark</item>
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<!--==============-->
<!-- Reader Theme -->
<!--==============-->
<style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
<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>
<!--===============-->
<!-- AMOLED Themes -->
<!--===============-->
<item name="android:colorBackground">@color/md_black_1000</item>
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="android:navigationBarColor">?attr/colorPrimaryVariant</item>
<!--== AMOLED base ==-->
<style name="Theme.Base.Amoled" parent="Theme.MaterialComponents.NoActionBar">
<!-- 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="actionBarTheme">@style/Theme.Toolbar.Custom.Dark</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>
<!-- Themes -->
<item name="android:statusBarColor">?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>
<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="switchStyle">@style/Theme.Widget.BasicSwitch</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>
<!-- 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_button_casing">literal</item>
<item name="md_corner_radius">@dimen/dialog_radius</item>
<!-- Custom Attributes-->
<item name="colorLibrarySelection">@color/selectorColorAmoled</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 ==-->
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled" />
<!--== 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="colorOnSurface">@color/textColorPrimaryPink</item>
<item name="colorOnBackground">@color/textColorPrimaryPink</item>
<item name="colorAccent">@color/colorAccentPink</item>
<!-- Ripples -->
<item name="rippleSecondaryColor">@color/rippleSecondaryColorPink</item>
</style>
<!--===============-->
<!-- Reader Themes -->
<!--===============-->
<!--== Light Reader base ==-->
<style name="Theme.Base.Reader.Light" parent="Theme.Base">
<!-- 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>
<!-- 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>
<!-- 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>
</style>
<!--== Light Reader ==-->
<style name="Theme.Reader.Light" parent="Theme.Base.Reader.Light" />
<!--== 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>
<!-- 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>
<!-- 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>
</style>
<!--== Dark Reader ==-->
<style name="Theme.Reader.Dark" parent="Theme.Base.Reader.Dark" />
<!--== Dark Grey Reader ==-->
<style name="Theme.Reader.Dark.Grey" parent="Theme.Base.Reader.Dark">
<item name="android:colorBackground">@color/backgroundDark</item>
</style>
<style name="Theme.Reader.Light" parent="Theme.Base.Reader.Light" />
<!--===============-->
<!-- Launch Screen -->
<!--===============-->
<!--== 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>

49
app/src/main/res/values/themes_sy.xml
View File

@ -4,7 +4,7 @@
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Tachiyomi.Dark.AmoledBlue" parent="Theme.Tachiyomi.Dark.Amoled">
<style name="Theme.Tachiyomi.Amoled.Blue" parent="Theme.Tachiyomi.Amoled">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimary</item>
@ -14,8 +14,8 @@
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
</style>
<style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Custom.Amoled.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
@ -30,47 +30,4 @@
<item name="md_color_title">@color/red</item>
</style>
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
<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="colorSurface">@color/dialogDusk</item>
<item name="colorOnSurface">@color/textColorPrimaryDusk</item>
<item name="colorOnBackground">@color/textColorPrimaryDusk</item>
<item name="colorAccent">@color/colorAccentDusk</item>
<item name="rippleSecondaryColor">@color/rippleColorDusk</item>
<item name="background">@color/backgroundDusk</item>
<item name="android:colorBackground">@color/backgroundDusk</item>
<!-- Custom Attributes -->
<item name="colorLibrarySelection">@color/selectorColorDark</item>
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<style name="Theme.Tachiyomi.Dark.HotPink" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogPink</item>
<item name="colorPrimaryDark">@color/dialogPink</item>
<item name="colorOnPrimary">@color/textColorPrimaryPink</item>
<item name="colorAccentOnPrimary">@color/colorAccentPink</item>
<item name="colorPrimaryVariant">@color/dialogPink</item>
<item name="colorSecondary">@color/colorAccentPink</item>
<item name="colorOnSecondary">@color/textColorPrimaryPink</item>
<item name="colorSurface">@color/dialogPink</item>
<item name="colorOnSurface">@color/textColorPrimaryPink</item>
<item name="colorOnBackground">@color/textColorPrimaryPink</item>
<item name="colorAccent">@color/colorAccentPink</item>
<item name="rippleColor">@color/md_white_1000_8</item>
<item name="rippleSecondaryColor">@color/rippleColorPink</item>
<item name="rippleToolbarColor">@color/md_white_1000_8</item>
<item name="background">@color/backgroundPink</item>
<item name="android:colorBackground">@color/backgroundPink</item>
<item name="android:windowBackground">@color/backgroundPink</item>
<item name="android:statusBarColor">@color/dialogPink</item>
</style>
</resources>