Keep other category preferences enabled on disable

See #29 The preferences under the "Other" PreferenceCategory will no longer be disabled when Red Moon is disabled.
LibreShift · Apr 7, 2016 · 4483824 · 4483824
1 parent 3656bc8
commit 4483824
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/com/jmstudios/redmoon/fragment/ShadesFragment.java b/app/src/main/java/com/jmstudios/redmoon/fragment/ShadesFragment.java
@@ -86,6 +86,7 @@ public class ShadesFragment extends PreferenceFragment {
     private FilterTimePreference automaticTurnOnPref;
     private FilterTimePreference automaticTurnOffPref;
     private LocationPreference locationPref;
+    private Preference otherPrefCategory;
 
     private boolean searchingLocation;
 
@@ -105,6 +106,7 @@ public void onCreate(Bundle savedInstanceState) {
         String automaticTurnOnPrefKey = getString(R.string.pref_key_custom_start_time);
         String automaticTurnOffPrefKey = getString(R.string.pref_key_custom_end_time);
         String locationPrefKey = getString(R.string.pref_key_location);
+        String otherCategoryPrefKey = getString(R.string.pref_key_other);
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         darkThemePref = (SwitchPreference) prefScreen.findPreference(darkThemePrefKey);
@@ -113,6 +115,7 @@ public void onCreate(Bundle savedInstanceState) {
         automaticTurnOnPref = (FilterTimePreference) prefScreen.findPreference(automaticTurnOnPrefKey);
         automaticTurnOffPref = (FilterTimePreference) prefScreen.findPreference(automaticTurnOffPrefKey);
         locationPref = (LocationPreference) prefScreen.findPreference(locationPrefKey);
+        otherPrefCategory = prefScreen.findPreference(otherCategoryPrefKey);
 
         darkThemePref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
@@ -272,7 +275,7 @@ public void setSwitchOn(boolean powerState, boolean pauseState) {
         updateFabIcon();
 
         if (!powerState) {
-            disableAllPreferences();
+            disableFilterPreferences();
         } else {
             setPreferencesEnabled();
         }
@@ -294,6 +297,11 @@ private void updateFabIcon() {
         }
     }
 
+    private void disableFilterPreferences() {
+        disableAllPreferences();
+        otherPrefCategory.setEnabled(true);
+    }
+
     private void disableAllPreferences() {
         PreferenceScreen root = getPreferenceScreen();
         for (int i = 0; i < root.getPreferenceCount(); i++) {

diff --git a/app/src/main/res/values/donottranslate_prefkeys.xml b/app/src/main/res/values/donottranslate_prefkeys.xml
@@ -49,5 +49,8 @@
   <string name="pref_key_custom_start_time">pref_key_custom_start_time</string>
   <string name="pref_key_custom_end_time">pref_key_custom_end_time</string>
   <string name="pref_key_location">pref_key_location</string>
+  <string name="pref_key_github">pref_key_github</string>
+  <string name="pref_key_email">pref_key_email</string>
+  <string name="pref_key_other">pref_key_other</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -83,13 +83,15 @@
         android:defaultValue="not set" />
   </PreferenceCategory>
 
-  <PreferenceCategory android:title="@string/pref_title_other">
+  <PreferenceCategory android:title="@string/pref_title_other"
+                      android:key="pref_key_other" >
     <SwitchPreference
         android:key="@string/pref_key_dark_theme"
         android:title="@string/dark_theme"
         android:defaultValue="false" />
 
     <Preference
+        android:key="pref_key_github"
         android:title="@string/project_page_title"
         android:summary="@string/project_page_summary" >
       <intent
@@ -98,6 +100,7 @@
     </Preference>
 
     <Preference
+        android:key="pref_key_email"
         android:title="@string/email_me_title"
         android:summary="@string/email_me_summary">
       <intent