From 908baebb626f74b1ccc47ba1cea9092ec4352a52 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 9 Nov 2020 19:43:01 +0200
Subject: [PATCH] Dark amoled theme

---
 .idea/dictionaries/admin.xml                           |  1 +
 .../org/koitharu/kotatsu/core/prefs/AppSettings.kt     |  3 +++
 .../java/org/koitharu/kotatsu/ui/base/BaseActivity.kt  | 10 ++++++++++
 .../kotatsu/ui/settings/MainSettingsFragment.kt        |  4 +++-
 .../kotatsu/ui/settings/ReaderSettingsFragment.kt      |  1 -
 app/src/main/res/values-night/colors.xml               |  1 +
 app/src/main/res/values-night/themes.xml               |  8 ++++++++
 app/src/main/res/values-ru/strings.xml                 |  3 +++
 app/src/main/res/values/colors.xml                     |  1 +
 app/src/main/res/values/strings.xml                    |  3 +++
 app/src/main/res/values/themes.xml                     |  3 +++
 app/src/main/res/xml/pref_main.xml                     |  8 ++++++++
 app/src/main/res/xml/pref_reader.xml                   |  3 ++-
 13 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/.idea/dictionaries/admin.xml b/.idea/dictionaries/admin.xml
index 143df12e7..dce652d7a 100644
--- a/.idea/dictionaries/admin.xml
+++ b/.idea/dictionaries/admin.xml
@@ -1,6 +1,7 @@
 <component name="ProjectDictionaryState">
   <dictionary name="admin">
     <words>
+      <w>amoled</w>
       <w>chucker</w>
       <w>desu</w>
       <w>failsafe</w>
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index ea8ef8652..e45cbd7ff 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -36,6 +36,8 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 	)
 
