Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disabled dark mode setting for now

Browse source
This commit is contained in:
Sylvain Berfini 2019-03-05 09:03:31 +01:00
parent 7360c1f832
commit f45169f3a2
4 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/linphone/settings/LinphonePreferences.java
View file

@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import android.Manifest; import android.Manifest;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import androidx.appcompat.app.AppCompatDelegate;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -1433,17 +1432,17 @@ public class LinphonePreferences {
} }
public boolean isDarkModeEnabled() { public boolean isDarkModeEnabled() {
return getConfig() return false; /*getConfig()
.getBool( .getBool(
"app", "app",
"dark_mode", "dark_mode",
AppCompatDelegate.getDefaultNightMode() AppCompatDelegate.getDefaultNightMode()
== AppCompatDelegate.MODE_NIGHT_YES); == AppCompatDelegate.MODE_NIGHT_YES);*/
} }
public void enableDarkMode(boolean enable) { /*public void enableDarkMode(boolean enable) {
getConfig().setBool("app", "dark_mode", enable); getConfig().setBool("app", "dark_mode", enable);
} }*/
public static class AccountBuilder { public static class AccountBuilder {
private final Core lc; private final Core lc;

38
app/src/main/java/org/linphone/settings/SettingsFragment.java
View file

@ -1689,8 +1689,8 @@ public class SettingsFragment extends PreferencesListFragment {
} }
private void initAdvancedSettings() { private void initAdvancedSettings() {
((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key))) /*((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
.setChecked(mPrefs.isDarkModeEnabled()); .setChecked(mPrefs.isDarkModeEnabled());*/
((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key))) ((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key)))
.setChecked(mPrefs.isFriendlistsubscriptionEnabled()); .setChecked(mPrefs.isFriendlistsubscriptionEnabled());
((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key))) ((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key)))
@ -1712,23 +1712,23 @@ public class SettingsFragment extends PreferencesListFragment {
} }
private void setAdvancedPreferencesListener() { private void setAdvancedPreferencesListener() {
findPreference(getString(R.string.pref_dark_mode_key)) /*findPreference(getString(R.string.pref_dark_mode_key))
.setOnPreferenceChangeListener( .setOnPreferenceChangeListener(
new OnPreferenceChangeListener() { new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange( public boolean onPreferenceChange(
Preference preference, Object newValue) { Preference preference, Object newValue) {
boolean value = (Boolean) newValue; boolean value = (Boolean) newValue;
mPrefs.enableDarkMode(value); mPrefs.enableDarkMode(value);
if (value) { if (value) {
LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark); LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
} else { } else {
LinphoneActivity.instance() LinphoneActivity.instance()
.setTheme(R.style.LinphoneStyleLight); .setTheme(R.style.LinphoneStyleLight);
} }
return true; return true;
} }
}); });*/
findPreference(getString(R.string.pref_friendlist_subscribe_key)) findPreference(getString(R.string.pref_friendlist_subscribe_key))
.setOnPreferenceChangeListener( .setOnPreferenceChangeListener(

2
app/src/main/res/values/styles.xml
View file

@ -5,7 +5,7 @@
<!-- Android theme override --> <!-- Android theme override -->
<item name="colorAccent">@color/colorA</item> <item name="colorAccent">@color/colorA</item>
<item name="android:textColorPrimary">@color/colorC</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:textColorHint">@color/colorE</item>
<item name="android:colorBackground">@color/colorH</item> <item name="android:colorBackground">@color/colorH</item>
<item name="android:textColorPrimaryInverse">@color/colorH</item> <item name="android:textColorPrimaryInverse">@color/colorH</item>

1
app/src/main/res/xml/preferences.xml
View file

@ -382,6 +382,7 @@
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_dark_mode_key" android:key="@string/pref_dark_mode_key"
android:persistent="false" android:persistent="false"
android:layout="@layout/hidden"
android:title="@string/pref_dark_mode" /> android:title="@string/pref_dark_mode" />
<PreferenceCategory android:title="@string/pref_debug_title"> <PreferenceCategory android:title="@string/pref_debug_title">