Fixes Main Menu Visibility for Admin Mode ( #2958 ) (#2960)

* Added constructor to preferences menu fragments * Fixed WhitespaceAround checkstyle violations * Fixed redundant code * Fixed WhitespaceAround checkstyle violation
getodk · Mar 26, 2019 · fd73c5b · fd73c5b
1 parent 6e82b1a
commit fd73c5b
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 12 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/FormManagementPreferences.java b/collect_app/src/main/java/org/odk/collect/android/preferences/FormManagementPreferences.java
@@ -33,9 +33,20 @@
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_GUIDANCE_HINT;
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_IMAGE_SIZE;
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_PERIODIC_FORM_UPDATES_CHECK;
+import static org.odk.collect.android.preferences.PreferencesActivity.INTENT_KEY_ADMIN_MODE;
 
 public class FormManagementPreferences extends BasePreferenceFragment {
 
+    public static FormManagementPreferences newInstance(boolean adminMode) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(INTENT_KEY_ADMIN_MODE, adminMode);
+
+        FormManagementPreferences formManagementPreferences = new FormManagementPreferences();
+        formManagementPreferences.setArguments(bundle);
+
+        return formManagementPreferences;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/...ect_app/src/main/java/org/odk/collect/android/preferences/GeneralPreferencesFragment.java b/...ect_app/src/main/java/org/odk/collect/android/preferences/GeneralPreferencesFragment.java
@@ -16,7 +16,6 @@
 
 package org.odk.collect.android.preferences;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -64,31 +63,28 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
-        Fragment fragment = null;
+        BasePreferenceFragment basePreferenceFragment = null;
         switch (preference.getKey()) {
             case "protocol":
-                fragment = new ServerPreferences();
+                basePreferenceFragment = ServerPreferences.newInstance(getArguments().getBoolean(INTENT_KEY_ADMIN_MODE, false));
                 break;
             case "user_interface":
-                fragment = new UserInterfacePreferences();
+                basePreferenceFragment = UserInterfacePreferences.newInstance(getArguments().getBoolean(INTENT_KEY_ADMIN_MODE, false));
                 break;
             case "form_management":
-                fragment = new FormManagementPreferences();
+                basePreferenceFragment = FormManagementPreferences.newInstance(getArguments().getBoolean(INTENT_KEY_ADMIN_MODE, false));
                 break;
             case "user_and_device_identity":
-                fragment = new IdentityPreferences();
+                basePreferenceFragment = IdentityPreferences.newInstance(getArguments().getBoolean(INTENT_KEY_ADMIN_MODE, false));
                 break;
         }
-
-        if (fragment != null) {
-            getActivity()
-                    .getFragmentManager()
+        if (basePreferenceFragment != null) {
+            getActivity().getFragmentManager()
                     .beginTransaction()
-                    .replace(android.R.id.content, fragment)
+                    .replace(android.R.id.content, basePreferenceFragment)
                     .addToBackStack(null)
                     .commit();
         }
-
         return true;
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/IdentityPreferences.java b/collect_app/src/main/java/org/odk/collect/android/preferences/IdentityPreferences.java
@@ -25,9 +25,20 @@
 import org.odk.collect.android.R;
 
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_ANALYTICS;
+import static org.odk.collect.android.preferences.PreferencesActivity.INTENT_KEY_ADMIN_MODE;
 
 public class IdentityPreferences extends BasePreferenceFragment {
 
+    public static IdentityPreferences newInstance(boolean adminMode) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(INTENT_KEY_ADMIN_MODE, adminMode);
+
+        IdentityPreferences identityPreferences = new IdentityPreferences();
+        identityPreferences.setArguments(bundle);
+
+        return identityPreferences;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/ServerPreferences.java b/collect_app/src/main/java/org/odk/collect/android/preferences/ServerPreferences.java
@@ -25,9 +25,20 @@
 import org.odk.collect.android.R;
 
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_PROTOCOL;
+import static org.odk.collect.android.preferences.PreferencesActivity.INTENT_KEY_ADMIN_MODE;
 
 public class ServerPreferences extends ServerPreferencesFragment {
 
+    public static ServerPreferences newInstance(boolean adminMode) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(INTENT_KEY_ADMIN_MODE, adminMode);
+
+        ServerPreferences serverPreferences = new ServerPreferences();
+        serverPreferences.setArguments(bundle);
+
+        return serverPreferences;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/UserInterfacePreferences.java b/collect_app/src/main/java/org/odk/collect/android/preferences/UserInterfacePreferences.java
@@ -53,11 +53,22 @@
 import static org.odk.collect.android.preferences.GeneralKeys.KEY_SPLASH_PATH;
 import static org.odk.collect.android.preferences.GeneralKeys.OSM_BASEMAP_KEY;
 import static org.odk.collect.android.preferences.GeneralKeys.OSM_MAPS_BASEMAP_DEFAULT;
+import static org.odk.collect.android.preferences.PreferencesActivity.INTENT_KEY_ADMIN_MODE;
 
 public class UserInterfacePreferences extends BasePreferenceFragment {
 
     protected static final int IMAGE_CHOOSER = 0;
 
+    public static UserInterfacePreferences newInstance(boolean adminMode) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(INTENT_KEY_ADMIN_MODE, adminMode);
+
+        UserInterfacePreferences userInterfacePreferences = new UserInterfacePreferences();
+        userInterfacePreferences.setArguments(bundle);
+
+        return userInterfacePreferences;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);