+	val isAmoledTheme by BoolPreferenceDelegate(KEY_THEME_AMOLED, defaultValue = false)
+
 	val gridSize by IntPreferenceDelegate(KEY_GRID_SIZE, defaultValue = 100)
 
 	val readerPageSwitch by StringSetPreferenceDelegate(
@@ -126,6 +128,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_LIST_MODE = "list_mode"
 		const val KEY_APP_SECTION = "app_section"
 		const val KEY_THEME = "theme"
+		const val KEY_THEME_AMOLED = "amoled_theme"
 		const val KEY_SOURCES_ORDER = "sources_order"
 		const val KEY_SOURCES_HIDDEN = "sources_hidden"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/base/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/base/BaseActivity.kt
index eb4f3565e..eb04d30c8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/base/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/base/BaseActivity.kt
@@ -1,13 +1,23 @@
 package org.koitharu.kotatsu.ui.base
 
+import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import moxy.MvpAppCompatActivity
+import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
 
 abstract class BaseActivity : MvpAppCompatActivity() {
 
+	override fun onCreate(savedInstanceState: Bundle?) {
+		if (get<AppSettings>().isAmoledTheme) {
+			setTheme(R.style.AppTheme_Amoled)
+		}
+		super.onCreate(savedInstanceState)
+	}
+
 	override fun setContentView(layoutResID: Int) {
 		super.setContentView(layoutResID)
 		setupToolbar()
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
index d759b2599..1a298b532 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
@@ -65,7 +65,6 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 		findPreference<ListPreference>(AppSettings.KEY_ZOOM_MODE)?.let {
 			it.entryValues = ZoomMode.values().names()
 			it.setDefaultValue(ZoomMode.FIT_CENTER.name)
-			it.summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
 		}
 		findPreference<SwitchPreference>(AppSettings.KEY_PROTECT_APP)?.isChecked =
 			!settings.appPassword.isNullOrEmpty()
@@ -88,6 +87,9 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 			AppSettings.KEY_THEME -> {
 				AppCompatDelegate.setDefaultNightMode(settings.theme)
 			}
+			AppSettings.KEY_THEME_AMOLED -> {
+				findPreference<Preference>(key)?.setSummary(R.string.restart_required)
+			}
 			AppSettings.KEY_LOCAL_STORAGE -> {
 				findPreference<Preference>(key)?.run {
 					summary = settings.getStorageDir(context)?.getStorageName(context)
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/ReaderSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/ReaderSettingsFragment.kt
index ba37ccd50..98d0e29ce 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/ReaderSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/ReaderSettingsFragment.kt
@@ -25,7 +25,6 @@ class ReaderSettingsFragment : BasePreferenceFragment(R.string.reader_settings)
 		findPreference<ListPreference>(AppSettings.KEY_ZOOM_MODE)?.let {
 			it.entryValues = ZoomMode.values().names()
 			it.setDefaultValue(ZoomMode.FIT_CENTER.name)
-			it.summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 90847003f..7c668f4b4 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,6 +2,7 @@
 <resources>
 	<color name="blue_primary">#1565C0</color>
 	<color name="blue_primary_dark">#283593</color>
+	<color name="blue_primary_darker">#1A237E</color>
 	<color name="red_accent">#FF8A65</color>
 	<color name="dim">#99000000</color>
 	<color name="error">#E57373</color>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..56a92601d
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="AppTheme.Amoled">
+		<item name="colorPrimary">@color/blue_primary_dark</item>
+		<item name="colorPrimaryDark">@color/blue_primary_darker</item>
+		<item name="android:windowBackground">@android:color/black</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c89b6adc3..59e2471ed 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -168,4 +168,7 @@
 	<string name="zoom_mode_fit_height">Подогнать по высоте</string>
 	<string name="zoom_mode_fit_width">Подогнать по ширине</string>
 	<string name="zoom_mode_keep_start">Исходный размер</string>
+	<string name="black_dark_theme">Чёрная тёмная тема</string>
+	<string name="black_dark_theme_summary">Полезно для AMOLED экранов</string>
+	<string name="restart_required">Требуется перезапуск</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1884bedf1..c8b08fa48 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
 	<color name="blue_primary">#1976D2</color>
 	<color name="blue_primary_dark">#1565C0</color>
+	<color name="blue_primary_darker">#283593</color>
 	<color name="red_accent">#EF5350</color>
 	<color name="grey">#424242</color>
 	<color name="grey_dark">#212121</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e7d47704..ba7b9331d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,4 +170,7 @@
 	<string name="zoom_mode_fit_height">Fit to height</string>
 	<string name="zoom_mode_fit_width">Fit to width</string>
 	<string name="zoom_mode_keep_start">Keep at start</string>
+	<string name="black_dark_theme">Black dark theme</string>
+	<string name="black_dark_theme_summary">Useful for AMOLED screens</string>
+	<string name="restart_required">Restart required</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 721375513..cd631e285 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,9 +6,12 @@
 		<item name="actionModeStyle">@style/AppActionMode</item>
 		<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 	</style>
+
 	<style name="AppTheme" parent="BaseAppTheme">
 		<item name="colorPrimary">@color/blue_primary</item>
 		<item name="colorPrimaryDark">@color/blue_primary_dark</item>
 		<item name="colorAccent">@color/red_accent</item>
 	</style>
+
+	<style name="AppTheme.Amoled" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 25f665614..f0149d422 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -13,6 +13,13 @@
 		app:iconSpaceReserved="false"
 		app:useSimpleSummaryProvider="true" />
 
+	<SwitchPreference
+		android:defaultValue="false"
+		android:key="amoled_theme"
+		app:iconSpaceReserved="false"
+		android:title="@string/black_dark_theme"
+		android:summary="@string/black_dark_theme_summary" />
+
 	<Preference
 		android:key="list_mode"
 		android:persistent="false"
@@ -74,6 +81,7 @@
 		android:entries="@array/zoom_modes"
 		android:key="zoom_mode"
 		android:title="@string/scale_mode"
+		app:useSimpleSummaryProvider="true"
 		app:iconSpaceReserved="false" />
 
 	<SwitchPreference
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index 9e6f4325d..22e04c405 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -21,7 +21,8 @@
 		android:entries="@array/zoom_modes"
 		android:key="zoom_mode"
 		android:title="@string/scale_mode"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:useSimpleSummaryProvider="true" />
 
 	<SwitchPreference
 		android:defaultValue="false"