From 2fe3b1580650efb6794c86f13b9e5f8b399f8e32 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sat, 5 Jun 2021 17:17:27 -0500
Subject: [PATCH] Fix small issues with the pure black theme

---
 CHANGELOG.md                                                | 1 +
 .../org/isoron/uhabits/activities/AndroidThemeSwitcher.kt   | 3 ++-
 .../isoron/uhabits/activities/settings/SettingsFragment.kt  | 4 ++++
 uhabits-android/src/main/res/values/styles.xml              | 6 ++++++
 .../jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt | 6 ++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93d8a7ee..33b160e22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [2.0.3] - [Unreleased]
 ### Fixed
 - Improve automatic checkmarks for monthly habits (@iSoron, 947)
+- Fix small issues with the pure black theme (@iSoron)
 
 ## [2.0.2] - 2021-05-23
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
index 855adaa84..be9d0eb02 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
@@ -30,6 +30,7 @@ import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.ThemeSwitcher
 import org.isoron.uhabits.core.ui.views.DarkTheme
 import org.isoron.uhabits.core.ui.views.LightTheme
+import org.isoron.uhabits.core.ui.views.PureBlackTheme
 import org.isoron.uhabits.core.ui.views.Theme
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.inject.ActivityScope
@@ -66,7 +67,7 @@ constructor(
     }
 
     override fun applyPureBlackTheme() {
-        currentTheme = DarkTheme()
+        currentTheme = PureBlackTheme()
         context.setTheme(R.style.AppBaseThemeDark_PureBlack)
         (context as Activity).window.navigationBarColor =
             ContextCompat.getColor(context, R.color.black)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
index cc8bcecfe..cf63f560c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
@@ -27,6 +27,9 @@ import android.os.Build.VERSION
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
@@ -43,6 +46,7 @@ import org.isoron.uhabits.core.ui.NotificationTray
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getLongWeekdayNames
 import org.isoron.uhabits.notifications.AndroidNotificationTray.Companion.createAndroidNotificationChannel
 import org.isoron.uhabits.notifications.RingtoneManager
+import org.isoron.uhabits.utils.StyledResources
 import org.isoron.uhabits.widgets.WidgetUpdater
 import java.util.Calendar
 
diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 2f8eb6e21..9bba46775 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -129,6 +129,7 @@
         <item name="selectedBackground">@drawable/selected_box</item>
         <item name="textColorAlertDialogListItem">@color/grey_100</item>
         <item name="windowBackgroundColor">@color/black</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material.PureBlack</item>
     </style>
 
     <style name="BaseDialog" parent="Theme.AppCompat.Light.Dialog">
@@ -151,6 +152,11 @@
         <item name="palette">@array/darkPalette</item>
     </style>
 
+    <style name="PreferenceThemeOverlay.v14.Material.PureBlack">
+        <item name="android:background">@color/black</item>
+    </style>
+
+
     <style name="WidgetTheme" parent="AppBaseThemeDark">
         <item name="cardBgColor">@color/grey_850</item>
         <item name="contrast0">@color/white</item>
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt
index a7ab62ba6..7f43541f7 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt
@@ -109,6 +109,12 @@ open class DarkTheme : Theme() {
     }
 }
 
+class PureBlackTheme : DarkTheme() {
+    override val appBackgroundColor = Color(0x000000)
+    override val cardBackgroundColor = Color(0x000000)
+    override val lowContrastTextColor = Color(0x212121)
+}
+
 class WidgetTheme : LightTheme() {
     override val cardBackgroundColor = Color.TRANSPARENT
     override val highContrastTextColor = Color.WHITE