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

[android] Implemented bookmarks subscription launch flow and validation

Browse source
This commit is contained in:
Александр Зацепин 2019-07-01 20:58:41 +03:00 • committed by yoksnod
parent ceecaefe4c
commit c4513701a3
2 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.mapswithme.maps.purchase;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
@ -42,6 +43,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
private BookmarkSubscriptionPaymentState mState = BookmarkSubscriptionPaymentState.NONE;
@Nullable
private ProductDetails[] mProductDetails;
private boolean mValidationResult;
@Nullable
@Override
@ -62,14 +64,33 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
annualPriceCard);
monthlyPriceCard.setOnClickListener(monthlyCardListener);
annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter));
TextView restorePurchasesLink = root.findViewById(R.id.restore_purchase_btn);
TextView restorePurchasesLink = root.findViewById(R.id.restore_purchase_btn);
final Spanned html = makeRestorePurchaseHtml(requireContext());
restorePurchasesLink.setText(html);
restorePurchasesLink.setMovementMethod(LinkMovementMethod.getInstance());
restorePurchasesLink.setOnClickListener(v -> openSubscriptionManagementSettings());
View continueBtn = root.findViewById(R.id.continue_btn);
continueBtn.setOnClickListener(v -> onContinueButtonClicked());
return root;
}
private void openSubscriptionManagementSettings()
{
Utils.openUrl(requireContext(), "https://play.google.com/store/account/subscriptions");
}
private void onContinueButtonClicked()
{
//TODO: insert ping logic here.
CardView annualCard = getViewOrThrow().findViewById(R.id.annual_price_card);
PurchaseUtils.Period period = annualCard.getCardElevation() > 0 ? PurchaseUtils.Period.P1Y
: PurchaseUtils.Period.P1M;
ProductDetails details = getProductDetailsForPeriod(period);
mPurchaseController.launchPurchaseFlow(details.getProductId());
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
@ -198,6 +219,19 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
// TODO: coming soon.
}
private void handleActivationResult(boolean result)
{
mValidationResult = result;
}
void finishValidation()
{
if (mValidationResult)
requireActivity().setResult(Activity.RESULT_OK);
requireActivity().finish();
}
private class AnnualCardClickListener implements View.OnClickListener
{
@NonNull
@ -250,6 +284,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
@Nullable
private List<SkuDetails> mPendingDetails;
private Boolean mPendingActivationResult;
@Override
public void onProductDetailsLoaded(@NonNull List<SkuDetails> details)
@ -288,13 +323,18 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
@Override
public void onValidationStarted()
{
// TODO: coming soon.
activateStateSafely(BookmarkSubscriptionPaymentState.VALIDATION);
}
@Override
public void onValidationFinish(boolean success)
{
// TODO: coming soon.
if (getUiObject() == null)
mPendingActivationResult = success;
else
getUiObject().handleActivationResult(success);
activateStateSafely(BookmarkSubscriptionPaymentState.VALIDATION_FINISH);
}
}
}

16
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java
View file

@ -56,7 +56,6 @@ public enum BookmarkSubscriptionPaymentState
{
hideProgress(fragment);
fragment.updatePaymentButtons();
}
},
VALIDATION
@ -64,15 +63,8 @@ public enum BookmarkSubscriptionPaymentState
@Override
void activate(@NonNull BookmarkSubscriptionFragment fragment)
{
// TODO: coming soon.
}
},
VALIDATION_STARTED
{
@Override
void activate(@NonNull BookmarkSubscriptionFragment fragment)
{
// TODO: coming soon.
UiUtils.hide(fragment.getViewOrThrow(), R.id.continue_btn);
UiUtils.show(fragment.getViewOrThrow(), R.id.progress);
}
},
VALIDATION_FINISH
@ -80,7 +72,9 @@ public enum BookmarkSubscriptionPaymentState
@Override
void activate(@NonNull BookmarkSubscriptionFragment fragment)
{
// TODO: coming soon.
UiUtils.hide(fragment.getViewOrThrow(), R.id.progress);
UiUtils.show(fragment.getViewOrThrow(), R.id.continue_btn);
fragment.finishValidation();
}
};