luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-25 00:06:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix recreate when setting view mode

Browse source
This commit is contained in:
Michael Schättgen 2019-04-01 21:47:41 +02:00
parent a293078603
commit a46640f43d
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -83,6 +83,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_entryListView.setShowAccountName(getPreferences().isAccountNameVisible()); _entryListView.setShowAccountName(getPreferences().isAccountNameVisible());
_entryListView.setTapToReveal(getPreferences().isTapToRevealEnabled()); _entryListView.setTapToReveal(getPreferences().isTapToRevealEnabled());
_entryListView.setTapToRevealTime(getPreferences().getTapToRevealTime()); _entryListView.setTapToRevealTime(getPreferences().getTapToRevealTime());
_entryListView.setViewMode(ViewMode.fromInteger(getPreferences().getCurrentViewMode()));
// set up the floating action button // set up the floating action button
_fabMenu = findViewById(R.id.fab); _fabMenu = findViewById(R.id.fab);
@ -169,22 +170,18 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void onPreferencesResult(int resultCode, Intent data) { private void onPreferencesResult(int resultCode, Intent data) {
ViewMode viewMode = ViewMode.fromInteger(getPreferences().getCurrentViewMode());
_entryListView.setViewMode(viewMode);
// refresh the entire entry list if needed // refresh the entire entry list if needed
if (data.getBooleanExtra("needsRecreate", false)) { if (data.getBooleanExtra("needsRecreate", false)) {
_entryListView.clearEntries();
_entryListView.addEntries(_db.getEntries());
recreate(); recreate();
} else if (data.getBooleanExtra("needsRefresh", false)) { } else if (data.getBooleanExtra("needsRefresh", false)) {
boolean showAccountName = getPreferences().isAccountNameVisible(); boolean showAccountName = getPreferences().isAccountNameVisible();
boolean tapToReveal = getPreferences().isTapToRevealEnabled(); boolean tapToReveal = getPreferences().isTapToRevealEnabled();
int tapToRevealTime = getPreferences().getTapToRevealTime(); int tapToRevealTime = getPreferences().getTapToRevealTime();
int viewMode = getPreferences().getCurrentViewMode();
_entryListView.setShowAccountName(showAccountName); _entryListView.setShowAccountName(showAccountName);
_entryListView.setTapToReveal(tapToReveal); _entryListView.setTapToReveal(tapToReveal);
_entryListView.setTapToRevealTime(tapToRevealTime); _entryListView.setTapToRevealTime(tapToRevealTime);
_entryListView.refresh(true); _entryListView.refresh(true);
} }

2
app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
View file

@ -148,8 +148,8 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
dialog.dismiss(); dialog.dismiss();
viewModePreference.setSummary("Selected: " + ViewMode.getViewModeName(i));
_result.putExtra("needsRecreate", true); _result.putExtra("needsRecreate", true);
getActivity().recreate();
}) })
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.create()); .create());