From 335ec3d50e8449dcf1c529fcf45f520a1da823d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Tue, 19 Feb 2019 14:55:02 +0300
Subject: [PATCH] [android] Added banner size measurement to make it possible
 used with wrap_content and big fonts

---
 .../res/layout/place_page_banner_content.xml  |  8 +--
 .../widget/placepage/BannerController.java    | 61 ++++++++++++++-----
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/android/res/layout/place_page_banner_content.xml b/android/res/layout/place_page_banner_content.xml
index 35a8f94296..bc639f4b88 100644
--- a/android/res/layout/place_page_banner_content.xml
+++ b/android/res/layout/place_page_banner_content.xml
@@ -76,21 +76,18 @@
         android:maxLines="1"
         android:minLines="1"
         android:textAppearance="@style/MwmTextAppearance.Body4"
-        android:textSize="12dp"
         android:textColor="?textBannerTitle"
         android:fontFamily="@string/robotoMedium"
         android:textStyle="bold"
         android:ellipsize="end"
         tools:text="Закажи одежду в интернет-магазине Wildberries."
-        tools:targetApi="jelly_bean"
-        tools:ignore="SpUsage"/>
+        tools:targetApi="jelly_bean"/>
     </LinearLayout>
     <TextView
       android:id="@+id/tv__banner_message"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textAppearance="@style/MwmTextAppearance.Body4"
-      android:textSize="12dp"
       android:maxLines="3"
       android:ellipsize="end"
       tools:text="Бесплатная курьерская доставка по России!\n\nКоллекции женской, мужской и детской одежды, обуви,
@@ -98,8 +95,7 @@
       tools:maxLines="5"
       android:layout_below="@+id/banner_title"
       android:layout_toRightOf="@+id/iv__banner_icon"
-      android:layout_toEndOf="@+id/iv__banner_icon"
-      tools:ignore="SpUsage"/>
+      android:layout_toEndOf="@+id/iv__banner_icon"/>
   </RelativeLayout>
   <LinearLayout
     android:id="@+id/action_container"
diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
index aca9b70f89..eb78f88fa6 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
@@ -8,6 +8,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -131,9 +132,6 @@ final class BannerController
     mBannerView = inflateBannerLayout(NativeAdWrapper.UiType.DEFAULT, mContainerView);
     mAdsLoader = loader;
     mAdTracker = tracker;
-    Resources resources = mBannerView.getResources();
-    mClosedHeight = resources.getDimensionPixelSize(R.dimen.placepage_banner_small_height);
-    mOpenedHeight = resources.getDimensionPixelSize(R.dimen.placepage_banner_large_height);
     mAdsRemovalProvider = adsRemovalProvider;
     mBannerDetailsRequester = bannerDetailsRequester;
     mBannerStateListener = bannerStateListener;
@@ -263,10 +261,8 @@ final class BannerController
     if (!isBannerContainerVisible() || mBanners == null || mOpened)
       return;
 
-    mOpened = true;
-    mMessage.setMaxLines(MAX_MESSAGE_LINES);
-    mTitle.setMaxLines(MAX_TITLE_LINES);
-    updateVisibility();
+    setOpenedStateInternal();
+
     if (mCurrentAd != null)
     {
       loadIcon(mCurrentAd);
@@ -293,14 +289,11 @@ final class BannerController
 
   void close()
   {
-    if (!isBannerContainerVisible() || mBanners == null || !mOpened)
+    if (!isBannerContainerVisible() || mBanners == null)
       return;
 
-    mOpened = false;
-    UiUtils.hide(mIcon);
-    mMessage.setMaxLines(MIN_MESSAGE_LINES);
-    mTitle.setMaxLines(MIN_TITLE_LINES);
-    updateVisibility();
+    setClosedStateInternal();
+
     if (mCurrentAd != null)
     {
       mCurrentAd.registerView(mBannerView);
@@ -308,6 +301,46 @@ final class BannerController
     }
   }
 
+  private void measureBannerSizes()
+  {
+    boolean currentState = mOpened;
+
+    DisplayMetrics dm = mContainerView.getResources().getDisplayMetrics();
+    final float screenWidth = dm.widthPixels;
+
+    int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+    int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec((int) screenWidth, View.MeasureSpec.AT_MOST);
+
+    setClosedStateInternal();
+    mBannerView.measure(widthMeasureSpec, heightMeasureSpec);
+    mClosedHeight = mBannerView.getMeasuredHeight();
+    LOGGER.d(TAG, "Banner close height = " + mClosedHeight);
+
+    setOpenedStateInternal();
+    mBannerView.measure(widthMeasureSpec, heightMeasureSpec);
+    mOpenedHeight = mBannerView.getMeasuredHeight();
+    LOGGER.d(TAG, "Banner open height = " + mOpenedHeight);
+
+    mOpened = currentState;
+  }
+
+  private void setOpenedStateInternal()
+  {
+    mOpened = true;
+    mMessage.setMaxLines(MAX_MESSAGE_LINES);
+    mTitle.setMaxLines(MAX_TITLE_LINES);
+    updateVisibility();
+  }
+
+  private void setClosedStateInternal()
+  {
+    mOpened = false;
+    UiUtils.hide(mIcon);
+    mMessage.setMaxLines(MIN_MESSAGE_LINES);
+    mTitle.setMaxLines(MIN_TITLE_LINES);
+    updateVisibility();
+  }
+
   private void loadIcon(@NonNull MwmNativeAd ad)
   {
     UiUtils.show(mIcon);
@@ -419,8 +452,8 @@ final class BannerController
       mLastAdType = mCurrentAd.getType();
 
       fillViews(ad);
+      measureBannerSizes();
       setBannerState();
-      updateVisibility();
       ad.registerView(mBannerView);
 
       if (mAdTracker != null)