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

[android] Changed subs screen design

Browse source
This commit is contained in:
Dmitry Donskoy 2020-03-16 10:27:47 +03:00 • committed by Aleksandr Zatsepin
parent 0716b54bd7
commit ba810fe736
12 changed files with 133 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-nodpi/img_bonfire.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 227 KiB

After

Width:  |  Height:  |  Size: 372 KiB

BIN
android/res/drawable-nodpi/img_camping.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 357 KiB

After

Width:  |  Height:  |  Size: 215 KiB

BIN
android/res/drawable-nodpi/img_winter.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 KiB

After

Width:  |  Height:  |  Size: 280 KiB

9
android/res/drawable/all_subs_header_bg.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:bottomRightRadius="8dp"
android:topRightRadius="8dp" />
<solid android:color="@color/white_60" />
</shape>

3
android/res/drawable/button_secondary_transparent_normal.xml
View file

@ -2,6 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white_secondary" />
<solid android:color="@android:color/transparent" />
<stroke android:color="@color/routing_button_pressed_tint" android:width="@dimen/divider_width"/>
<corners android:radius="@dimen/button_small_corner_radius" />
</shape>

95
android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml
View file

@ -43,37 +43,60 @@
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"
<LinearLayout
android:orientation="vertical"
android:layout_gravity="start"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:background="@drawable/all_subs_header_bg"
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:fontFamily="@string/robotoMedium"
android:gravity="center|start"
android:text="@string/all_pass_subscription_header"
android:textColor="@color/black_primary"
android:textSize="@dimen/text_size_button" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginTop="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:fontFamily="@string/robotoMedium"
android:textStyle="bold"
android:includeFontPadding="false"
android:lineSpacingExtra="@dimen/no_line_spacing_extra"
android:gravity="center|start"
android:text="@string/all_pass_subscription_subheader"
android:textColor="@color/black_primary"
android:textSize="@dimen/text_size_toolbar" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_marginStart="@dimen/dialog_min_height"
android:layout_marginEnd="@dimen/dialog_min_height"
android:layout_height="@dimen/subscription_view_pager_height"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000" />
android:gravity="bottom">
<com.mapswithme.maps.widget.ParallaxBackgroundViewPager
android:id="@+id/pager"
android:layout_width="@dimen/bookmark_all_subscription_content_width"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000" />
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_container"
android:layout_width="wrap_content"
@ -81,14 +104,10 @@
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:gravity="center_horizontal"
android:layout_marginStart="@dimen/dialog_min_height"
android:layout_marginEnd="@dimen/dialog_min_height"
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"
@ -122,7 +141,7 @@
android:text="@string/restore"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
android:textColor="@color/white_primary"
android:textColor="@color/routing_button_pressed_tint"
tools:ignore="UnusedAttribute"
tools:text="Restore purchases" />
</LinearLayout>
@ -145,7 +164,7 @@
android:lineSpacingExtra="@dimen/terms_of_use_line_spacing"
android:text="@string/subscription_terms_android"
android:textAppearance="?android:textAppearance"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_icon_title"
android:textStyle="normal"
tools:targetApi="o" />
@ -167,7 +186,7 @@
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/terms_of_use"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_body_5"
android:textStyle="normal"
tools:targetApi="lollipop"
@ -190,7 +209,7 @@
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/privacy_policy"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_body_5"
android:textStyle="normal"
tools:targetApi="lollipop"

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

@ -9,24 +9,21 @@
<RelativeLayout
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
tools:background="@color/black_primary"
tools:layout_height="180dp">
tools:background="@color/black_primary">
<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|top"
android:gravity="center|top|start"
android:ellipsize="end"
android:maxLines="@integer/bookmark_all_subs_pager_text_max_lines"
android:fontFamily="@string/robotoMedium"
android:includeFontPadding="false"
android:letterSpacing="0"
android:lineSpacingExtra="@dimen/no_line_spacing_extra"
android:textSize="@dimen/text_size_bookmark_all_subs_title"
android:textSize="@dimen/text_size_display_1"
android:text="@{page.titleId}"
android:textColor="@color/white_primary"
android:layout_marginEnd="@dimen/bookmarks_all_subscription_pager_item_margin"
@ -34,24 +31,24 @@
android:layout_marginLeft="@dimen/bookmarks_all_subscription_pager_item_margin"
android:layout_marginStart="@dimen/bookmarks_all_subscription_pager_item_margin"
tools:text="700+ cities and 100+ countriesапваплвалжвлпжлв"
android:layout_above="@id/description"
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:layout_centerHorizontal="true"
android:gravity="center|start"
android:maxLines="@integer/bookmark_all_subs_pager_text_max_lines"
android:ellipsize="end"
android:fontFamily="@string/robotoRegular"
android:textColor="@color/white_primary"
android:textSize="@dimen/text_size_body_1"
android:textSize="@dimen/text_size_body_0"
android:text="@{page.descriptionId}"
android:letterSpacing="0"
android:lineSpacingExtra="@dimen/no_line_spacing_extra"
android:includeFontPadding="false"
android:layout_marginTop="@dimen/margin_half_plus"
android:layout_alignParentBottom="true"
android:layout_marginTop="@dimen/margin_base"
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"

