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

[android] Improvements of cards' appearance

Browse source
This commit is contained in:
Dmitry Donskoy 2019-07-01 22:18:00 +03:00 • committed by Aleksandr Zatsepin
parent c4513701a3
commit cd62f39d8f
11 changed files with 426 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/animator/lift_on_touch.xml
View file

@ -7,7 +7,7 @@
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueTo="@dimen/margin_half_plus"
android:valueTo="@dimen/margin_half_plus_eight"
android:valueType="floatType"/>
</set>
</item>

13
android/res/drawable/annual_card_edge.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent"/>
<stroke
android:color="@color/white_primary"
android:width="3dp"/>
<corners
android:topLeftRadius="10dp"
android:bottomLeftRadius="10dp"
android:topRightRadius="10dp"
android:bottomRightRadius="10dp"/>
</shape>

13
android/res/drawable/annual_card_edge_night.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent"/>
<stroke
android:color="@color/black_primary"
android:width="3dp"/>
<corners
android:topLeftRadius="10dp"
android:bottomLeftRadius="10dp"
android:topRightRadius="10dp"
android:bottomRightRadius="10dp"/>
</shape>

13
android/res/drawable/monthly_card_edge.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent"/>
<stroke
android:color="#8caeb8be"
android:width="1dp"/>
<corners
android:topLeftRadius="10dp"
android:bottomLeftRadius="10dp"
android:topRightRadius="10dp"
android:bottomRightRadius="10dp"/>
</shape>

13
android/res/drawable/monthly_card_edge_night.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent"/>
<stroke
android:color="#8caeb8be"
android:width="1dp"/>
<corners
android:topLeftRadius="10dp"
android:bottomLeftRadius="10dp"
android:topRightRadius="10dp"
android:bottomRightRadius="10dp"/>
</shape>

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

@ -23,6 +23,8 @@
android:orientation="vertical"
android:background="?attr/bookmarkSubscriptionScreenBg"
android:padding="@dimen/margin_base"
android:clipToPadding="false"
android:clipChildren="false"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -60,10 +62,14 @@
android:layout_marginTop="@dimen/margin_base"
android:layout_width="match_parent"
android:gravity="center"
android:clipToPadding="false"
android:clipChildren="false"
android:layout_height="wrap_content">
<include
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:clipToPadding="false"
android:clipChildren="false"
android:layout_marginTop="@dimen/margin_base_plus"
layout="@layout/subscription_offer_card"/>
<include layout="@layout/subscription_offer_sale"/>
@ -98,10 +104,11 @@
<TextView
android:id="@+id/restore_purchase_btn"
android:background="?attr/selectableItemBackground"
android:layout_gravity="center"
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_marginEnd="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:fontFamily="@string/robotoMedium"

320
android/res/layout/subscription_offer_card.xml
View file

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@ -18,89 +19,113 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/turquoise"
app:cardCornerRadius="@dimen/margin_quarter"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/margin_half_double_plus">
<ImageView
android:src="@drawable/img_annual_subscription_offer"
android:layout_margin="@dimen/margin_eighth"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
<RelativeLayout
android:gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="@string/annual_subscription_title"
tools:text="Annual"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/annual_subscription_message"
tools:text="1 month unlimited guides"
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/primary_button_min_height"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus">
<TextView
android:id="@+id/annual_price"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/annual_price_card_payload"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
tools:ignore="UnusedAttribute"/>
<TextView
android:paddingBottom="@dimen/margin_half_double_plus">
<ImageView
android:src="@drawable/img_annual_subscription_offer"
android:layout_gravity="top"
android:layout_marginEnd="@dimen/margin_eighth"
android:layout_marginRight="@dimen/margin_eighth"
android:layout_marginLeft="@dimen/margin_eighth"
android:layout_marginStart="@dimen/margin_eighth"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="@string/annual_subscription_title"
tools:text="Annual"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/annual_subscription_message"
tools:text="1 month unlimited guides"
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/primary_button_min_height"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus">
<TextView
android:id="@+id/annual_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/per_year"
tools:text="/ mo"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/annual_price_card_edge"
android:background="?attr/bookmarkSubscriptionAnnualCardEdge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/per_year"
tools:text="/ mo"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
</LinearLayout>
</LinearLayout>
android:layout_alignBottom="@id/annual_price_card_payload"
android:layout_alignTop="@id/annual_price_card_payload"
android:layout_alignRight="@id/annual_price_card_payload"
android:layout_alignEnd="@id/annual_price_card_payload"
android:layout_alignStart="@id/annual_price_card_payload"
android:layout_alignLeft="@id/annual_price_card_payload"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/monthly_price_card"
@ -112,91 +137,112 @@
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/cardBackground"
app:cardCornerRadius="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_half"
android:layout_marginStart="@dimen/margin_half"
android:focusable="true">
app:cardBackgroundColor="?attr/cardBackground"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter">
<RelativeLayout
android:gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/monthly_price_card_payload"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/margin_half_double_plus">
<ImageView
android:src="@drawable/img_monthly_subscription_offer"
android:layout_margin="@dimen/margin_eighth"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="@string/montly_subscription_title"
tools:text="Annual"
tools:ignore="UnusedAttribute"/>
<ImageView
android:src="@drawable/img_monthly_subscription_offer"
android:layout_marginEnd="1dp"
android:layout_marginRight="1dp"
android:layout_marginLeft="1dp"
android:layout_marginStart="1dp"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/montly_subscription_message"
tools:text="1 month unlimited guides"
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/primary_button_min_height"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus">
<TextView
android:id="@+id/monthly_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
android:text="@string/montly_subscription_title"
tools:text="Annual"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/per_month"
tools:text="/ mo"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
android:text="@string/montly_subscription_message"
tools:text="1 month unlimited guides"
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/primary_button_min_height"
android:layout_marginRight="@dimen/margin_half_double_plus"
android:layout_marginStart="@dimen/margin_half_double_plus"
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus">
<TextView
android:id="@+id/monthly_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_toolbar"
android:textStyle="bold"
android:fontFamily="@string/robotoMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/per_month"
tools:text="/ mo"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/monthly_price_card_edge"
android:background="?attr/bookmarkSubscriptionMonthlyCardEdge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/monthly_price_card_payload"
android:layout_alignTop="@id/monthly_price_card_payload"
android:layout_alignRight="@id/monthly_price_card_payload"
android:layout_alignEnd="@id/monthly_price_card_payload"
android:layout_alignStart="@id/monthly_price_card_payload"
android:layout_alignLeft="@id/monthly_price_card_payload"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

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

