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

[android] Fixed pp views when map object data is changed for some reasons (editor, ugc, settings, etc.)

Browse source
This commit is contained in:
Александр Зацепин 2019-02-12 15:58:42 +03:00 • committed by yoksnod
parent 7369792c34
commit 90847fec0e
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
View file

@ -218,16 +218,20 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
@Override
public void openFor(@NonNull MapObject object)
{
mPlacePage.setMapObject(object, false, (policy, isSameObject) -> {
mPlacePage.setMapObject(object, (policy, isSameObject) -> {
@AnchorBottomSheetBehavior.State
int state = mPlacePageBehavior.getState();
// The method openFor could be invoked many times, e.g. when we leave the map and come back
// on it. So, we should do nothing if the map object is not changed or place page is already
// opened. Otherwise, the place page discards its current state to collapsed state
// and it's wrong. This behavior possibly will be refactored, so that the framework doesn't call
// 'ActivateMapSelection' method from 'UpdatePlacePageInfoForCurrentSelection'.
// opened, but we have to refresh place page views, since the map object data could be changed
// while we were on the another screen (e.g. editor, ugc, settings, etc.). This behavior is
// produced by the framework 'UpdatePlacePageInfoForCurrentSelection' method that in turn calls
// method 'ActivateMapSelection'.
if (isSameObject && !isHiddenState(state))
{
mPlacePage.refreshViews(policy);
return;
}
if (object.isExtendedView())
{
@ -456,7 +460,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
if (object == null)
return;
mPlacePage.setMapObject(object, true, (policy, isSameObject) -> {
mPlacePage.setMapObject(object, (policy, isSameObject) -> {
restorePlacePage(object, policy);
});
mToolbar.setTitle(object.getTitle());

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

@ -988,14 +988,13 @@ public class PlacePageView extends NestedScrollView
/**
* @param mapObject new MapObject
* @param force if true, new object'll be set without comparison with the old one
* @param listener listener
*/
public void setMapObject(@Nullable MapObject mapObject, boolean force,
@Nullable final SetMapObjectListener listener)
public void setMapObject(@Nullable MapObject mapObject, @Nullable final SetMapObjectListener listener)
{
if (!force && MapObject.same(mMapObject, mapObject))
if (MapObject.same(mMapObject, mapObject))
{
mMapObject = mapObject;
if (listener != null)
{
NetworkPolicy policy = NetworkPolicy.newInstance(NetworkPolicy.getCurrentNetworkUsageStatus());
@ -1074,7 +1073,7 @@ public class PlacePageView extends NestedScrollView
return mMapObject != null && (isSponsored() || mMapObject.getBanners() != null);
}
private void refreshViews(@NonNull NetworkPolicy policy)
void refreshViews(@NonNull NetworkPolicy policy)
{
if (mMapObject == null)
{
@ -1723,9 +1722,9 @@ public class PlacePageView extends NestedScrollView
private void toggleIsBookmark(@NonNull MapObject mapObject)
{
if (MapObject.isOfType(MapObject.BOOKMARK, mapObject))
setMapObject(Framework.nativeDeleteBookmarkFromMapObject(), true, null);
setMapObject(Framework.nativeDeleteBookmarkFromMapObject(), null);
else
setMapObject(BookmarkManager.INSTANCE.addNewBookmark(mapObject.getLat(), mapObject.getLon()), true, null);
setMapObject(BookmarkManager.INSTANCE.addNewBookmark(mapObject.getLat(), mapObject.getLon()), null);
}
private void showBigDirection()
@ -1889,7 +1888,7 @@ public class PlacePageView extends NestedScrollView
@Override
public void onBookmarkSaved(long bookmarkId)
{
setMapObject(BookmarkManager.INSTANCE.getBookmark(bookmarkId), true, null);
setMapObject(BookmarkManager.INSTANCE.getBookmark(bookmarkId), null);
}
int getPreviewHeight()