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

[android] Edited appearance of the subscription cards

Browse source
This commit is contained in:
Dmitry Donskoy 2019-07-12 14:09:13 +03:00 • committed by Aleksandr Zatsepin
parent 2132c11cb5
commit 065332e2f8
13 changed files with 63 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/res/color/subscription_card_bg.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/turquoise"/>
<item android:color="@color/cardview_light_background" />
</selector>

5
android/res/color/subscription_card_bg_night.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/turquoise"/>
<item android:color="@color/cardview_dark_background" />
</selector>

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

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/subscription_card_edge_selected" android:state_selected="true"/>
<item android:drawable="@drawable/subscription_card_edge_default"/>
</selector>

0
android/res/drawable/monthly_card_edge.xml → android/res/drawable/subscription_card_edge_default.xml
View file

0
android/res/drawable/monthly_card_edge_night.xml → android/res/drawable/subscription_card_edge_default_night.xml
View file

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

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/subscription_card_edge_selected_night" android:state_selected="true"/>
<item android:drawable="@drawable/subscription_card_edge_default_night"/>
</selector>

0
android/res/drawable/annual_card_edge.xml → android/res/drawable/subscription_card_edge_selected.xml
View file

0
android/res/drawable/annual_card_edge_night.xml → android/res/drawable/subscription_card_edge_selected_night.xml
View file

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

@ -18,8 +18,9 @@
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/turquoise"
app:cardBackgroundColor="?attr/bookmarkSubscriptionCardBg"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half">
<RelativeLayout
@ -32,7 +33,6 @@
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_gravity="top"
@ -44,6 +44,7 @@
android:adjustViewBounds="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -58,6 +59,7 @@
android:textColor="?attr/colorAccent"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:duplicateParentState="true"
android:lines="1"
android:text="@string/annual_subscription_title"
tools:text="Annual"
@ -71,6 +73,7 @@
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:duplicateParentState="true"
android:textStyle="normal"
android:textColor="?attr/colorAccent"
android:text="@string/annual_subscription_message"
@ -96,6 +99,7 @@
android:textColor="?attr/colorAccent"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:duplicateParentState="true"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
@ -109,16 +113,17 @@
android:lines="1"
android:textColor="?attr/colorAccent"
android:text="@string/per_year"
android:duplicateParentState="true"
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:background="?attr/bookmarkSubscriptionCardEdge"
android:duplicateParentState="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/annual_price_card_payload"
@ -129,6 +134,7 @@
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"
android:stateListAnimator="@animator/lift_on_touch"
@ -139,7 +145,7 @@
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cardBackgroundColor="?attr/cardBackground"
app:cardBackgroundColor="?attr/bookmarkSubscriptionCardBg"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter">
@ -178,6 +184,7 @@
android:layout_marginEnd="@dimen/margin_half_double_plus"
android:layout_marginLeft="@dimen/margin_half_double_plus"
android:textAppearance="?android:attr/textAppearanceLarge"
android:duplicateParentState="true"
android:gravity="center"
android:lines="1"
android:text="@string/montly_subscription_title"
@ -199,9 +206,9 @@
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:gravity="left|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"
@ -217,6 +224,7 @@
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:duplicateParentState="true"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
@ -231,6 +239,7 @@
android:lines="1"
android:text="@string/per_month"
tools:text="/ mo"
android:duplicateParentState="true"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
@ -238,7 +247,8 @@
</LinearLayout>
<FrameLayout
android:id="@+id/monthly_price_card_edge"
android:background="?attr/bookmarkSubscriptionMonthlyCardEdge"
android:duplicateParentState="true"
android:background="?attr/bookmarkSubscriptionCardEdge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/monthly_price_card_payload"

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

@ -77,8 +77,9 @@
<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"/>
<attr name="bookmarkSubscriptionCardEdge" format="reference"/>
<attr name="bookmarkSubscriptionCardBg" format="color"/>
<attr name="imgPromoBookingTitle" format="reference"/>
<declare-styleable name="AnchorBottomSheetBehavior_Layout">

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

@ -151,8 +151,8 @@
<item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</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>
<item name="bookmarkSubscriptionCardEdge">@drawable/subscription_card_edge</item>
<item name="bookmarkSubscriptionCardBg">@color/subscription_card_bg</item>
<item name="imgPromoBookingTitle">@drawable/img_booking_popup_pholder_light</item>
</style>
@ -304,8 +304,8 @@
<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>
<item name="bookmarkSubscriptionCardEdge">@drawable/subscription_card_edge</item>
<item name="bookmarkSubscriptionCardBg">@color/subscription_card_bg_night</item>
<item name="imgPromoBookingTitle">@drawable/img_booking_popup_pholder_night</item>
</style>
</resources>

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

