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 0956d75bf..f94711391 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 @@ -24,6 +24,7 @@ object PreferenceValues { blue, amoled, red, + midnightdusk, } enum class DisplayMode { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt index febbd59e9..9b064a4c0 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt @@ -49,6 +49,7 @@ abstract class BaseThemedActivity : AppCompatActivity() { Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red + Values.DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_MidnightDusk 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 df5cafa17..7a11799df 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,13 +133,15 @@ class SettingsGeneralController : SettingsController() { R.string.theme_dark_default, R.string.theme_dark_blue, R.string.theme_dark_amoled, - R.string.theme_dark_red + R.string.theme_dark_red, + R.string.theme_dark_midnightdusk, ) entryValues = arrayOf( Values.DarkThemeVariant.default.name, Values.DarkThemeVariant.blue.name, Values.DarkThemeVariant.amoled.name, - Values.DarkThemeVariant.red.name + Values.DarkThemeVariant.red.name, + Values.DarkThemeVariant.midnightdusk.name, ) defaultValue = Values.DarkThemeVariant.default.name summary = "%s" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1c3fb948b..ad20129e2 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -36,6 +36,17 @@ #FF0000 #880000 + + #E21063 + @color/md_white_1000 + @color/md_white_1000_70 + @color/md_white_1000_50 + #12ffffff + @color/md_white_1000_20 + #16151D + #201F27 + #80FEF936 + @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 5523c54fe..1076f33e6 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,6 +152,7 @@ Dark blue AMOLED black Black-Red + Midnight Dusk Start screen Language Default diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index dee6e193d..bd1b724ca 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,6 +10,10 @@ @color/red + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0bca7c174..d073e2b26 100755 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -90,6 +90,7 @@ @@ -99,6 +100,7 @@ @color/textColorPrimaryDark @color/textColorPrimaryDark @color/colorPrimaryDark + @color/colorPrimary @style/Theme.Toolbar.Light @@ -122,6 +124,7 @@ @color/textColorPrimaryDark @color/textColorPrimaryDark @color/colorAccentDark + @color/colorDarkPrimaryDark gravity @@ -189,12 +192,14 @@ @color/colorPrimary @color/textColorPrimaryDark @color/colorPrimary + @color/colorPrimary + + \ No newline at end of file