From 780c8110d6ef350a8c656744ad892530a15050ad 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: Wed, 27 May 2020 20:03:41 +0300
Subject: [PATCH] [android] Fix for new banner colors

---
 android/res/layout/place_page_banner_content.xml          | 2 --
 .../maps/widget/placepage/BannerController.java           | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/android/res/layout/place_page_banner_content.xml b/android/res/layout/place_page_banner_content.xml
index aa102961b3..5e1393bf78 100644
--- a/android/res/layout/place_page_banner_content.xml
+++ b/android/res/layout/place_page_banner_content.xml
@@ -120,7 +120,6 @@
       android:singleLine="true"
       tools:visibility="visible"
       android:fontFamily="@string/robotoMedium"
-      tools:targetApi="jelly_bean"
       tools:ignore="SpUsage"/>
     <TextView
       android:id="@+id/tv__action_large"
@@ -144,7 +143,6 @@
       tools:text="Заказать"
       tools:visibility="visible"
       android:fontFamily="@string/robotoMedium"
-      tools:targetApi="jelly_bean"
       tools:ignore="SpUsage"/>
   </LinearLayout>
   <ImageButton
diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
index fbc02db41e..2898c33526 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java
@@ -392,10 +392,10 @@ final class BannerController implements PlacePageStateObserver
     {
       Context context = mBannerView.getContext();
       Resources res = context.getResources();
-      int colorFrom = ThemeUtils.isNightTheme() ? res.getColor(R.color.white_12)
-                                                : res.getColor(R.color.black_12);
-      int colorTo = ThemeUtils.isNightTheme() ? res.getColor(R.color.white_24)
-                                              : res.getColor(R.color.black_24);
+      int colorFrom = ThemeUtils.isNightTheme() ? res.getColor(R.color.bg_banner_action_button_night)
+                                                : res.getColor(R.color.bg_banner_action_button);
+      int colorTo = ThemeUtils.isNightTheme() ? res.getColor(R.color.bg_banner_action_button_pressed_night)
+                                              : res.getColor(R.color.bg_banner_action_button_pressed);
       animator = ObjectAnimator.ofObject(mActionLarge, "backgroundColor", new ArgbEvaluator(),
                                          colorFrom, colorTo, colorFrom);
     }