pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added UI for single guide/paid bookmark in pp

Browse source
This commit is contained in:
Александр Зацепин 2019-09-10 18:05:48 +03:00 • committed by yoksnod
parent e37d8ba4aa
commit 0f7307aad6
5 changed files with 133 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/bookmark_subscription_fragment.xml
View file

@ -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!"

128
android/res/layout/catalog_promo_container.xml
View file

@ -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>

2
android/res/layout/catalog_promo_placeholder_card.xml
View file

@ -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"

2
android/res/values/dimens.xml
View file

@ -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>

4
android/res/values/font_sizes.xml
View file

@ -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 -->