@ -16,7 +16,7 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.util.UiUtils;
import com.mapswithme.maps.widget.placepage.PlacePageView;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
@ -62,19 +62,12 @@ 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,
annualCardEdge,
monthlyCardEdge);
annualPriceCard);
annualPriceCard.setOnClickListener(annualCardListener);
MonthlyCardClickListener monthlyCardListener = new MonthlyCardClickListener(monthlyPriceCard,
annualPriceCard,
annualCardEdge,
monthlyCardEdge);
annualPriceCard);
monthlyPriceCard.setOnClickListener(monthlyCardListener);
annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
TextView restorePurchasesBtn = root.findViewById(R.id.restore_purchase_btn);
restorePurchasesBtn.setOnClickListener(v -> openSubscriptionManagementSettings());
@ -82,6 +75,10 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
View continueBtn = root.findViewById(R.id.continue_btn);
continueBtn.setOnClickListener(v -> onContinueButtonClicked());
annualPriceCard.setSelected(true);
monthlyPriceCard.setSelected(false);
annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
Statistics.INSTANCE.trackPurchasePreviewShow(PrivateVariables.bookmarksSubscriptionServerId(),
PrivateVariables.bookmarksSubscriptionVendor(),
PrivateVariables.bookmarksSubscriptionYearlyProductId());
@ -188,7 +185,10 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
TextView priceView = getViewOrThrow().findViewById(R.id.annual_price);
priceView.setText(price);
TextView savingView = getViewOrThrow().findViewById(R.id.sale);
savingView.setText(getString(R.string.annual_save_component, calculateYearlySaving()));
String text = getString(R.string.annual_save_component,
String.valueOf(calculateYearlySavingInPercents()))
+ PlacePageView.DISCOUNT_SUFFIX;
savingView.setText(text);
}
private void updateMonthlyButton()
@ -199,7 +199,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
priceView.setText(price);
}
private int calculateYearlySaving()
private int calculateYearlySavingInPercents()
{
float pricePerMonth = getProductDetailsForPeriod(PurchaseUtils.Period.P1M).getPrice();
float pricePerYear = getProductDetailsForPeriod(PurchaseUtils.Period.P1Y).getPrice();
@ -286,21 +286,11 @@ 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 View annualCardFrame,
@NonNull View monthlyCardFrame)
@NonNull CardView annualPriceCard)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
@ -308,14 +298,13 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
mMonthlyPriceCard.setCardElevation(DEF_ELEVATION);
mAnnualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
UiUtils.show(mAnnualCardFrame, mMonthlyCardFrame);
if (!mAnnualCardFrame.isSelected())
if (!mAnnualPriceCard.isSelected())
Statistics.INSTANCE.trackPurchasePreviewSelect(PrivateVariables.bookmarksSubscriptionServerId(),
PrivateVariables.bookmarksSubscriptionYearlyProductId());
mMonthlyPriceCard.setSelected(false);
mAnnualCardFrame.setSelected(true);
mAnnualPriceCard.setSelected(true);
}
}
@ -327,21 +316,11 @@ 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 View annualCardFrame,
@NonNull View monthlyCardFrame)
@NonNull CardView annualPriceCard)
{
mMonthlyPriceCard = monthlyPriceCard;
mAnnualPriceCard = annualPriceCard;
mAnnualCardFrame = annualCardFrame;
mMonthlyCardFrame = monthlyCardFrame;
}
@Override
@ -349,14 +328,13 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
mMonthlyPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
mAnnualPriceCard.setCardElevation(DEF_ELEVATION);
UiUtils.hide(mAnnualCardFrame, mMonthlyCardFrame);
if (!mMonthlyPriceCard.isSelected())
Statistics.INSTANCE.trackPurchasePreviewSelect(PrivateVariables.bookmarksSubscriptionServerId(),
PrivateVariables.bookmarksSubscriptionMonthlyProductId());
mMonthlyPriceCard.setSelected(true);
mAnnualCardFrame.setSelected(false);
mAnnualPriceCard.setSelected(false);
}
}

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -138,7 +138,7 @@ public class PlacePageView extends NestedScrollView
private static final String TAG = PlacePageView.class.getSimpleName();
private static final String PREF_USE_DMS = "use_dms";
private static final String DISCOUNT_PREFIX = "-";
private static final String DISCOUNT_SUFFIX = "%";
public static final String DISCOUNT_SUFFIX = "%";
private boolean mIsDocked;
private boolean mIsFloating;