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

[android] Added landscape/tablet layout for all pass screen

Browse source
This commit is contained in:
Dmitry Donskoy 2019-11-28 15:14:59 +03:00 • committed by Arsentiy Milchakov
parent f551d40140
commit ec120ab1f6
5 changed files with 225 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/res/drawable/bookmarks_all_subs_central_content_bg.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/black_primary"/>
<corners android:radius="@dimen/routing_selector_wheel_size"/>
</shape>

203
android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml Normal file
View file

@ -0,0 +1,203 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<ImageView
android:id="@+id/img1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/img_bonfire" />
<ImageView
android:id="@+id/img2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/img_camping" />
<ImageView
android:id="@+id/img3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/img_winter" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/status_bar_placeholder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@android:color/transparent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bookmarks_all_subs_central_content_bg"
android:maxWidth="@dimen/bookmark_all_subscription_content_width"
android:orientation="vertical"
android:paddingStart="@dimen/dialog_min_height"
android:paddingTop="@dimen/height_block_base"
android:paddingEnd="@dimen/dialog_min_height"
android:paddingBottom="@dimen/primary_button_min_width">
<TextView
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoMedium"
android:gravity="center"
android:text="@string/all_pass_subscription_header"
android:textAllCaps="true"
android:textColor="@color/white_lightest"
android:textSize="@dimen/text_size_body_4" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half"
android:layout_marginBottom="@dimen/auth_dialog_padding_top"
android:fontFamily="@font/fredoka_one"
android:gravity="center"
android:text="@string/all_pass_subscription_subheader"
android:textColor="@color/all_pass_subtitle"
android:textSize="@dimen/text_size_title" />
<com.mapswithme.maps.widget.ParallaxBackgroundViewPager
android:id="@+id/pager"
android:layout_width="@dimen/bookmark_all_subscription_content_width"
android:layout_height="@dimen/subscription_view_pager_height"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000" />
<LinearLayout
android:id="@+id/bottom_container"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:gravity="center_horizontal"
android:minWidth="@dimen/subs_btn_min_width"
android:orientation="vertical">
<LinearLayout
android:id="@+id/indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:orientation="horizontal" />
<com.mapswithme.maps.widget.SubscriptionButton
android:id="@+id/annual_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/nav_street_height"
app:buttonBackground="@drawable/button_accent"
app:buttonTextColor="@color/white_primary"
app:progressColor="@color/white_primary"
app:saleBackground="@drawable/bookmarks_all_sale_bg"
app:saleTextColor="@color/tips_and_triks_primary_text_night"
app:showSale="true" />
<com.mapswithme.maps.widget.SubscriptionButton
android:id="@+id/monthly_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
app:buttonBackground="@drawable/button_secondary_transparent"
app:buttonTextColor="@color/black_primary"
app:progressColor="@color/base_accent" />
<TextView
android:id="@+id/restore_purchase_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:background="?attr/selectableItemBackground"
android:fontFamily="@string/robotoMedium"
android:gravity="center"
android:text="@string/restore"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
android:textColor="@color/white_primary"
tools:ignore="UnusedAttribute"
tools:text="Restore purchases" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
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:fontFamily="@string/robotoRegular"
android:justificationMode="inter_word"
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_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base">
<LinearLayout
android:layout_width="0dp"
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:background="?selectableItemBackground"
android:ellipsize="end"
android:fontFamily="@string/robotoMedium"
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/terms_of_use"
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_width="0dp"
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:layout_gravity="end"
android:background="?selectableItemBackground"
android:ellipsize="end"
android:fontFamily="@string/robotoMedium"
android:gravity="end"
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/privacy_policy"
android:textColor="@color/white_lightest"
android:textSize="@dimen/text_size_body_5"
android:textStyle="normal"
tools:targetApi="lollipop"
tools:text="lollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipop" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>

25
android/res/layout/fragment_bookmarks_all_subscription.xml
View file

@ -10,30 +10,32 @@
xmlns:tools="http://schemas.android.com/tools"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:gravity="center"
android:gravity="center|top"
android:ellipsize="end"
android:maxLines="2"
android:fontFamily="@string/robotoMedium"
android:textSize="@dimen/text_size_display_0"
android:text="@{page.titleId}"
android:textColor="@color/white_primary"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:layout_marginRight="@dimen/margin_base_plus_quarter"
android:layout_marginLeft="@dimen/margin_base_plus_quarter"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginEnd="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginRight="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginLeft="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginStart="@dimen/bookmarks_all_subscription_pager_item_margin"
tools:ignore="UnusedAttribute"/>
<TextView
android:id="@+id/description"
android:layout_below="@id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:gravity="center|bottom"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:maxLines="2"
android:ellipsize="end"
@ -41,11 +43,10 @@
android:textColor="@color/white_primary"
android:textSize="@dimen/text_size_body_0"
android:text="@{page.descriptionId}"
android:layout_marginTop="@dimen/margin_half_plus"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:layout_marginRight="@dimen/margin_base_plus_quarter"
android:layout_marginLeft="@dimen/margin_base_plus_quarter"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginEnd="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginRight="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginLeft="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginStart="@dimen/bookmarks_all_subscription_pager_item_margin"
tools:ignore="UnusedAttribute"/>
</RelativeLayout>
</layout>

1
android/res/values-w600dp/dimens.xml
View file

@ -2,4 +2,5 @@
<resources>
<!-- Altitude chart -->
<dimen name="altitude_chart_image_width">600dp</dimen>
<dimen name="bookmarks_all_subscription_pager_item_margin">0dp</dimen>
</resources>

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

@ -283,4 +283,7 @@
<dimen name="zero">0dp</dimen>
<dimen name="all_pass_top_offset">62dp</dimen>
<dimen name="welcome_btn_min_width">148dp</dimen>
<dimen name="bookmark_all_subscription_content_width">336dp</dimen>
<dimen name="subs_btn_min_width">328dp</dimen>
<dimen name="bookmarks_all_subscription_pager_item_margin">@dimen/margin_base_plus_quarter</dimen>
</resources>