From cec7bc880ed643bc504a26618a64b928cc5ddbae Mon Sep 17 00:00:00 2001
From: Katharine <kwchuiaa@connect.ust.hk>
Date: Wed, 27 Oct 2021 00:37:36 +0800
Subject: [PATCH] view dots that respects themening in app settings

---
 .../card_locker/LoyaltyCardCursorAdapter.java     |  2 +-
 .../card_locker/LoyaltyCardViewActivity.java      | 14 ++++++++++----
 .../java/protect/card_locker/MainActivity.java    |  7 -------
 app/src/main/java/protect/card_locker/Utils.java  | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index 1e974ae0f..8572fe152 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -48,7 +48,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         mSelectedItems = new SparseBooleanArray();
         mAnimationItemsIndex = new SparseBooleanArray();
 
-        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
+        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
 
         swapCursor(mCursor);
     }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 95e4104a3..f437c752f 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -190,11 +190,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
-    private Drawable getDotIcon(boolean active) {
+    private Drawable getDotIcon(boolean active, boolean darkMode) {
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, active ? R.drawable.active_dot : R.drawable.inactive_dot);
         assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        DrawableCompat.setTint(wrappedIcon, ContextCompat.getColor(getApplicationContext(), R.color.iconColor));
+        if (darkMode){
+            DrawableCompat.setTint(wrappedIcon, Color.WHITE);
+        }else{
+            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
+        }
 
         return wrappedIcon;
     }
@@ -552,10 +556,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         dotIndicator.removeAllViews();
         if (imageTypes.size() >= 2) {
             dots = new ImageView[imageTypes.size()];
+            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
 
             for (int i = 0; i < imageTypes.size(); i++) {
                 dots[i] = new ImageView(this);
-                dots[i].setImageDrawable(getDotIcon(false));
+                dots[i].setImageDrawable(getDotIcon(false, darkMode));
 
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
                 params.setMargins(8, 0, 8, 0);
@@ -743,8 +748,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
 
         if (dots != null) {
+            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
             for (int i = 0; i < dots.length; i++) {
-                dots[i].setImageDrawable(getDotIcon(i == index));
+                dots[i].setImageDrawable(getDotIcon(i == index, darkMode));
             }
         }
 
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 99b25b0ee..787b805a3 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -602,13 +602,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         updateLoyaltyCardList();
     }
 
-    protected static boolean isDarkModeEnabled(Context inputContext)
-    {
-        Configuration config = inputContext.getResources().getConfiguration();
-        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
-    }
-
     @Override
     public boolean onDown(MotionEvent e) {
         return false;
diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java
index ff1bad0d7..0ab199492 100644
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -38,6 +38,7 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.exifinterface.media.ExifInterface;
 import protect.card_locker.preferences.Settings;
@@ -401,4 +402,18 @@ public class Utils {
     static public long getUnixTime() {
         return System.currentTimeMillis() / 1000;
     }
+
+    static public boolean isDarkModeEnabled(Context inputContext)
+    {
+        int nightModeSetting = new Settings(inputContext).getTheme();
+        if (nightModeSetting == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+            Configuration config = inputContext.getResources().getConfiguration();
+            int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
+        }else if (nightModeSetting == AppCompatDelegate.MODE_NIGHT_YES){
+            return true;
+        }else{
+            return false;
+        }
+    }
 }