diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 28e48707f..875bf1dde 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -23,6 +23,7 @@ object PreferenceValues { default, blue, amoled, + gray, red, } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt index 7774e3ce8..332f85a09 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt @@ -59,6 +59,7 @@ abstract class BaseActivity : 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 } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 577320fb0..cbbcb31c5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -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 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f91583950..6fcc99eaa 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -36,6 +36,20 @@ #FF0000 #880000 + + #3399FF + @color/md_white_1000 + @color/md_white_1000_70 + @color/md_white_1000_50 + @android:color/transparent + @color/md_white_1000_20 + #202125 + #242529 + @color/md_blue_A200_50 + + #202125 + #242529 + @color/colorDarkPrimary @color/md_grey_50_75 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3db0c425..4ebae8610 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,6 +151,7 @@ Default Dark blue AMOLED black + Cool gray Black-Red Start screen Language diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f5429be89..d7e3e5bfd 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,10 @@ + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 4c90132a4..dcbb64be5 100755 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -181,6 +181,28 @@ + +