From 10d8eb4d8c880bba56f701498d81dbb316f4a83f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 14 Nov 2019 17:27:44 +0100 Subject: [PATCH] Added a custom setting to hide dark mode feature in app --- .../java/org/linphone/settings/AdvancedSettingsFragment.java | 2 ++ .../main/java/org/linphone/settings/LinphonePreferences.java | 1 + app/src/main/res/values/non_localizable_custom.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java b/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java index f769af665..cc27bcb31 100644 --- a/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java +++ b/app/src/main/java/org/linphone/settings/AdvancedSettingsFragment.java @@ -83,6 +83,8 @@ public class AdvancedSettingsFragment extends SettingsFragment { mStartAtBoot = mRootView.findViewById(R.id.pref_autostart); mDarkMode = mRootView.findViewById(R.id.pref_dark_mode); + mDarkMode.setVisibility( + getResources().getBoolean(R.bool.allow_dark_mode) ? View.VISIBLE : View.GONE); mRemoteProvisioningUrl = mRootView.findViewById(R.id.pref_remote_provisioning); mRemoteProvisioningUrl.setInputType( diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java index 5583990a2..1a9b8aa29 100644 --- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java +++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java @@ -1136,6 +1136,7 @@ public class LinphonePreferences { public boolean isDarkModeEnabled() { if (getConfig() == null) return false; + if (!mContext.getResources().getBoolean(R.bool.allow_dark_mode)) return false; boolean useNightModeDefault = AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES; diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml index 1b644be68..c68dd5ca1 100644 --- a/app/src/main/res/values/non_localizable_custom.xml +++ b/app/src/main/res/values/non_localizable_custom.xml @@ -34,6 +34,7 @@ true false true + true EEE d MMM