Revert "Hide advanced options by default"

This reverts commit 05789c1a8d.
This commit is contained in:
M66B
2020-06-10 09:35:05 +02:00
parent 867b0226a0
commit fcecf09ae7
4 changed files with 3 additions and 58 deletions

View File

@@ -26,7 +26,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -48,8 +47,7 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
public class FragmentOptions extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
private boolean advanced;
public class FragmentOptions extends FragmentBase {
private ViewPager pager;
private PagerAdapter adapter;
@@ -75,14 +73,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
@Override
@Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String tab = getActivity().getIntent().getStringExtra("tab");
if (!TextUtils.isEmpty(tab))
prefs.edit().putBoolean("setup_advanced", true).apply();
advanced = prefs.getBoolean("setup_advanced", false);
View view = inflater.inflate(R.layout.fragment_options, container, false);
pager = view.findViewById(R.id.pager);
@@ -149,29 +139,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
getActivity().getIntent().removeExtra("tab");
}
@Override
public void onResume() {
super.onResume();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.registerOnSharedPreferenceChangeListener(this);
}
@Override
public void onPause() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.unregisterOnSharedPreferenceChangeListener(this);
super.onPause();
}
@Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
if ("setup_advanced".equals(key)) {
advanced = prefs.getBoolean(key, false);
Log.i("Show advanced=" + advanced);
adapter.notifyDataSetChanged();
}
}
@Override
protected void finish() {
onExit();
@@ -255,7 +222,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
@Override
public int getCount() {
return (advanced ? 10 : 1);
return 10;
}
@Override