From c6b28075e3820a8db1dff4071b0fa135912621f9 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Mon, 10 Aug 2020 13:35:48 +0300
Subject: [PATCH] [android] mastercard-sberbank ad. review fixes

---
 android/res/layout-land/onmap_downloader.xml           | 10 ++++------
 android/res/layout-land/onmap_downloader_banner.xml    |  6 ++----
 .../layout-land/onmap_downloader_banner_big_logo.xml   |  6 ++----
 android/res/layout/onmap_downloader.xml                | 10 ++++------
 android/res/layout/onmap_downloader_banner.xml         |  7 ++-----
 .../res/layout/onmap_downloader_banner_big_logo.xml    |  6 ++----
 6 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/android/res/layout-land/onmap_downloader.xml b/android/res/layout-land/onmap_downloader.xml
index 575a07510a..987f7603d7 100644
--- a/android/res/layout-land/onmap_downloader.xml
+++ b/android/res/layout-land/onmap_downloader.xml
@@ -98,19 +98,17 @@
       android:orientation="vertical"
       android:gravity="center">
       <include
+        layout="@layout/onmap_downloader_banner"
         android:layout_width="@dimen/square_block_size"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_half"
-        layout="@layout/onmap_downloader_banner"
-        android:visibility="gone">
-      </include>
+        android:visibility="gone" />
       <include
+        layout="@layout/onmap_downloader_banner_big_logo"
         android:layout_width="@dimen/square_block_size"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_quarter"
-        layout="@layout/onmap_downloader_banner_big_logo"
-        android:visibility="gone">
-      </include>
+        android:visibility="gone" />
       <LinearLayout
         android:id="@+id/catalog_call_to_action_container"
         android:orientation="vertical"
diff --git a/android/res/layout-land/onmap_downloader_banner.xml b/android/res/layout-land/onmap_downloader_banner.xml
index b6e73f2c19..6d6f97bbc9 100644
--- a/android/res/layout-land/onmap_downloader_banner.xml
+++ b/android/res/layout-land/onmap_downloader_banner.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/onmap_downloader_banner"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:gravity="center"
   android:orientation="vertical">
-
   <ImageView
     android:id="@+id/icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" />
-
   <TextView
     android:id="@id/text"
     android:layout_width="wrap_content"
@@ -19,7 +18,6 @@
     android:gravity="center"
     android:textAppearance="@style/MwmTextAppearance.Body4"
     android:textColor="?android:textColorPrimary" />
-
   <Button
     android:id="@+id/banner_button"
     style="?android:attr/borderlessButtonStyle"
diff --git a/android/res/layout-land/onmap_downloader_banner_big_logo.xml b/android/res/layout-land/onmap_downloader_banner_big_logo.xml
index 2025c5b58a..915d6bfca1 100644
--- a/android/res/layout-land/onmap_downloader_banner_big_logo.xml
+++ b/android/res/layout-land/onmap_downloader_banner_big_logo.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/onmap_downloader_banner_big_logo"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:gravity="center"
   android:orientation="vertical">
-
   <ImageView
     android:id="@+id/icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:src="@drawable/ic_logo_mastercard_sberbank" />
-
   <TextView
     android:id="@id/text"
     android:layout_width="wrap_content"
@@ -22,7 +21,6 @@
     android:textAppearance="@style/MwmTextAppearance.Body4"
     android:textColor="?android:textColorPrimary"
     tools:text="Some dummy text, Some dummy text" />
-
   <Button
     android:id="@+id/banner_button"
     style="?android:attr/borderlessButtonStyle"
diff --git a/android/res/layout/onmap_downloader.xml b/android/res/layout/onmap_downloader.xml
index 4b9d22b133..7542c4625d 100644
--- a/android/res/layout/onmap_downloader.xml
+++ b/android/res/layout/onmap_downloader.xml
@@ -73,19 +73,17 @@
       android:layout_height="@dimen/divider_height"
       android:background="?android:listDivider"/>
     <include
+      layout="@layout/onmap_downloader_banner"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      layout="@layout/onmap_downloader_banner"
-      android:visibility="gone">
-    </include>
+      android:visibility="gone" />
     <include
+      layout="@layout/onmap_downloader_banner_big_logo"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base"
-      layout="@layout/onmap_downloader_banner_big_logo"
-      android:visibility="gone">
-    </include>
+      android:visibility="gone" />
     <LinearLayout
       android:id="@+id/catalog_call_to_action_container"
       android:layout_marginTop="@dimen/margin_base_plus_quarter"
diff --git a/android/res/layout/onmap_downloader_banner.xml b/android/res/layout/onmap_downloader_banner.xml
index e1ef238258..7a3c0307bd 100644
--- a/android/res/layout/onmap_downloader_banner.xml
+++ b/android/res/layout/onmap_downloader_banner.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/onmap_downloader_banner"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
-
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_half"
     android:gravity="center_vertical">
-
     <ImageView
       android:id="@+id/icon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="@dimen/margin_half" />
-
     <TextView
       android:id="@id/text"
       android:layout_width="wrap_content"
@@ -24,7 +22,6 @@
       android:textAppearance="@style/MwmTextAppearance.Body4"
       android:textColor="?android:textColorPrimary" />
   </LinearLayout>
-
   <Button
     android:id="@+id/banner_button"
     style="?android:attr/borderlessButtonStyle"
diff --git a/android/res/layout/onmap_downloader_banner_big_logo.xml b/android/res/layout/onmap_downloader_banner_big_logo.xml
index 4ec54b9258..1b252125d7 100644
--- a/android/res/layout/onmap_downloader_banner_big_logo.xml
+++ b/android/res/layout/onmap_downloader_banner_big_logo.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/onmap_downloader_banner_big_logo"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:gravity="center"
   android:orientation="vertical">
-
   <ImageView
     android:id="@+id/icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:src="@drawable/ic_logo_mastercard_sberbank" />
-
   <TextView
     android:id="@id/text"
     android:layout_width="wrap_content"
@@ -22,7 +21,6 @@
     android:textAppearance="@style/MwmTextAppearance.Body4"
     android:textColor="?android:textColorPrimary"
     tools:text="Some dummy text, Some dummy text" />
-
   <Button
     android:id="@+id/banner_button"
     style="?android:attr/borderlessButtonStyle"