fixes #45, fixes #46 and fixes #47

punchtime · May 19, 2016 · 8ce6ced · 8ce6ced
1 parent f516dc1
commit 8ce6ced
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/app/src/main/java/io/punchtime/punchtime/ui/fragments/SettingsFragment.java b/app/src/main/java/io/punchtime/punchtime/ui/fragments/SettingsFragment.java
@@ -23,6 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -57,6 +58,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.settings);
         android.support.v7.preference.Preference prefLogin = findPreference("pref_key_account");
+        if(!preferences.getBoolean("logged_in", false)) findPreference("company_cat").setEnabled(false);
 
         if(preferences.getBoolean("logged_in", false)) {
             prefLogin.setSummary(R.string.logged_in_summary);
@@ -123,14 +125,17 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
-        // TODO: 18/05/16 figure out when to call setContact() so it's updated when the company changes
-        /*currentCompany.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+        preferences.registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                setContact();
-                return false;
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+                if(key.equals("logged_in")) {
+                    findPreference("company_cat").setEnabled(sharedPreferences.getBoolean(key, false));
+                }
+                else if(key.equals("pref_current_company")) {
+                    setContact();
+                }
             }
-        });*/
+        });
 
         final ListAdapter adapter = new ArrayAdapter<ContactItem>(
                 activity,
@@ -216,10 +221,11 @@ protected void setCompaniesData(final ListPreference lp) {
             public void onDataChange(DataSnapshot dataSnapshot) {
                 final List<CharSequence> entries = new ArrayList<>();
                 final List<CharSequence> entryValues = new ArrayList<>();
-                List<CharSequence> employerKeys = new ArrayList<>();
-
-                for (DataSnapshot employer : dataSnapshot.getChildren()) {
-                    employerKeys.add(employer.getKey());
+                Iterable<DataSnapshot> employers = dataSnapshot.getChildren();
+                if(!employers.iterator().hasNext()) {
+                    lp.setEnabled(false);
+                }
+                for (DataSnapshot employer : employers) {
                     entryValues.add(employer.getKey());
                     activity.getFirebaseRef().child("companies").child(employer.getKey()).addListenerForSingleValueEvent(new ValueEventListener() {
                         @Override

diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -45,7 +45,8 @@
     </android.support.v7.preference.PreferenceCategory>
 
     <android.support.v7.preference.PreferenceCategory
-        android:title="Company">
+        android:title="Company"
+        android:key="company_cat">
         <android.support.v7.preference.Preference
             android:key="pref_key_add_company"
             android:icon="@drawable/ic_group_add_black_24dp"