From 9982c9f592d89dc1700fa4835b8e0d59f67d6936 Mon Sep 17 00:00:00 2001 From: ErikWaegerle Date: Tue, 7 Jul 2020 16:56:32 +0200 Subject: [PATCH] Adaptation of the GamePreferenceFragment class Modify the switches in the SettingsActivity If Dark Theme has been set manually, Dark Theme is displayed greyed out according to battery and system. Additionally it is only allowed to set one of both to the Dark theme, not both at the same time. --- .../ui/SettingsActivity.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java index f6c20fd..a3153d4 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java @@ -213,6 +213,22 @@ public class SettingsActivity extends AppCompatPreferenceActivity { addPreferencesFromResource(R.xml.pref_settings_general); setHasOptionsMenu(true); + + PreferenceManager preferenceManager = getPreferenceManager(); + SharedPreferences sp = preferenceManager.getSharedPreferences(); + + + if (sp.getBoolean("pref_dark_mode_setting", false)) { + //TwoStatePreference x = (TwoStatePreference) findPreference("pref_dark_mode_automatically_by_system"); + //x.setEnabled(false); + findPreference("pref_dark_mode_automatically_by_system").setEnabled(false); + findPreference("pref_dark_mode_automatically_by_battery").setEnabled(false); + } else { + + findPreference("pref_dark_mode_automatically_by_system").setEnabled(!sp.getBoolean("pref_dark_mode_automatically_by_battery", false)); + findPreference("pref_dark_mode_automatically_by_battery").setEnabled(!sp.getBoolean("pref_dark_mode_automatically_by_system", false)); + } + // Bind the summaries of EditText/List/Dialog/Ringtone preferences // to their values. When their values change, their summaries are // updated to reflect the new value, per the Android Design @@ -222,7 +238,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { //bindPreferenceSummaryToValue(findPreference("example_list")); } - @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId();