Restore dark blue theme. Closes #1302

This commit is contained in:
inorichi 2018-10-27 19:10:11 +02:00
parent ae6d052978
commit 2c4fd340c8
5 changed files with 23 additions and 5 deletions

View file

@ -50,6 +50,7 @@ class MainActivity : BaseActivity() {
setTheme(when (preferences.theme()) {
2 -> R.style.Theme_Tachiyomi_Dark
3 -> R.style.Theme_Tachiyomi_Amoled
4 -> R.style.Theme_Tachiyomi_DarkBlue
else -> R.style.Theme_Tachiyomi
})
super.onCreate(savedInstanceState)

View file

@ -52,8 +52,9 @@ class SettingsGeneralController : SettingsController() {
intListPreference {
key = Keys.theme
titleRes = R.string.pref_theme
entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, R.string.amoled_theme)
entryValues = arrayOf("1", "2", "3")
entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme,
R.string.amoled_theme, R.string.darkblue_theme)
entryValues = arrayOf("1", "2", "3", "4")
defaultValue = "1"
summary = "%s"

View file

@ -10,9 +10,9 @@
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
</style>
<!--============-->
<!-- Dark Theme -->
<!--============-->
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
<!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
@ -20,6 +20,16 @@
<item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
</style>
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
</style>
<!--==============-->
<!-- Amoled Theme -->
<!--==============-->

View file

@ -139,6 +139,7 @@
<string name="light_theme">Main theme</string>
<string name="dark_theme">Dark theme</string>
<string name="amoled_theme">AMOLED theme</string>
<string name="darkblue_theme">Dark blue</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<string name="system_default">System default</string>

View file

@ -83,6 +83,11 @@
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style>
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
</style>
<!--==============-->
<!-- Amoled Theme -->
<!--==============-->