From e48ec1bb0a1a676c969ea2d8f9466ac02e304037 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Tue, 24 Mar 2020 14:44:11 +0300
Subject: [PATCH] [android] the form of partner`s button for download on map
 banner is fixed

---
 android/res/drawable-v21/button_megafon.xml               | 7 -------
 .../res/drawable-v21/ripple_mask_big_corner_radius.xml    | 7 -------
 android/res/drawable/button_megafon.xml                   | 5 -----
 android/res/drawable/button_megafon_internal.xml          | 7 -------
 android/res/drawable/button_megafon_normal.xml            | 6 ------
 android/res/drawable/button_megafon_pressed.xml           | 6 ------
 android/res/layout/onmap_downloader.xml                   | 4 +---
 android/res/values/dimens.xml                             | 4 ++--
 .../downloader/DownloaderBannerConfigStrategyPartner.java | 8 ++++++--
 9 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 android/res/drawable-v21/button_megafon.xml
 delete mode 100644 android/res/drawable-v21/ripple_mask_big_corner_radius.xml
 delete mode 100644 android/res/drawable/button_megafon.xml
 delete mode 100644 android/res/drawable/button_megafon_internal.xml
 delete mode 100644 android/res/drawable/button_megafon_normal.xml
 delete mode 100644 android/res/drawable/button_megafon_pressed.xml

diff --git a/android/res/drawable-v21/button_megafon.xml b/android/res/drawable-v21/button_megafon.xml
deleted file mode 100644
index 8207915539..0000000000
--- a/android/res/drawable-v21/button_megafon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="?attr/colorBtnHighlight">
-  <item android:id="@android:id/mask" android:drawable="@drawable/ripple_mask_big_corner_radius"/>
-  <item android:drawable="@drawable/button_megafon_internal"/>
-</ripple>
diff --git a/android/res/drawable-v21/ripple_mask_big_corner_radius.xml b/android/res/drawable-v21/ripple_mask_big_corner_radius.xml
deleted file mode 100644
index 7c2425becc..0000000000
--- a/android/res/drawable-v21/ripple_mask_big_corner_radius.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <solid android:color="@android:color/white"/>
-  <corners android:radius="@dimen/megafon_button_corner_radius"/>
-</shape>
diff --git a/android/res/drawable/button_megafon.xml b/android/res/drawable/button_megafon.xml
deleted file mode 100644
index 964ecc82de..0000000000
--- a/android/res/drawable/button_megafon.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_megafon_internal"/>
-</layer-list>
diff --git a/android/res/drawable/button_megafon_internal.xml b/android/res/drawable/button_megafon_internal.xml
deleted file mode 100644
index 7e995664bf..0000000000
--- a/android/res/drawable/button_megafon_internal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_megafon_pressed"
-        android:state_pressed="true"/>
-  <item android:drawable="@drawable/button_megafon_normal"/>
-</selector>
diff --git a/android/res/drawable/button_megafon_normal.xml b/android/res/drawable/button_megafon_normal.xml
deleted file mode 100644
index 0880ba5f99..0000000000
--- a/android/res/drawable/button_megafon_normal.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-  <solid android:color="@color/megafon_button"/>
-  <corners android:radius="@dimen/megafon_button_corner_radius"/>
-</shape>
diff --git a/android/res/drawable/button_megafon_pressed.xml b/android/res/drawable/button_megafon_pressed.xml
deleted file mode 100644
index e49fcfdc02..0000000000
--- a/android/res/drawable/button_megafon_pressed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-  <solid android:color="@color/megafon_button_pressed"/>
-  <corners android:radius="@dimen/megafon_button_corner_radius"/>
-</shape>
diff --git a/android/res/layout/onmap_downloader.xml b/android/res/layout/onmap_downloader.xml
index 37cd46a6db..0d793bcd71 100644
--- a/android/res/layout/onmap_downloader.xml
+++ b/android/res/layout/onmap_downloader.xml
@@ -88,7 +88,6 @@
           android:id="@+id/icon"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:src="@drawable/ic_brand_megafon_green"
           android:layout_marginRight="@dimen/margin_half"
           android:layout_marginEnd="@dimen/margin_half"/>
         <TextView
@@ -96,8 +95,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:textAppearance="@style/MwmTextAppearance.Body4"
-          android:textColor="?android:textColorPrimary"
-          android:text="@string/banner_megafon_banner_message"/>
+          android:textColor="?android:textColorPrimary"/>
       </LinearLayout>
       <Button
         android:id="@+id/banner_button"
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 6169c05637..e1cc9b2a8e 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -203,8 +203,8 @@
   <dimen name="placepage_banner_small_action_corner">20dp</dimen>
   <dimen name="placepage_banner_remove_button_size">14dp</dimen>
   <dimen name="placepage_banner_open_touch_slop">50dp</dimen>
-  <dimen name="megafon_button_min_height">28dp</dimen>
-  <dimen name="megafon_button_corner_radius">@dimen/megafon_button_min_height</dimen>
+  <dimen name="downloader_partner_button_min_height">28dp</dimen>
+  <dimen name="downloader_partner_button_corner_radius">@dimen/downloader_partner_button_min_height</dimen>
 
   <!-- Place page taxi-->
   <dimen name="placepage_taxi_button_min_width">96dp</dimen>
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
index 41a8c04616..afeb09bcc7 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
@@ -1,15 +1,16 @@
 package com.mapswithme.maps.downloader;
 
+import android.graphics.drawable.GradientDrawable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import com.mapswithme.maps.R;
 
 class DownloaderBannerConfigStrategyPartner implements DownloaderBannerConfigStrategy
 {
@@ -46,6 +47,9 @@ class DownloaderBannerConfigStrategyPartner implements DownloaderBannerConfigStr
     TextView button = parent.findViewById(buttonViewId);
     button.setText(mButtonText);
     button.setTextColor(button.getResources().getColor(mButtonTextColor));
-    button.setBackgroundColor(button.getResources().getColor(mButtonColor));
+    GradientDrawable background = new GradientDrawable();
+    background.setColor(button.getResources().getColor(mButtonColor));
+    background.setCornerRadius(R.dimen.downloader_partner_button_min_height);
+    button.setBackground(background);
   }
 }