From 2049a857a3131895ea372b01c63432483f4cfbf6 Mon Sep 17 00:00:00 2001
From: Xavier Xiong <zx900930@gmail.com>
Date: Sat, 11 Feb 2023 15:03:48 +0100
Subject: [PATCH] feat: AMOLED dark theme (#282)

* Add AMOLED dark theme

* Minor Fix

* Add compatibility with dynamic colors

* remove onused switch logic

Co-authored-by: Yash Garg <ben10.yashgarg@gmail.com>

* Remove unnecessary statements

* refactor: rename unused variable to `_`

---------

Co-authored-by: Yash Garg <ben10.yashgarg@gmail.com>
Co-authored-by: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
---
 app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt | 4 ++++
 .../jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt | 6 ++++++
 core/src/main/res/values-night/themes.xml                   | 6 ++++++
 core/src/main/res/values/strings.xml                        | 2 ++
 core/src/main/res/xml/fragment_settings_appearance.xml      | 5 +++++
 .../src/main/java/dev/jdtech/jellyfin/AppPreferences.kt     | 1 +
 preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt  | 1 +
 7 files changed, 25 insertions(+)

diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
index f1b1ea9d..a28f4ceb 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
@@ -38,6 +38,10 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        if (appPreferences.amoledTheme) {
+            setTheme(R.style.Theme_FindroidAMOLED)
+        }
+
         binding = ActivityMainBinding.inflate(layoutInflater)
 
         setContentView(binding.root)
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt
index fecec562..277e779f 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import dev.jdtech.jellyfin.R
 
 @Suppress("unused")
@@ -19,5 +20,10 @@ class SettingsAppearanceFragment : PreferenceFragmentCompat() {
             }
             true
         }
+
+        findPreference<SwitchPreferenceCompat>("pref_amoled_theme")?.setOnPreferenceChangeListener { _, _ ->
+            requireActivity().recreate()
+            true
+        }
     }
 }
diff --git a/core/src/main/res/values-night/themes.xml b/core/src/main/res/values-night/themes.xml
index a27db654..aa22a750 100644
--- a/core/src/main/res/values-night/themes.xml
+++ b/core/src/main/res/values-night/themes.xml
@@ -19,4 +19,10 @@
         <!-- Extra -->
         <item name="dolbyColor">#FFF</item>
     </style>
+
+    <style name="Theme.FindroidAMOLED" parent="Theme.Findroid">
+        <!-- Surface -->
+        <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorSurface">@android:color/black</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index cc58b58b..eb5dd54a 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -130,6 +130,8 @@
     <string name="seek_forward_increment">Seek forward increment (ms)</string>
     <string name="dynamic_colors">Dynamic colors</string>
     <string name="dynamic_colors_summary">Use Material You Dynamic colors (only available on Android 12+)</string>
+    <string name="amoled_theme">AMOLED dark theme</string>
+    <string name="amoled_theme_summary">Use AMOLED theme with a pure black background</string>
     <string name="subtitles">Subtitles</string>
     <string name="subtitles_summary">Customize subtitles appearance</string>
     <string name="theme_system">Follow system</string>
diff --git a/core/src/main/res/xml/fragment_settings_appearance.xml b/core/src/main/res/xml/fragment_settings_appearance.xml
index ac1a9202..fc66496d 100644
--- a/core/src/main/res/xml/fragment_settings_appearance.xml
+++ b/core/src/main/res/xml/fragment_settings_appearance.xml
@@ -12,6 +12,11 @@
         app:key="dynamic_colors"
         app:summary="@string/dynamic_colors_summary"
         app:title="@string/dynamic_colors" />
+    <SwitchPreferenceCompat
+        app:defaultValue="false"
+        app:key="pref_amoled_theme"
+        app:summary="@string/amoled_theme_summary"
+        app:title="@string/amoled_theme" />
     <SwitchPreferenceCompat
         app:defaultValue="false"
         app:key="pref_display_extra_info"
diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
index 2bad305b..fd5ed10b 100644
--- a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
+++ b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt
@@ -24,6 +24,7 @@ constructor(
     // Appearance
     val theme get() = sharedPreferences.getString(Constants.PREF_THEME, null)
     val dynamicColors get() = sharedPreferences.getBoolean(Constants.PREF_DYNAMIC_COLORS, true)
+    val amoledTheme get() = sharedPreferences.getBoolean(Constants.PREF_AMOLED_THEME, false)
     var displayExtraInfo: Boolean
         get() = sharedPreferences.getBoolean(Constants.PREF_DISPLAY_EXTRA_INFO, false)
         set(value) {
diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt b/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
index ab6cc2b2..bb4285a6 100644
--- a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
+++ b/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt
@@ -31,6 +31,7 @@ object Constants {
     const val PREF_IMAGE_CACHE_SIZE = "pref_image_cache_size"
     const val PREF_THEME = "theme"
     const val PREF_DYNAMIC_COLORS = "dynamic_colors"
+    const val PREF_AMOLED_THEME = "pref_amoled_theme"
     const val PREF_NETWORK_REQUEST_TIMEOUT = "pref_network_request_timeout"
     const val PREF_NETWORK_CONNECT_TIMEOUT = "pref_network_connect_timeout"
     const val PREF_NETWORK_SOCKET_TIMEOUT = "pref_network_socket_timeout"