91
android/res/layout/pager_fragment_bookmarks_all_subscription.xml
View file

@ -41,51 +41,62 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<TextView
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginTop="@dimen/all_pass_top_offset"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
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_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginTop="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
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"
<LinearLayout
android:orientation="vertical"
android:layout_gravity="start"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:background="@drawable/all_subs_header_bg"
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:fontFamily="@string/robotoMedium"
android:gravity="center|start"
android:text="@string/all_pass_subscription_header"
android:textColor="@color/black_primary"
android:textSize="@dimen/text_size_button" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus_quarter"
android:layout_marginTop="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_base_plus_quarter"
android:fontFamily="@string/robotoMedium"
android:textStyle="bold"
android:includeFontPadding="false"
android:lineSpacingExtra="@dimen/no_line_spacing_extra"
android:gravity="center|start"
android:text="@string/all_pass_subscription_subheader"
android:textColor="@color/black_primary"
android:textSize="@dimen/text_size_toolbar" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/subscription_view_pager_height"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000" />
android:gravity="bottom">
<com.mapswithme.maps.widget.ParallaxBackgroundViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000" />
</LinearLayout>
<LinearLayout
android:id="@+id/bottom_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="@dimen/default_elevation"
android:gravity="center_horizontal"
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"
@ -123,7 +134,7 @@
android:text="@string/restore"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
android:textColor="@color/white_primary"
android:textColor="@color/routing_button_pressed_tint"
tools:ignore="UnusedAttribute"
tools:text="Restore purchases" />
<LinearLayout
@ -143,7 +154,7 @@
android:lineSpacingExtra="@dimen/terms_of_use_line_spacing"
android:text="@string/subscription_terms_android"
android:textAppearance="?android:textAppearance"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_icon_title"
android:textStyle="normal"
tools:targetApi="o" />
@ -165,7 +176,7 @@
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/terms_of_use"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_body_5"
android:textStyle="normal"
tools:targetApi="lollipop"
@ -188,7 +199,7 @@
android:letterSpacing="-0.01"
android:singleLine="true"
android:text="@string/privacy_policy"
android:textColor="@color/white_lightest"
android:textColor="@color/routing_button_pressed_tint"
android:textSize="@dimen/text_size_body_5"
android:textStyle="normal"
tools:targetApi="lollipop"

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

@ -3,5 +3,5 @@
<!-- Altitude chart -->
<dimen name="altitude_chart_image_width">600dp</dimen>
<dimen name="bookmarks_all_subscription_pager_item_margin">0dp</dimen>
<dimen name="subscription_view_pager_height">144dp</dimen>
<dimen name="subscription_view_pager_height">310dp</dimen>
</resources>

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

@ -286,7 +286,7 @@
<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="subscription_view_pager_height">180dp</dimen>
<dimen name="subscription_view_pager_height">256dp</dimen>
<dimen name="zero">0dp</dimen>
<dimen name="all_pass_top_offset">62dp</dimen>
<dimen name="welcome_btn_min_width">148dp</dimen>

14
android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java
View file

@ -78,25 +78,13 @@ public class BookmarksAllSubscriptionFragment extends AbstractBookmarkSubscripti
ParallaxBackgroundViewPager viewPager = root.findViewById(R.id.pager);
PagerAdapter adapter = new ParallaxFragmentPagerAdapter(requireFragmentManager(),
items);
DotPager pager = makeDotPager(root.findViewById(R.id.indicator), viewPager, adapter);
pager.show();
viewPager.setAdapter(adapter);
ViewPager.OnPageChangeListener listener = new ParallaxBackgroundPageListener(requireActivity(),
viewPager, items);
viewPager.addOnPageChangeListener(listener);
viewPager.startAutoScroll();
}
@NonNull
private DotPager makeDotPager(@NonNull ViewGroup indicatorContainer, @NonNull ViewPager viewPager,
@NonNull PagerAdapter adapter)
{
return new DotPager.Builder(requireContext(), viewPager, adapter)
.setIndicatorContainer(indicatorContainer)
.setActiveDotDrawable(R.drawable.bookmarks_all_marker_active)
.setInactiveDotDrawable(R.drawable.bookmarks_all_marker_inactive)
.build();
}
@NonNull
private static List<Integer> makeItems()
{

2
android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java
View file

@ -1,6 +1,7 @@
package com.mapswithme.maps.purchase;
import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -27,6 +28,7 @@ public class BookmarksAllSubscriptionPageFragment extends Fragment
BookmarksAllSubscriptionPage page = BookmarksAllSubscriptionPage.values()[index];
FragmentBookmarksAllSubscriptionBinding binding = makeBinding(inflater, container);
binding.setPage(page);
binding.description.setText(Html.fromHtml(getString(page.getDescriptionId())));
return binding.getRoot();
}