From 3594739651ff791a886b8e9d77160e27ca026a60 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sun, 16 Aug 2020 08:44:59 +0200
Subject: [PATCH] set correctly tint color if night mode is globally on but in
 openScale theme mode is light, see issue #611

---
 android_app/app/build.gradle                                 | 2 +-
 .../main/java/com/health/openscale/gui/utils/ColorUtil.java  | 5 ++++-
 android_app/build.gradle                                     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index 54f201f1..9b960fd4 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -139,7 +139,7 @@ dependencies {
     // Simple CSV
     implementation 'com.j256.simplecsv:simplecsv:2.6'
     // Blessed Android
-    implementation 'com.github.weliem:blessed-android:1.20'
+    implementation 'com.github.weliem:blessed-android:1.26'
     // CustomActivityOnCrash
     implementation 'cat.ereza:customactivityoncrash:2.2.0'
     // AppIntro
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/utils/ColorUtil.java b/android_app/app/src/main/java/com/health/openscale/gui/utils/ColorUtil.java
index f83cb7be..4fc4b898 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/utils/ColorUtil.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/utils/ColorUtil.java
@@ -18,6 +18,7 @@ package com.health.openscale.gui.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.preference.PreferenceManager;
 
@@ -35,7 +36,9 @@ public class ColorUtil {
     public static int getTintColor(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
-        if (prefs.getString("app_theme", "").equals("Dark")) {
+        int nightModeFlags = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+        if (prefs.getString("app_theme", "Light").equals("Dark") || nightModeFlags == Configuration.UI_MODE_NIGHT_YES) {
             return Color.parseColor("#b3ffffff");
         }
 
diff --git a/android_app/build.gradle b/android_app/build.gradle
index 483b7bf6..49672d5d 100644
--- a/android_app/build.gradle
+++ b/android_app/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-beta01"
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0"
     }
 }