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

Merge branch 'expert-mode-scroll' into 'master'

Browse Source 
Keep "Expert mode" item at top of screen when revealing expert preferences

See merge request fdroid/fdroidclient!737
This commit is contained in:
Hans-Christoph Steiner 2018-08-30 10:08:15 +00:00
commit 5701cfe34b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ 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.PreferenceGroup;
import android.support.v7.preference.SeekBarPreference; import android.support.v7.preference.SeekBarPreference;
import android.support.v7.widget.LinearSmoothScroller;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.WindowManager; import android.view.WindowManager;
@ -105,6 +106,8 @@ public class PreferencesFragment extends PreferenceFragment
private int overDataPrevious; private int overDataPrevious;
private int updateIntervalPrevious; private int updateIntervalPrevious;
private LinearSmoothScroller topScroller;
@Override @Override
public void onCreatePreferences(Bundle bundle, String s) { public void onCreatePreferences(Bundle bundle, String s) {
@ -161,6 +164,13 @@ public class PreferencesFragment extends PreferenceFragment
PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_appcompatibility"); PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_appcompatibility");
category.removePreference(findPreference(Preferences.PREF_FORCE_TOUCH_APPS)); category.removePreference(findPreference(Preferences.PREF_FORCE_TOUCH_APPS));
} }
topScroller = new LinearSmoothScroller(getActivity()) {
@Override
protected int getVerticalSnapPreference() {
return SNAP_TO_START;
}
};
} }
private void checkSummary(String key, int resId) { private void checkSummary(String key, int resId) {
@ -294,16 +304,23 @@ 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);
int expertPreferencesCount = 0;
boolean isExpertMode = Preferences.get().expertMode(); boolean isExpertMode = Preferences.get().expertMode();
for (int i = 0; i < otherPrefGroup.getPreferenceCount(); i++) { for (int i = 0; i < otherPrefGroup.getPreferenceCount(); i++) {
Preference pref = otherPrefGroup.getPreference(i); Preference pref = otherPrefGroup.getPreference(i);
if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) { if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) {
pref.setVisible(isExpertMode); pref.setVisible(isExpertMode);
expertPreferencesCount++;
} }
} }
if (changing) { if (changing) {
RecyclerView recyclerView = getListView(); RecyclerView recyclerView = getListView();
recyclerView.smoothScrollToPosition(recyclerView.getAdapter().getItemCount() - 1); int preferencesCount = recyclerView.getAdapter().getItemCount();
if (!isExpertMode) {
expertPreferencesCount = 0;
}
topScroller.setTargetPosition(preferencesCount - expertPreferencesCount - 1);
recyclerView.getLayoutManager().startSmoothScroll(topScroller);
} }
break; break;