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

[android] Made more accurate map object comparing

Browse source 
[android] Added resetting pp scroll and webview for case when new pp opened once after the previos was scrolled or web loaded, i.e. without hidding of previos
This commit is contained in:
Александр Зацепин 2019-02-14 15:29:28 +03:00 • committed by yoksnod
parent 8fd5aba565
commit fae27e918b
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -213,7 +213,7 @@ public class MapObject implements Parcelable, PopularityProvider
* MapObject does not participate in any sets or other collections that need {@code hashCode()}.
* So {@code sameAs()} serves as {@code equals()} but does not break the equals+hashCode contract.
*/
public boolean sameAs(MapObject other)
public boolean sameAs(@Nullable MapObject other)
{
if (other == null)
return false;
@ -225,13 +225,14 @@ public class MapObject implements Parcelable, PopularityProvider
if (getClass() != other.getClass())
return false;
if (mFeatureId != FeatureId.EMPTY && other.getFeatureId() != FeatureId.EMPTY)
return mFeatureId.equals(other.getFeatureId());
return Double.doubleToLongBits(mLon) == Double.doubleToLongBits(other.mLon) &&
Double.doubleToLongBits(mLat) == Double.doubleToLongBits(other.mLat) &&
TextUtils.equals(mTitle, other.mTitle) &&
TextUtils.equals(mSubtitle, other.mSubtitle);
Double.doubleToLongBits(mLat) == Double.doubleToLongBits(other.mLat);
}
public static boolean same(MapObject one, MapObject another)
public static boolean same(@Nullable MapObject one, @Nullable MapObject another)
{
//noinspection SimplifiableIfStatement
if (one == null && another == null)

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

@ -235,9 +235,12 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
return;
}
mPlacePage.resetScroll();
mPlacePage.resetWebView();
if (object.isExtendedView())
{
mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_EXPANDED);
mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_ANCHORED);
return;
}

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

@ -982,11 +982,6 @@ public class PlacePageView extends NestedScrollView
return mIsFloating;
}
private void clearBookmarkWebView()
{
mWvBookmarkNote.loadUrl("about:blank");
}
@Nullable
public MapObject getMapObject()
{
@ -1821,11 +1816,21 @@ public class PlacePageView extends NestedScrollView
void reset()
{
scrollTo(0, 0);
clearBookmarkWebView();
resetScroll();
resetWebView();
detachCountry();
}
void resetScroll()
{
scrollTo(0, 0);
}
void resetWebView()
{
mWvBookmarkNote.loadUrl("about:blank");
}
private static boolean isInvalidDownloaderStatus(int status)
{
return (status != CountryItem.STATUS_DOWNLOADABLE &&