From 0f7307aad6a728ff1a90383000abb2a083fed6a0 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, 10 Sep 2019 18:05:48 +0300
Subject: [PATCH] [android] Added UI for single guide/paid bookmark in pp

---
 .../layout/bookmark_subscription_fragment.xml |   2 +-
 .../res/layout/catalog_promo_container.xml    | 128 +++++++++++++++++-
 .../layout/catalog_promo_placeholder_card.xml |   2 +
 android/res/values/dimens.xml                 |   2 +
 android/res/values/font_sizes.xml             |   4 +-
 5 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/android/res/layout/bookmark_subscription_fragment.xml b/android/res/layout/bookmark_subscription_fragment.xml
index 7e7dac1b35..23fba02feb 100644
--- a/android/res/layout/bookmark_subscription_fragment.xml
+++ b/android/res/layout/bookmark_subscription_fragment.xml
@@ -45,7 +45,7 @@
         android:layout_marginLeft="@dimen/height_item_oneline"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:letterSpacing="-0.02"
-        android:lineSpacingExtra="@dimen/line_space_extra"
+        android:lineSpacingExtra="@dimen/line_spacing_extra_1"
         android:textStyle="bold"
         android:gravity="center"
         tools:text="Unlimited access to 5000+ guides!"
diff --git a/android/res/layout/catalog_promo_container.xml b/android/res/layout/catalog_promo_container.xml
index ad3a2f3801..7227ca7a3f 100644
--- a/android/res/layout/catalog_promo_container.xml
+++ b/android/res/layout/catalog_promo_container.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/catalog_promo_container"
   android:orientation="vertical"
   android:background="?attr/windowBackgroundForced"
@@ -25,10 +27,130 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/divider_height"
     layout="@layout/list_divider"/>
+  <LinearLayout
+    android:id="@+id/promo_place_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="?cardBackground"
+    android:padding="@dimen/margin_base">
+    <TextView
+      android:id="@+id/promo_place_name"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="@dimen/text_size_body_3"
+      android:fontFamily="@string/robotoRegular"
+      android:textStyle="bold"
+      android:textColor="?android:textColorPrimary"
+      android:lineSpacingExtra="@dimen/line_spacing_extra_2"
+      android:maxLines="2"
+      android:ellipsize="end"
+      tools:text="Государственный музей изобразительных искусств имени А.С. Пушкина это..."
+      tools:targetApi="jelly_bean" />
+    <TextView
+      android:id="@+id/promo_place_description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_half"
+      android:textSize="@dimen/text_size_body_3"
+      android:fontFamily="@string/robotoRegular"
+      android:textStyle="normal"
+      android:textColor="?android:textColorPrimary"
+      android:lineSpacingExtra="@dimen/line_spacing_extra_2"
+      android:maxLines="5"
+      android:ellipsize="end"
+      tools:text="музейный комплекс, обладающий одим из крупнейших в России художественных собраний
+      зарубежного искусства. хранящий артефакты, созданные мастерами разных эпох - от Древнего Египта
+      и античной Греции до;..."
+      tools:ignore="UnusedAttribute" />
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="@dimen/text_size_body_3"
+      android:fontFamily="@string/robotoRegular"
+      android:textStyle="normal"
+      android:textColor="?colorAccent"
+      android:lineSpacingExtra="@dimen/text_size_body_3"
+      android:text="@string/category_desc_more"
+      android:layout_marginTop="@dimen/margin_half"
+      tools:ignore="UnusedAttribute" />
+  </LinearLayout>
+  <include
+    android:id="@+id/promo_place_description_divider"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/divider_height"
+    layout="@layout/list_divider"/>
+  <android.support.v7.widget.CardView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/margin_half"
+    app:cardCornerRadius="@dimen/margin_eighth"
+    app:cardBackgroundColor="@null">
+    <LinearLayout
+      android:id="@+id/promo_single_bookmark_container"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/promo_single_place_container_height"
+      android:orientation="horizontal"
+      tools:ignore="UnusedAttribute">
+      <ImageView
+        android:id="@+id/promo_single_bookmark_image"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:scaleType="centerCrop"/>
+      <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?cardBackground"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/margin_half_plus"
+        android:paddingLeft="@dimen/margin_half_plus"
+        android:paddingTop="@dimen/margin_double_and_half"
+        android:paddingEnd="@dimen/margin_half_plus"
+        android:paddingRight="@dimen/margin_half_plus"
+        android:paddingBottom="@dimen/margin_base">
+        <TextView
+          android:id="@+id/place_single_bookmark_name"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:ellipsize="end"
+          android:fontFamily="@string/robotoRegular"
+          android:lineSpacingExtra="@dimen/line_spacing_extra_0"
+          android:maxLines="3"
+          android:textColor="?android:textColorPrimary"
+          android:textSize="@dimen/text_size_body_3"
+          android:textStyle="bold"
+          tools:text="From the Alexander Gardens to the City centre" />
+        <TextView
+          android:id="@+id/place_single_bookmark_author"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_half"
+          android:fontFamily="@string/robotoRegular"
+          android:lineSpacingExtra="@dimen/line_spacing_extra_1"
+          android:textColor="?android:textColorSecondary"
+          android:textSize="@dimen/text_size_body_4"
+          android:textStyle="normal"
+          tools:text="ArrivalGuides" />
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:gravity="bottom"
+          android:orientation="vertical">
+          <Button
+            style="@style/MwmWidget.Button.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/promo_single_place_button_height"
+            android:text="@string/pp_discovery_place_related_cta_button"/>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+  </android.support.v7.widget.CardView>
   <android.support.v7.widget.RecyclerView
     android:id="@+id/catalog_promo_recycler"
-    android:layout_marginBottom="@dimen/margin_quarter"
-    android:layout_marginTop="@dimen/margin_quarter"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_marginBottom="@dimen/margin_quarter" />
 </LinearLayout>
diff --git a/android/res/layout/catalog_promo_placeholder_card.xml b/android/res/layout/catalog_promo_placeholder_card.xml
index 42310659ce..d83debf197 100644
--- a/android/res/layout/catalog_promo_placeholder_card.xml
+++ b/android/res/layout/catalog_promo_placeholder_card.xml
@@ -1,6 +1,7 @@
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/catalog_promo_placeholder_card"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -9,6 +10,7 @@
   <android.support.v7.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground"
     android:minHeight="@dimen/discovery_expert_item_min_height">
     <LinearLayout
       android:orientation="vertical"
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 3ba550505c..4146542b17 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -276,4 +276,6 @@
   <dimen name="subs_card_min_height">226dp</dimen>
   <dimen name="subs_card_min_width">164dp</dimen>
   <dimen name="pro_label_margin">52dp</dimen>
+  <dimen name="promo_single_place_container_height">194dp</dimen>
+  <dimen name="promo_single_place_button_height">28dp</dimen>
 </resources>
diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 78824c982a..f00bad74ff 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -18,7 +18,9 @@
   <dimen name="text_size_icon_title">10sp</dimen>
   <dimen name="text_size_button">16sp</dimen>
   <dimen name="text_size_alert_dialog_title">20sp</dimen>
-  <dimen name="line_space_extra">4sp</dimen>
+  <dimen name="line_spacing_extra_0">2sp</dimen>
+  <dimen name="line_spacing_extra_1">4sp</dimen>
+  <dimen name="line_spacing_extra_2">6sp</dimen>
 
   <!-- BASE TEXT SIZES -->