Cool gray theme (#169)

* Added "Cool gray" (Google gray)

* Added "Cool gray" (Google gray) theme
This commit is contained in:
CrepeTF 2020-11-27 18:14:31 +00:00 committed by GitHub
parent 9f542aaed4
commit ac31f12138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 0 deletions

View File

@ -23,6 +23,7 @@ object PreferenceValues {
default,
blue,
amoled,
gray,
red,
}

View File

@ -59,6 +59,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
when (preferences.themeDark().get()) {
Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue
Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
Values.DarkThemeVariant.gray -> R.style.Theme_Tachiyomi_Gray
Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red
else -> R.style.Theme_Tachiyomi_Dark
}

View File

@ -133,12 +133,14 @@ class SettingsGeneralController : SettingsController() {
R.string.theme_dark_default,
R.string.theme_dark_blue,
R.string.theme_dark_amoled,
R.string.theme_dark_gray,
R.string.theme_dark_red
)
entryValues = arrayOf(
Values.DarkThemeVariant.default.name,
Values.DarkThemeVariant.blue.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.gray.name,
Values.DarkThemeVariant.red.name
)
defaultValue = Values.DarkThemeVariant.default.name

View File

@ -36,6 +36,20 @@
<color name="red">#FF0000</color>
<color name="dark_red">#880000</color>
<!-- Gray Theme -->
<color name="colorAccentGray">#3399FF</color>
<color name="textColorPrimaryGray">@color/md_white_1000</color>
<color name="textColorSecondaryGray">@color/md_white_1000_70</color>
<color name="textColorHintGray">@color/md_white_1000_50</color>
<color name="dividerGray">@android:color/transparent</color>
<color name="rippleColorGray">@color/md_white_1000_20</color>
<color name="backgroundGray">#202125</color>
<color name="dialogGray">#242529</color>
<color name="selectorColorGray">@color/md_blue_A200_50</color>
<color name="gray">#202125</color>
<color name="light_gray">#242529</color>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>

View File

@ -151,6 +151,7 @@
<string name="theme_dark_default">Default</string>
<string name="theme_dark_blue">Dark blue</string>
<string name="theme_dark_amoled">AMOLED black</string>
<string name="theme_dark_gray">Cool gray</string>
<string name="theme_dark_red">Black-Red</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>

View File

@ -6,6 +6,10 @@
<!--========-->
<style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
<style name="Theme.Toolbar.Gray" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:textColorPrimary">@color/md_white_1000</item>
</style>
<style name="Theme.Toolbar.Red" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:textColorPrimary">@color/red</item>
</style>

View File

@ -181,6 +181,28 @@
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
</style>
<style name="Theme.Tachiyomi.Gray" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/light_gray</item>
<item name="colorOnPrimary">@color/textColorPrimaryGray</item>
<item name="colorAccentOnPrimary">@color/colorAccentGray</item>
<item name="colorPrimaryVariant">@color/light_gray</item>
<item name="colorSecondary">@color/colorAccentGray</item>
<item name="colorOnSecondary">@color/textColorPrimaryGray</item>
<item name="colorSurface">@color/light_gray</item>
<item name="colorOnSurface">@color/textColorPrimaryGray</item>
<item name="colorOnBackground">@color/textColorPrimaryGray</item>
<item name="colorAccent">@color/colorAccentGray</item>
<item name="android:colorBackground">@color/backgroundGray</item>
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
<item name="android:navigationBarColor">@android:color/transparent</item>
<!-- Custom Attributes -->
<item name="colorLibrarySelection">@color/selectorColorDark</item>
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>