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

Increment digit on the end of profile name when create new profile.

Browse source
This commit is contained in:
Dima-1 2019-12-27 15:07:16 +02:00
parent 1edd6f3bbb
commit 366a61ba52
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
View file

@ -95,7 +95,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
if (baseModeForNewProfile != null) {
profile.stringKey = baseModeForNewProfile.getStringKey() + "_" + System.currentTimeMillis();
profile.parent = baseModeForNewProfile;
profile.name = baseModeForNewProfile.toHumanString(getContext());
profile.name = baseModeForNewProfile.toHumanString(app);
profile.color = baseModeForNewProfile.getIconColorInfo();
profile.iconRes = baseModeForNewProfile.getIconRes();
profile.routingProfile = baseModeForNewProfile.getRoutingProfile();
@ -115,7 +115,11 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
} else {
changedProfile.stringKey = profile.stringKey;
changedProfile.parent = profile.parent;
changedProfile.name = profile.name;
if (baseModeForNewProfile != null) {
changedProfile.name = createNonDuplicateName(baseModeForNewProfile.toHumanString(app));
} else {
changedProfile.name = profile.name;
}
changedProfile.color = profile.color;
changedProfile.iconRes = profile.iconRes;
changedProfile.routingProfile = profile.routingProfile;
@ -123,6 +127,21 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
}
}
private String createNonDuplicateName(String oldName) {
int suffix = 0;
int i = oldName.length() - 1;
do {
try {
suffix = Integer.parseInt(oldName.substring(i));
} catch (NumberFormatException e) {
break;
}
i--;
} while (i >= 0);
suffix++;
return oldName.substring(0, i + 1) + suffix;
}
@Override
protected void setupPreferences() {
findPreference(SELECT_COLOR).setIconSpaceReserved(false);