pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Change bookmark set fix.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-03-27 00:40:04 +03:00 • committed by Alex Zolotarev
parent 9f39b6132f
commit baf9f75ffb
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -1296,7 +1296,10 @@ public class MWMActivity extends BaseMwmFragmentActivity
{
setVerticalToolbarVisible(false);
if (!isVisible)
{
Framework.deactivatePopup();
mPlacePage.setMapObject(null);
}
if (previewIntersectsBottomMenu())
mBottomToolbar.setVisibility(isVisible ? View.GONE : View.VISIBLE);
if (previewIntersectsZoomButtons())

9
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -281,15 +281,19 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
if (!hasMapObject(mo))
{
if (mMapObject instanceof Bookmark)
storeBookmarkDetails();
storeBookmarkDetails(mo);
mMapObject = mo;
refreshViews();
}
}
private void storeBookmarkDetails()
private void storeBookmarkDetails(MapObject newMapObject)
{
// no need to store current bookmark if the same is set
if (newMapObject instanceof Bookmark && LocationUtils.areLatLonEqual(newMapObject, mMapObject))
return;
final Bookmark bookmark = (Bookmark) mMapObject;
final String name = mEtBookmarkName.getText().toString();
final String oldName = bookmark.getName();
@ -652,6 +656,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
getContext().startActivity(intent);
break;
case R.id.tv__bookmark_group:
storeBookmarkDetails(null);
selectBookmarkSet();
break;
case R.id.av__direction: