From 8983ba915c8eab0779678a5e9075c4c968a01130 Mon Sep 17 00:00:00 2001 From: Silky Priya Date: Thu, 11 Apr 2019 21:46:20 +0545 Subject: [PATCH] Show settings when not logged in (#2867) * Show settings when not logged in * Disable useExternalStorage * Update comment * Disable three more settings --- .../free/nrw/commons/settings/SettingsFragment.java | 13 +++++++++++++ .../nrw/commons/theme/NavigationBaseActivity.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java index abd54158b..cf0e8aaee 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java @@ -104,6 +104,19 @@ public class SettingsFragment extends PreferenceFragment { checkPermissionsAndSendLogs(); return true; }); + // Disable some settings when not logged in. + if (defaultKvStore.getBoolean("login_skipped", false)){ + SwitchPreference useExternalStorage = (SwitchPreference) findPreference("useExternalStorage"); + SwitchPreference displayNearbyCardView = (SwitchPreference) findPreference("displayNearbyCardView"); + SwitchPreference displayLocationPermissionForCardView = (SwitchPreference) findPreference("displayLocationPermissionForCardView"); + SwitchPreference displayCampaignsCardView = (SwitchPreference) findPreference("displayCampaignsCardView"); + useExternalStorage.setEnabled(false); + uploadLimit.setEnabled(false); + useAuthorName.setEnabled(false); + displayNearbyCardView.setEnabled(false); + displayLocationPermissionForCardView.setEnabled(false); + displayCampaignsCardView.setEnabled(false); + } } /** diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 23263e1a2..f2b03c880 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -82,7 +82,7 @@ public abstract class NavigationBaseActivity extends BaseActivity userIcon.setVisibility(View.GONE); nav_Menu.findItem(R.id.action_login).setVisible(true); nav_Menu.findItem(R.id.action_home).setVisible(false); - nav_Menu.findItem(R.id.action_settings).setVisible(false); + nav_Menu.findItem(R.id.action_settings).setVisible(true); nav_Menu.findItem(R.id.action_logout).setVisible(false); nav_Menu.findItem(R.id.action_bookmarks).setVisible(true); }else {