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

Fix Exit without saving dialog

Browse source
This commit is contained in:
max-klaus 2019-11-15 17:59:59 +03:00
parent c296b9c0ec
commit 3559f3eefa
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
View file

@ -100,8 +100,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
private boolean isNew = false; private boolean isNew = false;
private boolean isUserProfile = false; private boolean isUserProfile = false;
private boolean isDataChanged = false; private boolean dataChanged = false;
private boolean isCancelAllowed = true;
private boolean nightMode; private boolean nightMode;
private SelectProfileListener navTypeListener = null; private SelectProfileListener navTypeListener = null;
@ -189,14 +188,14 @@ public class EditProfileFragment extends BaseOsmAndFragment {
int startIconId = profile.iconId; int startIconId = profile.iconId;
if (isNew) { if (isNew) {
isDataChanged = true; dataChanged = true;
startIconId = profile.parent.getIconRes(); startIconId = profile.parent.getIconRes();
profile.iconId = startIconId; profile.iconId = startIconId;
profile.iconStringName = profile.parent.getIconName(); profile.iconStringName = profile.parent.getIconName();
} else if (isUserProfile) { } else if (isUserProfile) {
title = profile.userProfileTitle; title = profile.userProfileTitle;
profileNameEt.setText(title); profileNameEt.setText(title);
isDataChanged = false; dataChanged = false;
} else if (profile.stringKeyName != -1) { } else if (profile.stringKeyName != -1) {
title = getResources().getString(profile.stringKeyName); title = getResources().getString(profile.stringKeyName);
profileNameEt.setText(title); profileNameEt.setText(title);
@ -276,7 +275,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
profile.userProfileTitle = s.toString(); profile.userProfileTitle = s.toString();
isCancelAllowed = false; dataChanged = true;
updateToolbar(s.toString()); updateToolbar(s.toString());
} }
@ -342,7 +341,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
popupWindow.setOnItemClickListener(new OnItemClickListener() { popupWindow.setOnItemClickListener(new OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
isDataChanged = true; dataChanged = true;
profile.iconColor = ProfileIconColors.values()[position]; profile.iconColor = ProfileIconColors.values()[position];
profileIcon.setImageDrawable(app.getUIUtilities().getIcon(profile.iconId, profile.iconColor.getColor(nightMode))); profileIcon.setImageDrawable(app.getUIUtilities().getIcon(profile.iconId, profile.iconColor.getColor(nightMode)));
colorSample.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_circle, profile.iconColor.getColor(nightMode))); colorSample.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_circle, profile.iconColor.getColor(nightMode)));
@ -367,7 +366,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
profileConfigBtn.setOnClickListener(new OnClickListener() { profileConfigBtn.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (isDataChanged) { if (dataChanged) {
needSaveDialog(); needSaveDialog();
} else if (getSettings() != null) { } else if (getSettings() != null) {
activateMode(mode); activateMode(mode);
@ -467,7 +466,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
} }
public boolean onBackPressedAllowed() { public boolean onBackPressedAllowed() {
return isCancelAllowed; return !dataChanged;
} }
SelectProfileListener getIconListener() { SelectProfileListener getIconListener() {
@ -475,7 +474,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
iconIdListener = new SelectProfileListener() { iconIdListener = new SelectProfileListener() {
@Override @Override
public void onSelectedType(int pos, String stringRes) { public void onSelectedType(int pos, String stringRes) {
isDataChanged = true; dataChanged = true;
profile.iconId = pos; profile.iconId = pos;
profile.iconStringName = stringRes; profile.iconStringName = stringRes;
profileIcon.setImageDrawable(app.getUIUtilities().getIcon(pos, profileIcon.setImageDrawable(app.getUIUtilities().getIcon(pos,
@ -496,6 +495,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
.get(pos).getStringKey(); .get(pos).getStringKey();
setupBaseProfileView(key); setupBaseProfileView(key);
profile.parent = ApplicationMode.valueOfStringKey(key, ApplicationMode.DEFAULT); profile.parent = ApplicationMode.valueOfStringKey(key, ApplicationMode.DEFAULT);
dataChanged = true;
} }
}; };
} }
@ -531,7 +531,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
} }
void updateRoutingProfile(int pos) { void updateRoutingProfile(int pos) {
isDataChanged = true; dataChanged = true;
for (int i = 0; i < routingProfileDataObjects.size(); i++) { for (int i = 0; i < routingProfileDataObjects.size(); i++) {
if (i == pos) { if (i == pos) {
routingProfileDataObjects.get(i).setSelected(true); routingProfileDataObjects.get(i).setSelected(true);
@ -603,7 +603,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
baseModeIcon.setImageDrawable( baseModeIcon.setImageDrawable(
app.getUIUtilities().getIcon(am.getIconRes(), R.color.icon_color_default_light)); app.getUIUtilities().getIcon(am.getIconRes(), R.color.icon_color_default_light));
baseModeTitle.setText(Algorithms.capitalizeFirstLetter(am.toHumanString(app))); baseModeTitle.setText(Algorithms.capitalizeFirstLetter(am.toHumanString(app)));
isDataChanged = false; dataChanged = false;
} }
} }
} }
@ -678,8 +678,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
if (!ApplicationMode.values(app).contains(mode)) { if (!ApplicationMode.values(app).contains(mode)) {
ApplicationMode.changeProfileAvailability(mode, true, getMyApplication()); ApplicationMode.changeProfileAvailability(mode, true, getMyApplication());
} }
isDataChanged = false; dataChanged = false;
isCancelAllowed = true;
return true; return true;
} }
@ -708,7 +707,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() { bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
isCancelAllowed = true; dataChanged = false;
activity.onBackPressed(); activity.onBackPressed();
} }
}); });