From 9c96857262cce369006e9917fc54385bd3bf8ac7 Mon Sep 17 00:00:00 2001
From: Sunxy88 <sungxisx@icloud.com>
Date: Sat, 14 Nov 2020 14:57:07 +0100
Subject: [PATCH 1/4] Use dark theme in settings window. (#655)

---
 .../uhabits/activities/settings/SettingsActivity.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
index 72c519833..d61bdfe52 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
@@ -23,17 +23,25 @@ import android.os.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.androidbase.utils.*;
-import org.isoron.uhabits.R;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.activities.*;
 
 /**
  * Activity that allows the user to view and modify the app settings.
  */
 public class SettingsActivity extends BaseActivity
 {
+    private AndroidThemeSwitcher themeSwitcher;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+
+        HabitsApplicationComponent compoenent = ((HabitsApplication) getApplication()).getComponent();
+        themeSwitcher = new AndroidThemeSwitcher(this, compoenent.getPreferences());
+        themeSwitcher.apply();
+
         setContentView(R.layout.settings_activity);
         setupActionBarColor();
     }

From 011abf62a098ff9cb249f2d1a88078258592f405 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Wed, 9 Dec 2020 20:01:35 -0600
Subject: [PATCH 2/4] Bump version to 1.8.11

---
 android/gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index b7ce88698..0617454e0 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_CODE = 10810
-VERSION_NAME = 1.8.10
+VERSION_CODE = 10811
+VERSION_NAME = 1.8.11
 
 MIN_SDK_VERSION = 21
 TARGET_SDK_VERSION = 29

From dbc6a16a9893ec3975a3d76f3eed6747c05979e5 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Tue, 29 Dec 2020 18:43:09 -0600
Subject: [PATCH 3/4] Set forceDarkAllowed to false

---
 android/uhabits-android/src/main/res/values/styles.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/uhabits-android/src/main/res/values/styles.xml b/android/uhabits-android/src/main/res/values/styles.xml
index 0e7b5a5a0..61713e0e1 100644
--- a/android/uhabits-android/src/main/res/values/styles.xml
+++ b/android/uhabits-android/src/main/res/values/styles.xml
@@ -17,8 +17,9 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="android:dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
         <item name="android:alertDialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
@@ -75,6 +76,7 @@
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="android:dialogTheme">@style/Theme.AppCompat.Dialog</item>
         <item name="android:alertDialogTheme">@style/Theme.AppCompat.Dialog</item>
@@ -127,6 +129,7 @@
     </style>
 
     <style name="AppBaseThemeDark.PureBlack">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="selectedBackground">@drawable/selected_box_amoled</item>
         <item name="cardBackground">@drawable/card_amoled_background</item>
 

From 56f91526e69880d746d7df5a4f33de0a3d32293f Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Tue, 29 Dec 2020 18:51:12 -0600
Subject: [PATCH 4/4] Update CHANGELOG

---
 CHANGELOG.md                                     |  4 ++++
 .../main/play/release-notes/en-US/default.txt    | 16 ++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eaebbdca6..09d7bace6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.8.11 (Dev 29, 2020)
+
+* Fix theme issues on Xiaomi phones
+
 ### 1.8.10 (Nov 26, 2020)
 
 * Update translations
diff --git a/android/uhabits-android/src/main/play/release-notes/en-US/default.txt b/android/uhabits-android/src/main/play/release-notes/en-US/default.txt
index 52cfdd7c6..98136243c 100644
--- a/android/uhabits-android/src/main/play/release-notes/en-US/default.txt
+++ b/android/uhabits-android/src/main/play/release-notes/en-US/default.txt
@@ -1,14 +1,2 @@
-1.8.10:
-* Update translations
-1.8.9
-* Remove unused permissions
-* Notification bundling
-1.8:
-* New bar chart showing number of repetitions performed each week, month or year
-* Performing habits on irregular weekdays will no longer break your streak
-* More colors
-* Customize how transparent the widgets are
-* Customize the first day of the week
-* Yes/No buttons on notifications
-* Automatic dark theme (Android 10)
-* Smaller APK and backup files
+1.8.11:
+* Fix theme issues on Xiaomi phones