@ -77,6 +77,8 @@
<attr name="adsRemovalOptionsDivider" format="color"/>
<attr name="icClearRounded" format="reference"/>
<attr name="bookmarkSubscriptionScreenBg" format="reference"/>
<attr name="bookmarkSubscriptionAnnualCardEdge" format="reference"/>
<attr name="bookmarkSubscriptionMonthlyCardEdge" format="reference"/>
<declare-styleable name="AnchorBottomSheetBehavior_Layout">
<attr name="behavior_anchorOffset" format="dimension" />

4
android/res/values/themes-base.xml
View file

@ -147,6 +147,8 @@
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="drivingOptionsViewBg">@color/light_green</item>
<item name="bookmarkSubscriptionScreenBg">@drawable/bookmark_subscription_screen_bg</item>
<item name="bookmarkSubscriptionAnnualCardEdge">@drawable/annual_card_edge</item>
<item name="bookmarkSubscriptionMonthlyCardEdge">@drawable/monthly_card_edge</item>
</style>
<!-- Night theme -->
@ -297,5 +299,7 @@
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="drivingOptionsViewBg">@color/driving_options_bg_black</item>
<item name="bookmarkSubscriptionScreenBg">@drawable/bookmark_subscription_screen_bg_night</item>
<item name="bookmarkSubscriptionAnnualCardEdge">@drawable/annual_card_edge_night</item>
<item name="bookmarkSubscriptionMonthlyCardEdge">@drawable/monthly_card_edge_night</item>
</style>
</resources>

143
android/src/com/mapswithme/maps/bookmarks/BookmarkSubscriptionFragment.java Normal file
View file

