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

refactoring

Browse source
This commit is contained in:
madwasp79 2019-06-12 14:53:11 +03:00
parent 28d9cd4585
commit ad1450c1c8
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,20 +362,9 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
isSelected = true;
}
if (am != ApplicationMode.DEFAULT) {
String descr;
if (am.getParent() == null) {
descr = getString(R.string.profile_type_base_string);
} else {
descr = String.format(getString(R.string.profile_type_descr_string),
am.getParent().toHumanString(getMyApplication()));
if (am.getRoutingProfile().contains("/")) {
descr = descr.concat(", " + am.getRoutingProfile()
.substring(0, am.getRoutingProfile().indexOf("/")));
}
}
activeModes.add(new ProfileDataObject(
am.toHumanString(getMyApplication()),
descr,
getAppModeDescription(am),
am.getStringKey(),
am.getIconRes(getMyApplication()),
isSelected
@ -418,19 +407,8 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
? mode.toHumanString(SettingsBaseActivity.this)
: mode.getUserProfileName();
String descr;
if (mode.getParent() == null) {
descr = getString(R.string.profile_type_base_string);
} else {
descr = String.format(getString(R.string.profile_type_descr_string),
mode.getParent().toHumanString(getMyApplication()));
if (mode.getRoutingProfile().contains("/")) {
descr = descr.concat(", " + mode.getRoutingProfile()
.substring(0, mode.getRoutingProfile().indexOf("/")));
}
}
getModeTitleTV().setText(title);
getModeSubTitleTV().setText(descr);
getModeSubTitleTV().setText(getAppModeDescription(mode));
getModeIconIV().setImageDrawable(getMyApplication().getUIUtilities().getIcon(mode.getIconRes(this),
getMyApplication().getSettings().isLightContent()
? R.color.active_buttons_and_links_light
@ -445,6 +423,21 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
updateAllSettings();
}
private String getAppModeDescription(ApplicationMode mode) {
String descr;
if (mode.getParent() == null) {
descr = getString(R.string.profile_type_base_string);
} else {
descr = String.format(getString(R.string.profile_type_descr_string),
mode.getParent().toHumanString(getMyApplication()));
if (mode.getRoutingProfile().contains("/")) {
descr = descr.concat(", " + mode.getRoutingProfile()
.substring(0, mode.getRoutingProfile().indexOf("/")));
}
}
return descr;
}
@Override
protected void onResume() {
super.onResume();