From afef35a9124d3e1bcb1e85c1560fdda40c04f17b 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: Tue, 12 Nov 2019 17:51:41 +0300
Subject: [PATCH] [android] Fixed progress color and text color on pay buttons
 on all pass subscription fragment

---
 .../fragment_sightseeing_subscription.xml     |   2 -
 .../pager_fragment_all_pass_subscription.xml  | 101 +++++++++---------
 android/res/layout/subscription_button.xml    |   6 +-
 3 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/android/res/layout/fragment_sightseeing_subscription.xml b/android/res/layout/fragment_sightseeing_subscription.xml
index 5d784598b7..6f5cf1e4f9 100644
--- a/android/res/layout/fragment_sightseeing_subscription.xml
+++ b/android/res/layout/fragment_sightseeing_subscription.xml
@@ -124,7 +124,6 @@
         android:layout_marginTop="@dimen/margin_double_and_half"
         android:layout_marginStart="@dimen/margin_base"
         android:layout_marginEnd="@dimen/margin_base"
-        android:minHeight="@dimen/height_block_base"
         app:buttonBackground="?primaryButtonBackground"
         app:saleBackground="@drawable/sightseeing_subs_sale_bg"
         app:progressColor="@color/white_primary"
@@ -139,7 +138,6 @@
         android:layout_marginTop="@dimen/margin_base"
         android:layout_marginStart="@dimen/margin_base"
         android:layout_marginEnd="@dimen/margin_base"
-        android:minHeight="@dimen/height_block_base"
         app:buttonBackground="?ghostButtonBackground"
         app:progressColor="@color/base_accent"
         app:showSale="false"
diff --git a/android/res/layout/pager_fragment_all_pass_subscription.xml b/android/res/layout/pager_fragment_all_pass_subscription.xml
index b5206de15f..276b7b8db6 100644
--- a/android/res/layout/pager_fragment_all_pass_subscription.xml
+++ b/android/res/layout/pager_fragment_all_pass_subscription.xml
@@ -2,10 +2,9 @@
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  xmlns:tools="http://schemas.android.com/tools">
-
+  android:layout_height="match_parent">
   <ImageView
     android:id="@+id/img1"
     android:layout_width="match_parent"
@@ -88,111 +87,111 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_base_plus"
-          android:layout_marginEnd="@dimen/margin_base_plus"
           android:layout_marginTop="@dimen/nav_street_height"
+          android:layout_marginEnd="@dimen/margin_base_plus"
           app:buttonBackground="@drawable/button_accent"
+          app:buttonTextColor="@color/white_primary"
           app:saleBackground="@drawable/all_pass_sale_bg"
           app:saleTextColor="@color/tips_and_triks_primary_text_night"
+          app:progressColor="@color/white_primary"
           app:showSale="true" />
         <com.mapswithme.maps.widget.SubscriptionButton
           android:id="@+id/month_sub_btn"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_base_plus"
-          android:layout_marginEnd="@dimen/margin_base_plus"
           android:layout_marginTop="@dimen/margin_base"
+          android:layout_marginEnd="@dimen/margin_base_plus"
           app:buttonBackground="@drawable/button_secondary_transparent"
-          app:buttonTextColor="@color/black_primary" />
-
+          app:buttonTextColor="@color/black_primary"
+          app:progressColor="@color/base_accent" />
         <TextView
           android:id="@+id/restore_purchase_btn"
-          android:background="?attr/selectableItemBackground"
-          android:layout_gravity="center"
-          android:layout_marginTop="@dimen/downloader_status_size"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:textAllCaps="true"
-          android:textColor="@color/white_primary"
+          android:layout_gravity="center"
           android:layout_marginStart="@dimen/margin_base_plus"
+          android:layout_marginTop="@dimen/downloader_status_size"
           android:layout_marginEnd="@dimen/margin_base_plus"
-          android:gravity="center"
+          android:background="?attr/selectableItemBackground"
           android:fontFamily="@string/robotoMedium"
-          android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
+          android:gravity="center"
           android:text="@string/restore"
-          tools:text="Restore purchases"
-          tools:ignore="UnusedAttribute"/>
-
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
+          android:textColor="@color/white_primary"
+          tools:ignore="UnusedAttribute"
+          tools:text="Restore purchases" />
         <LinearLayout
