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

[android] Added auto downloading of bmk when subs is puchased and reloading of bookmark catalog

Browse source
This commit is contained in:
Александр Зацепин 2019-08-09 20:31:29 +03:00 • committed by Aleksey Belousov
parent a7b0ed2c7f
commit c10d2931e9
6 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@
android:layout_marginLeft="@dimen/height_item_oneline"
android:textAppearance="?android:attr/textAppearanceLarge"
android:letterSpacing="-0.02"
android:lineSpacingExtra="@dimen/margin_half"
android:lineSpacingExtra="@dimen/line_space_extra"
android:textStyle="bold"
android:gravity="center"
tools:text="Unlimited access to 5000+ guides!"

1
android/res/values/font_sizes.xml
View file

@ -18,6 +18,7 @@
<dimen name="text_size_icon_title">10sp</dimen>
<dimen name="text_size_button">16sp</dimen>
<dimen name="text_size_alert_dialog_title">20sp</dimen>
<dimen name="line_space_extra">4sp</dimen>
<!-- BASE TEXT SIZES -->

14
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
View file

@ -216,10 +216,18 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
if (resultCode != Activity.RESULT_OK)
return;
if (requestCode != PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION)
return;
showSubscriptionSuccessDialog();
if (requestCode == PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION)
{
showSubscriptionSuccessDialog();
return;
}
if (requestCode == PurchaseUtils.REQ_CODE_PAY_BOOKMARK && data != null
&& data.getBooleanExtra(PurchaseUtils.EXTRA_IS_SUBSCRIPTION, false))
{
mWebView.reload();
}
}
private void showSubscriptionSuccessDialog()

19
android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java
View file

@ -1,6 +1,7 @@
package com.mapswithme.maps.purchase;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -109,7 +110,23 @@ public class BookmarkPaymentFragment extends BaseMwmFragment
private void onBuySubscriptionClicked()
{
BookmarkSubscriptionActivity.start(requireActivity());
BookmarkSubscriptionActivity.startForResult(this, PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
if (resultCode != Activity.RESULT_OK)
return;
if (requestCode == PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION)
{
Intent intent = new Intent();
intent.putExtra(PurchaseUtils.EXTRA_IS_SUBSCRIPTION, true);
requireActivity().setResult(Activity.RESULT_OK, intent);
requireActivity().finish();
}
}
private void onBuyInappClicked()

6
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java
View file

@ -21,12 +21,6 @@ public class BookmarkSubscriptionActivity extends BaseMwmFragmentActivity
return false;
}
public static void start(@NonNull Context context)
{
Intent intent = new Intent(context, BookmarkSubscriptionActivity.class);
context.startActivity(intent);
}
public static void startForResult(@NonNull Fragment fragment, int requestCode)
{
Intent intent = new Intent(fragment.getActivity(), BookmarkSubscriptionActivity.class);

1
android/src/com/mapswithme/maps/purchase/PurchaseUtils.java
View file

@ -32,6 +32,7 @@ public class PurchaseUtils
public final static int REQ_CODE_PAY_SUBSCRIPTION = 10;
public static final String DIALOG_TAG_CHECK_INVALID_SUBS = "check_invalid_subs";
public static final String DIALOG_TAG_BMK_SUBSCRIPTION_SUCCESS = "bmk_subscription_success";
public static final String EXTRA_IS_SUBSCRIPTION = "extra_is_subscription";
final static int WEEKS_IN_YEAR = 52;
final static int MONTHS_IN_YEAR = 12;