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

Merge pull request #8804 from osmandapp/Fix_8367_del_poi_focus

Browse source 
Fix #8367 Wrong focus after deleting a POI
This commit is contained in:
vshcherb 2020-04-17 15:55:24 +02:00 committed by GitHub
commit 66d9bb1abc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -68,6 +68,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndDialogFragment; import net.osmand.plus.base.BaseOsmAndDialogFragment;
import net.osmand.plus.osmedit.OsmPoint.Action; import net.osmand.plus.osmedit.OsmPoint.Action;
@ -88,7 +89,7 @@ import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
public static final String TAG = "EditPoiDialogFragment"; public static final String TAG = EditPoiDialogFragment.class.getSimpleName();
private static final Log LOG = PlatformUtil.getLog(EditPoiDialogFragment.class); private static final Log LOG = PlatformUtil.getLog(EditPoiDialogFragment.class);
private static final String KEY_AMENITY_ENTITY = "key_amenity_entity"; private static final String KEY_AMENITY_ENTITY = "key_amenity_entity";
@ -159,7 +160,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
viewPager = (EditPoiViewPager) view.findViewById(R.id.viewpager); viewPager = (EditPoiViewPager) view.findViewById(R.id.viewpager);
String basicTitle = getResources().getString(R.string.tab_title_basic); String basicTitle = getResources().getString(R.string.tab_title_basic);
String extendedTitle = getResources().getString(R.string.tab_title_advanced); String extendedTitle = getResources().getString(R.string.tab_title_advanced);
final MyAdapter pagerAdapter = new MyAdapter(getChildFragmentManager(), basicTitle, extendedTitle); final PoiInfoPagerAdapter pagerAdapter = new PoiInfoPagerAdapter(getChildFragmentManager(), basicTitle, extendedTitle);
viewPager.setAdapter(pagerAdapter); viewPager.setAdapter(pagerAdapter);
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override @Override
@ -743,12 +744,12 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
public static class MyAdapter extends FragmentPagerAdapter { public static class PoiInfoPagerAdapter extends FragmentPagerAdapter {
private final Fragment[] fragments = new Fragment[]{new BasicEditPoiFragment(), private final Fragment[] fragments = new Fragment[]{new BasicEditPoiFragment(),
new AdvancedEditPoiFragment()}; new AdvancedEditPoiFragment()};
private final String[] titles; private final String[] titles;
public MyAdapter(FragmentManager fm, String basicTitle, String extendedTitle) { PoiInfoPagerAdapter(FragmentManager fm, String basicTitle, String extendedTitle) {
super(fm); super(fm);
titles = new String[]{basicTitle, extendedTitle}; titles = new String[]{basicTitle, extendedTitle};
} }
@ -778,7 +779,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
this.callback = callback; this.callback = callback;
} }
public DeletePoiHelper(AppCompatActivity activity) { DeletePoiHelper(AppCompatActivity activity) {
this.activity = activity; this.activity = activity;
OsmandSettings settings = ((OsmandApplication) activity.getApplication()).getSettings(); OsmandSettings settings = ((OsmandApplication) activity.getApplication()).getSettings();
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class); OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
@ -804,12 +805,14 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, amenity); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, amenity);
} }
public void deletePoiWithDialog(final Entity entity) { void deletePoiWithDialog(final Entity entity) {
boolean nightMode = ((OsmandApplication) activity.getApplication()).getDaynightHelper().isNightModeForMapControls();
Context themedContext = UiUtilities.getThemedContext(activity, nightMode);
if (entity == null) { if (entity == null) {
Toast.makeText(activity, activity.getResources().getString(R.string.poi_cannot_be_found), Toast.LENGTH_LONG).show(); Toast.makeText(themedContext, activity.getResources().getString(R.string.poi_cannot_be_found), Toast.LENGTH_LONG).show();
return; return;
} }
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(themedContext);
builder.setTitle(R.string.poi_remove_title); builder.setTitle(R.string.poi_remove_title);
final EditText comment; final EditText comment;
final CheckBox closeChangesetCheckBox; final CheckBox closeChangesetCheckBox;
@ -818,13 +821,13 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
closeChangesetCheckBox = null; closeChangesetCheckBox = null;
comment = null; comment = null;
} else { } else {
LinearLayout ll = new LinearLayout(activity); LinearLayout ll = new LinearLayout(themedContext);
ll.setPadding(16, 2, 16, 0); ll.setPadding(16, 2, 16, 0);
ll.setOrientation(LinearLayout.VERTICAL); ll.setOrientation(LinearLayout.VERTICAL);
closeChangesetCheckBox = new CheckBox(activity); closeChangesetCheckBox = new CheckBox(themedContext);
closeChangesetCheckBox.setText(R.string.close_changeset); closeChangesetCheckBox.setText(R.string.close_changeset);
ll.addView(closeChangesetCheckBox); ll.addView(closeChangesetCheckBox);
comment = new EditText(activity); comment = new EditText(themedContext);
comment.setText(R.string.poi_remove_title); comment.setText(R.string.poi_remove_title);
ll.addView(comment); ll.addView(comment);
builder.setView(ll); builder.setView(ll);
@ -852,12 +855,16 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
@Override @Override
public boolean processResult(Entity result) { public boolean processResult(Entity result) {
if (result != null) { if (result != null) {
if (callback != null) { OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
callback.poiDeleted(); if (plugin != null && isLocalEdit) {
} List<OpenstreetmapPoint> points = plugin.getDBPOI().getOpenstreetmapPoints();
if (isLocalEdit) { if (activity instanceof MapActivity && points.size() > 0) {
Toast.makeText(activity, R.string.osm_changes_added_to_local_edits, OsmPoint point = points.get(points.size() - 1);
Toast.LENGTH_LONG).show(); MapActivity mapActivity = (MapActivity) activity;
mapActivity.getContextMenu().showOrUpdate(
new LatLon(point.getLatitude(), point.getLongitude()),
plugin.getOsmEditsLayer(mapActivity).getObjectName(point), point);
}
} else { } else {
Toast.makeText(activity, R.string.poi_remove_success, Toast.LENGTH_LONG) Toast.makeText(activity, R.string.poi_remove_success, Toast.LENGTH_LONG)
.show(); .show();
@ -865,6 +872,9 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
if (activity instanceof MapActivity) { if (activity instanceof MapActivity) {
((MapActivity) activity).getMapView().refreshMap(true); ((MapActivity) activity).getMapView().refreshMap(true);
} }
if (callback != null) {
callback.poiDeleted();
}
} }
return false; return false;
} }
@ -880,7 +890,12 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); Context themedContext = getActivity();
if (getParentFragment() instanceof EditPoiDialogFragment) {
themedContext = UiUtilities.getThemedContext(getActivity(),
((EditPoiDialogFragment) getParentFragment()).isNightMode(true));
}
AlertDialog.Builder builder = new AlertDialog.Builder(themedContext);
String msg = getString(R.string.save_poi_without_poi_type_message); String msg = getString(R.string.save_poi_without_poi_type_message);
int i = getArguments().getInt("message", 0); int i = getArguments().getInt("message", 0);
if(i != 0) { if(i != 0) {
@ -903,7 +918,12 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); Context themedContext = getActivity();
if (getParentFragment() instanceof EditPoiDialogFragment) {
themedContext = UiUtilities.getThemedContext(getActivity(),
((EditPoiDialogFragment) getParentFragment()).isNightMode(true));
}
AlertDialog.Builder builder = new AlertDialog.Builder(themedContext);
builder.setTitle(getResources().getString(R.string.are_you_sure)) builder.setTitle(getResources().getString(R.string.are_you_sure))
.setMessage(getString(R.string.unsaved_changes_will_be_lost)) .setMessage(getString(R.string.unsaved_changes_will_be_lost))
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@ -921,7 +941,12 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); Context themedContext = getActivity();
if (getParentFragment() instanceof EditPoiDialogFragment) {
themedContext = UiUtilities.getThemedContext(getActivity(),
((EditPoiDialogFragment) getParentFragment()).isNightMode(true));
}
AlertDialog.Builder builder = new AlertDialog.Builder(themedContext);
String msg = getString(R.string.save_poi_value_exceed_length); String msg = getString(R.string.save_poi_value_exceed_length);
String fieldTag = getArguments().getString("tag", ""); String fieldTag = getArguments().getString("tag", "");
if(!Algorithms.isEmpty(fieldTag)) { if(!Algorithms.isEmpty(fieldTag)) {