From 69c096b0664f57d45b265badf93a8a4c9690c374 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?= Date: Fri, 29 Nov 2019 16:04:15 +0300 Subject: [PATCH] [android] Changed sale text look on subscription screens --- android/res/layout/subscription_button.xml | 11 ++++------- .../TwoButtonsSubscriptionFragmentDelegate.java | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/android/res/layout/subscription_button.xml b/android/res/layout/subscription_button.xml index 32df9afcca..d7abfb3917 100644 --- a/android/res/layout/subscription_button.xml +++ b/android/res/layout/subscription_button.xml @@ -53,20 +53,17 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_quarter" - android:paddingLeft="@dimen/margin_half_plus" - android:paddingStart="@dimen/margin_half_plus" - android:paddingRight="@dimen/margin_half_plus" - android:paddingEnd="@dimen/margin_half_plus" + android:paddingStart="@dimen/margin_half" + android:paddingEnd="@dimen/margin_half" android:paddingTop="@dimen/margin_quarter" android:paddingBottom="@dimen/margin_quarter" android:layout_gravity="top|start" android:gravity="center_horizontal|top" - android:textSize="@dimen/text_size_toolbar" + android:textSize="@dimen/text_size_body_3" android:textColor="@color/white_primary" android:fontFamily="@string/robotoMedium" - android:letterSpacing="0.01" android:elevation="@dimen/margin_eighth" - tools:text="-30%" + tools:text="@string/all_pass_screen_best_value" tools:background="@color/sale_view_bg" tools:targetApi="lollipop" /> diff --git a/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java b/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java index 0f91322683..3f115331be 100644 --- a/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java @@ -75,8 +75,7 @@ class TwoButtonsSubscriptionFragmentDelegate extends SubscriptionFragmentDelegat String price = Utils.formatCurrencyString(details.getPrice(), details.getCurrencyCode()); mAnnualButton.setPrice(price); mAnnualButton.setName(getFragment().getString(R.string.annual_subscription_title)); - String sale = getFragment().getString(R.string.annual_save_component, getFragment().calculateYearlySaving()); - mAnnualButton.setSale(sale); + mAnnualButton.setSale(getFragment().getString(R.string.all_pass_screen_best_value)); } private void updateYearlyButton()