@ -0,0 +1,143 @@
package com.mapswithme.maps.bookmarks;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.CardView;
import android.text.Html;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
private static final int DEF_ELEVATION = 0;
@SuppressWarnings("NullableProblems")
@NonNull
private View mContentView;
@SuppressWarnings("NullableProblems")
@NonNull
private View mRootScreenProgress;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
{
View root = inflater.inflate(R.layout.bookmark_subscription_fragment, container, false);
mContentView = root.findViewById(R.id.content_view);
mRootScreenProgress = root.findViewById(R.id.root_screen_progress);
CardView annualPriceCard = root.findViewById(R.id.annual_price_card);
CardView monthlyPriceCard = root.findViewById(R.id.monthly_price_card);
View annualCardEdge = root.findViewById(R.id.annual_price_card_edge);
View monthlyCardEdge = root.findViewById(R.id.monthly_price_card_edge);
AnnualCardClickListener annualCardListener = new AnnualCardClickListener(monthlyPriceCard,
annualPriceCard,
annualCardEdge,
monthlyCardEdge);
annualPriceCard.setOnClickListener(annualCardListener);
MonthlyCardClickListener monthlyCardListener = new MonthlyCardClickListener(monthlyPriceCard,
annualPriceCard,
annualCardEdge,
monthlyCardEdge);
monthlyPriceCard.setOnClickListener(monthlyCardListener);
annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
TextView restorePurchasesLink = root.findViewById(R.id.restore_purchase_btn);
final Spanned html = makeRestorePurchaseHtml(requireContext());
restorePurchasesLink.setText(html);
restorePurchasesLink.setMovementMethod(LinkMovementMethod.getInstance());
return root;
}
private void showContent()
{
mContentView.setVisibility(View.VISIBLE);
mRootScreenProgress.setVisibility(View.GONE);
}
private static Spanned makeRestorePurchaseHtml(@NonNull Context context)
{
final String restorePurchaseLink = "";
return Html.fromHtml(context.getString(R.string.restore_purchase_link,
restorePurchaseLink));
}
private class AnnualCardClickListener implements View.OnClickListener
{
@NonNull
private final CardView mMonthlyPriceCard;
@NonNull
private final CardView mAnnualPriceCard;
@NonNull
private final View mAnnualCardFrame;
@NonNull
private final View mMonthlyCardFrame;
public AnnualCardClickListener(@NonNull CardView monthlyPriceCard,
@NonNull CardView annualPriceCard,
@NonNull View annualCardFrame,
@NonNull View monthlyCardFrame)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
public void onClick(View v)
{
mMonthlyPriceCard.setCardElevation(DEF_ELEVATION);
mAnnualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
mAnnualCardFrame.setVisibility(View.VISIBLE);
mMonthlyCardFrame.setVisibility(View.VISIBLE);
}
}
private class MonthlyCardClickListener implements View.OnClickListener
{
@NonNull
private final CardView mMonthlyPriceCard;
@NonNull
private final CardView mAnnualPriceCard;
@NonNull
private final View mAnnualCardFrame;
@NonNull
private final View mMonthlyCardFrame;
public MonthlyCardClickListener(@NonNull CardView monthlyPriceCard,
@NonNull CardView annualPriceCard,
@NonNull View annualCardFrame,
@NonNull View monthlyCardFrame)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
public void onClick(View v)
{
mMonthlyPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
mAnnualPriceCard.setCardElevation(DEF_ELEVATION);
mAnnualCardFrame.setVisibility(View.GONE);
mMonthlyCardFrame.setVisibility(View.GONE);
}
}
}

37
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java
View file

@ -18,6 +18,7 @@ import com.android.billingclient.api.SkuDetails;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
@ -57,11 +58,17 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
View root = inflater.inflate(R.layout.bookmark_subscription_fragment, container, false);
CardView annualPriceCard = root.findViewById(R.id.annual_price_card);
CardView monthlyPriceCard = root.findViewById(R.id.monthly_price_card);
View annualCardEdge = root.findViewById(R.id.annual_price_card_edge);
View monthlyCardEdge = root.findViewById(R.id.monthly_price_card_edge);
AnnualCardClickListener annualCardListener = new AnnualCardClickListener(monthlyPriceCard,
annualPriceCard);
annualPriceCard,
annualCardEdge,
monthlyCardEdge);
annualPriceCard.setOnClickListener(annualCardListener);
MonthlyCardClickListener monthlyCardListener = new MonthlyCardClickListener(monthlyPriceCard,
annualPriceCard);
annualPriceCard,
annualCardEdge,
monthlyCardEdge);
monthlyPriceCard.setOnClickListener(monthlyCardListener);
annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
@ -240,11 +247,21 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
@NonNull
private final CardView mAnnualPriceCard;
@NonNull
private final View mAnnualCardFrame;
@NonNull
private final View mMonthlyCardFrame;
AnnualCardClickListener(@NonNull CardView monthlyPriceCard,
@NonNull CardView annualPriceCard)
@NonNull CardView annualPriceCard,
@NonNull View annualCardFrame,
@NonNull View monthlyCardFrame)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
@ -252,6 +269,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
mMonthlyPriceCard.setCardElevation(DEF_ELEVATION);
mAnnualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
UiUtils.show(mAnnualCardFrame, mMonthlyCardFrame);
}
}
@ -263,11 +281,21 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
@NonNull
private final CardView mAnnualPriceCard;
@NonNull
private final View mAnnualCardFrame;
@NonNull
private final View mMonthlyCardFrame;
MonthlyCardClickListener(@NonNull CardView monthlyPriceCard,
@NonNull CardView annualPriceCard)
@NonNull CardView annualPriceCard,
@NonNull View annualCardFrame,
@NonNull View monthlyCardFrame)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
@ -275,6 +303,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
mMonthlyPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
mAnnualPriceCard.setCardElevation(DEF_ELEVATION);
UiUtils.hide(mAnnualCardFrame, mMonthlyCardFrame);
}
}