From f45169f3a275c7901974bbc6a327bea54eb7c8e1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 5 Mar 2019 09:03:31 +0100
Subject: [PATCH] Disabled dark mode setting for now

---
 .../settings/LinphonePreferences.java         | 17 ++++-----
 .../linphone/settings/SettingsFragment.java   | 38 +++++++++----------
 app/src/main/res/values/styles.xml            |  2 +-
 app/src/main/res/xml/preferences.xml          |  1 +
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index e5a006fb0..8007033a5 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import androidx.appcompat.app.AppCompatDelegate;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -1433,17 +1432,17 @@ public class LinphonePreferences {
     }
 
     public boolean isDarkModeEnabled() {
-        return getConfig()
-                .getBool(
-                        "app",
-                        "dark_mode",
-                        AppCompatDelegate.getDefaultNightMode()
-                                == AppCompatDelegate.MODE_NIGHT_YES);
+        return false; /*getConfig()
+                      .getBool(
+                              "app",
+                              "dark_mode",
+                              AppCompatDelegate.getDefaultNightMode()
+                                      == AppCompatDelegate.MODE_NIGHT_YES);*/
     }
 
-    public void enableDarkMode(boolean enable) {
+    /*public void enableDarkMode(boolean enable) {
         getConfig().setBool("app", "dark_mode", enable);
-    }
+    }*/
 
     public static class AccountBuilder {
         private final Core lc;
diff --git a/app/src/main/java/org/linphone/settings/SettingsFragment.java b/app/src/main/java/org/linphone/settings/SettingsFragment.java
index fb0acdac1..237d089de 100644
--- a/app/src/main/java/org/linphone/settings/SettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/SettingsFragment.java
@@ -1689,8 +1689,8 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void initAdvancedSettings() {
-        ((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
-                .setChecked(mPrefs.isDarkModeEnabled());
+        /*((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
+        .setChecked(mPrefs.isDarkModeEnabled());*/
         ((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key)))
                 .setChecked(mPrefs.isFriendlistsubscriptionEnabled());
         ((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key)))
@@ -1712,23 +1712,23 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void setAdvancedPreferencesListener() {
-        findPreference(getString(R.string.pref_dark_mode_key))
-                .setOnPreferenceChangeListener(
-                        new OnPreferenceChangeListener() {
-                            @Override
-                            public boolean onPreferenceChange(
-                                    Preference preference, Object newValue) {
-                                boolean value = (Boolean) newValue;
-                                mPrefs.enableDarkMode(value);
-                                if (value) {
-                                    LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
-                                } else {
-                                    LinphoneActivity.instance()
-                                            .setTheme(R.style.LinphoneStyleLight);
-                                }
-                                return true;
-                            }
-                        });
+        /*findPreference(getString(R.string.pref_dark_mode_key))
+        .setOnPreferenceChangeListener(
+                new OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(
+                            Preference preference, Object newValue) {
+                        boolean value = (Boolean) newValue;
+                        mPrefs.enableDarkMode(value);
+                        if (value) {
+                            LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
+                        } else {
+                            LinphoneActivity.instance()
+                                    .setTheme(R.style.LinphoneStyleLight);
+                        }
+                        return true;
+                    }
+                });*/
 
         findPreference(getString(R.string.pref_friendlist_subscribe_key))
                 .setOnPreferenceChangeListener(
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c82f09b0d..d52858757 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
         <!-- Android theme override -->
         <item name="colorAccent">@color/colorA</item>
         <item name="android:textColorPrimary">@color/colorC</item>
-        <item name="android:textColorSecondary">@color/colorH</item>
+        <item name="android:textColorSecondary">@color/colorD</item>
         <item name="android:textColorHint">@color/colorE</item>
         <item name="android:colorBackground">@color/colorH</item>
         <item name="android:textColorPrimaryInverse">@color/colorH</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ccae5f882..963001ebb 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -382,6 +382,7 @@
             <CheckBoxPreference
                 android:key="@string/pref_dark_mode_key"
                 android:persistent="false"
+                android:layout="@layout/hidden"
                 android:title="@string/pref_dark_mode" />
 
             <PreferenceCategory android:title="@string/pref_debug_title">