From 4777e420aa6a43a807a2cb0093e1a1fe40a2d6ed Mon Sep 17 00:00:00 2001
From: Alexander Zatsepin <az@mapswithme.com>
Date: Mon, 30 Jul 2018 14:31:06 +0300
Subject: [PATCH] [android] Replaced paddings with margins in banner layout to
 fit the close button

---
 android/res/layout/place_page_banner.xml        | 3 ---
 android/res/layout/place_page_banner_google.xml | 7 ++-----
 android/res/layout/place_page_banner_layout.xml | 7 +++++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/res/layout/place_page_banner.xml b/android/res/layout/place_page_banner.xml
index 47a31e30cf..817012c81f 100644
--- a/android/res/layout/place_page_banner.xml
+++ b/android/res/layout/place_page_banner.xml
@@ -5,9 +5,6 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/placepage_banner_height"
-  android:paddingLeft="@dimen/margin_half_plus"
-  android:paddingRight="@dimen/margin_half_plus"
-  android:paddingTop="@dimen/margin_half"
   android:background="?bannerBackground"
   android:clipToPadding="false"
   tools:layout_height="wrap_content">
diff --git a/android/res/layout/place_page_banner_google.xml b/android/res/layout/place_page_banner_google.xml
index 71e28544f7..b2eaa10a81 100644
--- a/android/res/layout/place_page_banner_google.xml
+++ b/android/res/layout/place_page_banner_google.xml
@@ -8,11 +8,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/placepage_banner_height"
-    android:paddingLeft="@dimen/margin_base"
-    android:paddingStart="@dimen/margin_base"
-    android:paddingRight="@dimen/margin_half_plus"
-    android:paddingEnd="@dimen/margin_half_plus"
-    android:paddingTop="@dimen/margin_half"
+    android:paddingLeft="@dimen/margin_quarter"
+    android:paddingStart="@dimen/margin_quarter"
     android:background="?bannerBackground"
     android:clipToPadding="false">
     <include layout="@layout/place_page_banner_layout"/>
diff --git a/android/res/layout/place_page_banner_layout.xml b/android/res/layout/place_page_banner_layout.xml
index 15e4bd74b0..9caaea57e1 100644
--- a/android/res/layout/place_page_banner_layout.xml
+++ b/android/res/layout/place_page_banner_layout.xml
@@ -13,6 +13,8 @@
     android:layout_alignParentEnd="true"
     android:layout_marginLeft="@dimen/margin_half"
     android:layout_marginStart="@dimen/margin_half"
+    android:layout_marginRight="@dimen/margin_half_plus"
+    android:layout_marginEnd="@dimen/margin_half_plus"
     android:textSize="@dimen/text_size_body_4"
     android:textColor="?android:textColorSecondary"
     android:textAllCaps="true"
@@ -29,6 +31,9 @@
     android:layout_height="wrap_content"
     android:layout_toLeftOf="@id/tv__action_small"
     android:layout_toStartOf="@id/tv__action_small"
+    android:layout_marginLeft="@dimen/margin_half_plus"
+    android:layout_marginRight="@dimen/margin_half_plus"
+    android:layout_marginTop="@dimen/margin_half"
     android:layout_marginBottom="@dimen/margin_half">
     <ImageView
       android:id="@+id/iv__banner_icon"
@@ -97,6 +102,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/placepage_banner_button_height"
+    android:layout_marginLeft="@dimen/margin_half_plus"
+    android:layout_marginRight="@dimen/margin_half_plus"
     android:layout_below="@id/data_frame"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:textAllCaps="true"