From 3f1df0d91985e4a210c16c00ac6e1dc143596c86 Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Mon, 19 Dec 2016 08:19:14 +0400 Subject: [PATCH] [android] Review fixes. --- .../maps/widget/placepage/BannerController.java | 9 +++++++-- .../mapswithme/maps/widget/placepage/PlacePageView.java | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index 483b6b2918..5f70a08e35 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -128,10 +128,10 @@ final class BannerController implements View.OnClickListener mFrame.setOnClickListener(this); } - int close() + boolean close() { if (!isShowing() || mBanner == null || !mIsOpened) - return 0; + return false; mIsOpened = false; setFrameHeight((int) mCloseFrameHeight); @@ -148,6 +148,11 @@ final class BannerController implements View.OnClickListener mTitle.setMaxLines(1); mFrame.setOnClickListener(null); + return true; + } + + int getLastBannerHeight() + { return mFrame.getHeight(); } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index ad24fc3644..c91d9fdc10 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -806,9 +806,14 @@ public class PlacePageView extends RelativeLayout if (mBannerController != null) { if ((state == State.HIDDEN || state == State.PREVIEW) && !UiUtils.isLandscape(getContext())) - heightCompensation = mBannerController.close(); + { + if (mBannerController.close()) + heightCompensation = mBannerController.getLastBannerHeight(); + } else + { mBannerController.open(); + } } if (mHeightCompensationView != null)