Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nav settings mode selection fix

Browse source
This commit is contained in:
madwasp79 2019-07-04 16:09:42 +03:00
parent 0713ada1df
commit 935d74df61
1 changed files with 43 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
View file

@ -46,11 +46,14 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
private static final Log LOG = PlatformUtil.getLog(SettingsBaseActivity.class); private static final Log LOG = PlatformUtil.getLog(SettingsBaseActivity.class);
public static final String INTENT_APP_MODE = "INTENT_APP_MODE"; public static final String INTENT_APP_MODE = "INTENT_APP_MODE";
private static final String PREV_MODE_KEY = "previous_mode";
private static final String SELECTED_MODE_KEY = "selected_mode";
protected OsmandSettings settings; protected OsmandSettings settings;
protected final boolean profileSettings; protected final boolean profileSettings;
protected List<ApplicationMode> modes = new ArrayList<ApplicationMode>(); protected List<ApplicationMode> modes = new ArrayList<ApplicationMode>();
private ApplicationMode previousAppMode; private ApplicationMode previousAppMode;
protected ApplicationMode selectedAppMode;
private Map<String, Preference> screenPreferences = new LinkedHashMap<String, Preference>(); private Map<String, Preference> screenPreferences = new LinkedHashMap<String, Preference>();
private Map<String, OsmandPreference<Boolean>> booleanPreferences = new LinkedHashMap<String, OsmandPreference<Boolean>>(); private Map<String, OsmandPreference<Boolean>> booleanPreferences = new LinkedHashMap<String, OsmandPreference<Boolean>>();
@ -359,7 +362,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
final List<ProfileDataObject> activeModes = new ArrayList<>(); final List<ProfileDataObject> activeModes = new ArrayList<>();
for (ApplicationMode am : ApplicationMode.values(getMyApplication())) { for (ApplicationMode am : ApplicationMode.values(getMyApplication())) {
boolean isSelected = false; boolean isSelected = false;
if (previousAppMode != null && previousAppMode == am) { if (am == selectedAppMode) {
isSelected = true; isSelected = true;
} }
if (am != ApplicationMode.DEFAULT) { if (am != ApplicationMode.DEFAULT) {
@ -411,7 +414,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
getModeTitleTV().setText(title); getModeTitleTV().setText(title);
getModeSubTitleTV().setText(getAppModeDescription(mode)); getModeSubTitleTV().setText(getAppModeDescription(mode));
settings.APPLICATION_MODE.set(mode); settings.APPLICATION_MODE.set(mode);
previousAppMode = mode; selectedAppMode = mode;
getModeIconIV().setImageDrawable(getMyApplication().getUIUtilities().getIcon(mode.getIconRes(), getModeIconIV().setImageDrawable(getMyApplication().getUIUtilities().getIcon(mode.getIconRes(),
mode.getIconColorInfo().getColor(nightMode))); mode.getIconColorInfo().getColor(nightMode)));
getDropDownArrow().setImageDrawable(getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_arrow_drop_down, getDropDownArrow().setImageDrawable(getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_arrow_drop_down,
@ -439,33 +442,28 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (profileSettings) { if (profileSettings) {
previousAppMode = settings.getApplicationMode(); if (previousAppMode == null) {
boolean found; previousAppMode = settings.getApplicationMode();
}
if (getIntent() != null && getIntent().hasExtra(INTENT_APP_MODE)) { if (getIntent() != null && getIntent().hasExtra(INTENT_APP_MODE)) {
String modeStr = getIntent().getStringExtra(INTENT_APP_MODE); String modeStr = getIntent().getStringExtra(INTENT_APP_MODE);
ApplicationMode mode = ApplicationMode.valueOfStringKey(modeStr, previousAppMode); ApplicationMode mode = ApplicationMode.valueOfStringKey(modeStr, previousAppMode);
found = setSelectedAppMode(mode); setSelectedAppMode(mode);
} else { } else {
found = setSelectedAppMode(previousAppMode); setSelectedAppMode(selectedAppMode);
}
if (!found) {
getSpinner().setSelection(0);
} }
} else { } else {
updateAllSettings(); updateAllSettings();
} }
} }
protected boolean setSelectedAppMode(ApplicationMode am) { protected void setSelectedAppMode(ApplicationMode am) {
boolean found = false;
for (ApplicationMode a : modes) { for (ApplicationMode a : modes) {
if (am == a) { if (am != null && am == a) {
updateModeButton(a); updateModeButton(a);
found = true;
break; break;
} }
} }
return found;
} }
@Override @Override
@ -475,7 +473,37 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
settings.APPLICATION_MODE.set(previousAppMode); settings.APPLICATION_MODE.set(previousAppMode);
} }
} }
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
if (profileSettings) {
if (previousAppMode != null) {
outState.putString(PREV_MODE_KEY, previousAppMode.getStringKey());
}
if (selectedAppMode != null) {
outState.putString(SELECTED_MODE_KEY, selectedAppMode.getStringKey());
}
}
}
@Override
protected void onRestoreInstanceState(Bundle state) {
super.onRestoreInstanceState(state);
if (state != null) {
if (profileSettings && state.containsKey(SELECTED_MODE_KEY) && state.containsKey(PREV_MODE_KEY)) {
for (ApplicationMode am : ApplicationMode.values(getMyApplication())) {
if (am.getStringKey() == state.get(SELECTED_MODE_KEY)) {
setSelectedAppMode(am);
isModeSelected = true;
}
if (am.getStringKey() == state.get(PREV_MODE_KEY)) {
previousAppMode = am;
}
}
}
}
}
public void updateAllSettings() { public void updateAllSettings() {
for (OsmandPreference<Boolean> b : booleanPreferences.values()) { for (OsmandPreference<Boolean> b : booleanPreferences.values()) {