-          android:layout_marginTop="@dimen/margin_double_and_half"
-          android:layout_marginBottom="@dimen/bookmarks_subs_margin_top"
-          android:layout_marginStart="@dimen/margin_base_plus"
-          android:layout_marginEnd="@dimen/margin_base_plus"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_base_plus"
+          android:layout_marginTop="@dimen/margin_double_and_half"
+          android:layout_marginEnd="@dimen/margin_base_plus"
+          android:layout_marginBottom="@dimen/bookmarks_subs_margin_top"
           android:orientation="vertical">
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:textAppearance"
-            android:textSize="@dimen/text_size_icon_title"
             android:fontFamily="@string/robotoRegular"
-            android:textStyle="normal"
             android:justificationMode="inter_word"
-            android:text="@string/subscription_terms_android"
-            android:textColor="@color/white_lightest"
             android:letterSpacing="-0.01"
             android:lineSpacingExtra="@dimen/terms_of_use_line_spacing"
+            android:text="@string/subscription_terms_android"
+            android:textAppearance="?android:textAppearance"
+            android:textColor="@color/white_lightest"
+            android:textSize="@dimen/text_size_icon_title"
+            android:textStyle="normal"
             tools:targetApi="o" />
           <LinearLayout
-            android:layout_marginTop="@dimen/margin_base"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_base">
             <LinearLayout
-              android:layout_weight="1"
               android:layout_width="0dp"
-              android:layout_height="wrap_content">
+              android:layout_height="wrap_content"
+              android:layout_weight="1">
               <TextView
                 android:id="@+id/term_of_use_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_body_5"
-                android:fontFamily="@string/robotoMedium"
-                android:singleLine="true"
+                android:background="?selectableItemBackground"
                 android:ellipsize="end"
-                android:textStyle="normal"
-                android:textColor="@color/white_lightest"
+                android:fontFamily="@string/robotoMedium"
                 android:letterSpacing="-0.01"
-                tools:targetApi="lollipop"
-                tools:text="Terms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of Use"
+                android:singleLine="true"
                 android:text="@string/terms_of_use"
-                android:background="?selectableItemBackground" />
+                android:textColor="@color/white_lightest"
+                android:textSize="@dimen/text_size_body_5"
+                android:textStyle="normal"
+                tools:targetApi="lollipop"
+                tools:text="Terms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of Use" />
             </LinearLayout>
             <LinearLayout
-              android:layout_weight="1"
-              android:gravity="end"
               android:layout_width="0dp"
-              android:layout_height="wrap_content">
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:gravity="end">
               <TextView
                 android:id="@+id/privacy_policy_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_body_5"
-                android:fontFamily="@string/robotoMedium"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:textStyle="normal"
-                android:textColor="@color/white_lightest"
                 android:layout_gravity="end"
+                android:background="?selectableItemBackground"
+                android:ellipsize="end"
+                android:fontFamily="@string/robotoMedium"
                 android:gravity="end"
                 android:letterSpacing="-0.01"
-                tools:targetApi="lollipop"
-                tools:text="lollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipop"
+                android:singleLine="true"
                 android:text="@string/privacy_policy"
-                android:background="?selectableItemBackground" />
+                android:textColor="@color/white_lightest"
+                android:textSize="@dimen/text_size_body_5"
+                android:textStyle="normal"
+                tools:targetApi="lollipop"
+                tools:text="lollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipop" />
             </LinearLayout>
           </LinearLayout>
         </LinearLayout>
-
       </LinearLayout>
     </LinearLayout>
   </androidx.core.widget.NestedScrollView>
diff --git a/android/res/layout/subscription_button.xml b/android/res/layout/subscription_button.xml
index 1f0d9c4011..32df9afcca 100644
--- a/android/res/layout/subscription_button.xml
+++ b/android/res/layout/subscription_button.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="@dimen/margin_base"
+    android:padding="@dimen/margin_half_plus"
     android:minHeight="@dimen/height_block_base"
     android:layout_marginTop="@dimen/margin_base_plus_quarter"
     tools:background="?primaryButtonBackground">
@@ -19,6 +19,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
       android:textColor="@color/white_primary"
       android:fontFamily="@string/robotoMedium"
       android:textSize="@dimen/text_size_body_3"
@@ -31,6 +32,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
       android:textColor="@color/white_primary"
       android:fontFamily="@string/robotoMedium"
       android:textSize="@dimen/text_size_body_3"
@@ -62,7 +64,7 @@
     android:textSize="@dimen/text_size_toolbar"
     android:textColor="@color/white_primary"
     android:fontFamily="@string/robotoMedium"
-    android:letterSpacing="0.15"
+    android:letterSpacing="0.01"
     android:elevation="@dimen/margin_eighth"
     tools:text="-30%"
     tools:background="@color/sale_view_bg"