Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make Expert preference show/hide all the expert preferences

Browse Source 
This should make them less scary to people who do not want to see them at
all.  It also means that there can be quite a few expert preferences without
making the list super long for most users.
This commit is contained in:
Hans-Christoph Steiner 2018-06-25 14:56:02 +02:00
parent 654d2ca40e
commit 5771908f90
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -37,7 +37,9 @@ import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.ListPreference; import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.SeekBarPreference; import android.support.v7.preference.SeekBarPreference;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.WindowManager; import android.view.WindowManager;
import info.guardianproject.netcipher.NetCipher; import info.guardianproject.netcipher.NetCipher;
@ -91,6 +93,7 @@ public class PreferencesFragment extends PreferenceFragment
private static final int REQUEST_INSTALL_ORBOT = 0x1234; private static final int REQUEST_INSTALL_ORBOT = 0x1234;
private PreferenceGroup otherPrefGroup;
private LiveSeekBarPreference overWifiSeekBar; private LiveSeekBarPreference overWifiSeekBar;
private LiveSeekBarPreference overDataSeekBar; private LiveSeekBarPreference overDataSeekBar;
private LiveSeekBarPreference updateIntervalSeekBar; private LiveSeekBarPreference updateIntervalSeekBar;
@ -109,6 +112,8 @@ public class PreferencesFragment extends PreferenceFragment
Preferences.get().migrateOldPreferences(); Preferences.get().migrateOldPreferences();
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
otherPrefGroup = (PreferenceGroup) findPreference("pref_category_other");
useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR); useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR);
enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY); enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY);
updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES); updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES);
@ -284,6 +289,15 @@ public class PreferencesFragment extends PreferenceFragment
case Preferences.PREF_EXPERT: case Preferences.PREF_EXPERT:
checkSummary(key, R.string.expert_on); checkSummary(key, R.string.expert_on);
boolean isExpertMode = Preferences.get().expertMode();
for (int i = 0; i < otherPrefGroup.getPreferenceCount(); i++) {
Preference pref = otherPrefGroup.getPreference(i);
if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) {
pref.setVisible(isExpertMode);
}
RecyclerView recyclerView = getListView();
recyclerView.smoothScrollToPosition(recyclerView.getAdapter().getItemCount() - 1);
}
break; break;
case Preferences.PREF_PRIVILEGED_INSTALLER: case Preferences.PREF_PRIVILEGED_INSTALLER:
@ -355,9 +369,8 @@ public class PreferencesFragment extends PreferenceFragment
// is no benefit showing it to them (it will only be disabled and we can't offer any // is no benefit showing it to them (it will only be disabled and we can't offer any
// way to easily install from here. // way to easily install from here.
if (Build.VERSION.SDK_INT > 19 && !installed) { if (Build.VERSION.SDK_INT > 19 && !installed) {
PreferenceCategory other = (PreferenceCategory) findPreference("pref_category_other");
if (pref != null) { if (pref != null) {
other.removePreference(pref); otherPrefGroup.removePreference(pref);
} }
} else { } else {
pref.setEnabled(installed); pref.setEnabled(installed);
@ -383,8 +396,7 @@ public class PreferencesFragment extends PreferenceFragment
private void initUpdatePrivilegedExtensionPreference() { private void initUpdatePrivilegedExtensionPreference() {
if (Build.VERSION.SDK_INT > 19) { if (Build.VERSION.SDK_INT > 19) {
// this will never work on newer Android versions, so hide it // this will never work on newer Android versions, so hide it
PreferenceCategory other = (PreferenceCategory) findPreference("pref_category_other"); otherPrefGroup.removePreference(updatePrivilegedExtensionPref);
other.removePreference(updatePrivilegedExtensionPref);
return; return;
} }
updatePrivilegedExtensionPref.setPersistent(false); updatePrivilegedExtensionPref.setPersistent(false);