Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Second Iteration

Browse source
This commit is contained in:
androiddevkotlin 2021-03-22 14:36:32 +02:00
parent ac370efcd9
commit 8de07a2c59
4 changed files with 52 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/layout/purchases_layout.xml
View file

@ -11,11 +11,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/profile_preference_toolbar_with_icon" />
</com.google.android.material.appbar.AppBarLayout>
<View
android:layout_width="match_parent"
android:layout_height="16dp"
@ -316,7 +313,9 @@
android:paddingTop="@dimen/card_padding"
android:paddingEnd="@dimen/action_bar_image_side_margin"
android:paddingRight="@dimen/action_bar_image_side_margin"
android:paddingBottom="@dimen/card_padding">
android:paddingBottom="@dimen/card_padding"
android:clickable="true"
android:focusable="true">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/contact_support_title"

1
OsmAnd/res/xml/settings_main_screen.xml
View file

@ -18,7 +18,6 @@
android:layout="@layout/preference_with_descr"
android:persistent="false"
android:title="@string/purchases"
app:fragment="net.osmand.plus.settings.fragments.PurchasesFragment"
tools:icon="@drawable/ic_action_purchases" />
<Preference

8
OsmAnd/src/net/osmand/plus/settings/fragments/MainSettingsFragment.java
View file

@ -6,7 +6,6 @@ import android.os.Bundle;
import android.view.View;
import androidx.annotation.ColorRes;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
@ -151,7 +150,14 @@ public class MainSettingsFragment extends BaseSettingsFragment implements OnSele
FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
ExportSettingsFragment.showInstance(fragmentManager, mode, true);
}
} else if (PURCHASES_SETTINGS.equals(prefId)) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
PurchasesFragment.showInstance(fragmentManager);
}
}
return super.onPreferenceClick(preference);
}

64
OsmAnd/src/net/osmand/plus/settings/fragments/PurchasesFragment.java
View file

@ -13,6 +13,7 @@ import android.text.method.LinkMovementMethod;
import android.text.style.StyleSpan;
import android.text.style.URLSpan;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
@ -23,6 +24,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.appbar.AppBarLayout;
@ -34,19 +36,33 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.inapp.InAppPurchaseHelper;
import net.osmand.plus.liveupdates.LiveUpdatesFragmentNew;
import net.osmand.plus.liveupdates.OsmLiveActivity;
import net.osmand.plus.wikipedia.WikipediaDialogFragment;
public class PurchasesFragment extends BaseOsmAndFragment {
public static final String TAG = PurchasesFragment.class.getName();
private static final String PLAY_STORE_SUBSCRIPTION_URL = "https://play.google.com/store/account/subscriptions";
private static final String PLAY_STORE_SUBSCRIPTION_DEEPLINK_URL = "https://play.google.com/store/account/subscriptions?sku=%s&package=%s";
private InAppPurchaseHelper purchaseHelper;
private View mainView;
private Context context;
private OsmandApplication app;
private String url;
private static final String PLAY_STORE_SUBSCRIPTION_URL = "https://play.google.com/store/account/subscriptions";
private static final String PLAY_STORE_SUBSCRIPTION_DEEPLINK_URL = "https://play.google.com/store/account/subscriptions?sku=%s&package=%s";
public static boolean showInstance(FragmentManager fragmentManager) {
try {
PurchasesFragment fragment = new PurchasesFragment();
fragmentManager.beginTransaction()
.add(R.id.fragmentContainer, fragment, TAG)
.addToBackStack(TAG)
.commitAllowingStateLoss();
return true;
} catch (Exception e) {
return false;
}
}
@Override
public void onCreate(Bundle savedInstanceState) {
@ -58,12 +74,20 @@ public class PurchasesFragment extends BaseOsmAndFragment {
app = getMyApplication();
context = requireContext();
purchaseHelper = getInAppPurchaseHelper();
final MapActivity mapActivity = (MapActivity) getActivity();
boolean nightMode = !getMyApplication().getSettings().isLightContent();
final boolean nightMode = !getMyApplication().getSettings().isLightContent();
LayoutInflater themedInflater = UiUtilities.getInflater(context, nightMode);
mainView = themedInflater.inflate(R.layout.purchases_layout, container, false);
AndroidUtils.addStatusBarPadding21v(getActivity(), mainView);
createToolbar(mainView, nightMode);
mainView.setOnTouchListener(new View.OnTouchListener() {
public boolean onTouch(View v, MotionEvent event) {
return true;
}
});
LinearLayout purchasesRestore = mainView.findViewById(R.id.restore_purchases);
purchasesRestore.setOnClickListener(new View.OnClickListener() {
@Override
@ -88,12 +112,20 @@ public class PurchasesFragment extends BaseOsmAndFragment {
liveUpdatesContainer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// Fragment parent = getParentFragment();
// if (parent != null) {
// ((LiveUpdatesFragment) parent).updateSubscriptionHeader();
// }
FragmentActivity activity = getActivity();
if (activity != null) {
LiveUpdatesFragmentNew.showInstance(activity.getSupportFragmentManager(), PurchasesFragment.this);
}
}
});
LinearLayout newDeviceAccountContainer = mainView.findViewById(R.id.new_device_account_container);
newDeviceAccountContainer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
WikipediaDialogFragment.showFullArticle(context, Uri.parse("https://docs.osmand.net/en/main@latest/osmand/purchases#new-device--new-account"), nightMode);
}
});
setFormatLink();
return mainView;
}
@ -108,7 +140,7 @@ public class PurchasesFragment extends BaseOsmAndFragment {
}
}
private void createToolbar(View mainView, boolean nightMode) {
private void createToolbar(View mainView, final boolean nightMode) {
AppBarLayout appbar = mainView.findViewById(R.id.appbar);
View toolbar = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.profile_preference_toolbar_with_icon, appbar, false);
@ -118,11 +150,7 @@ public class PurchasesFragment extends BaseOsmAndFragment {
icon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Uri uri = Uri.parse("https://docs.osmand.net/en/main@latest/osmand/purchases");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
if (AndroidUtils.isIntentSafe(context, intent)) {
startActivity(intent);
}
WikipediaDialogFragment.showFullArticle(context, Uri.parse("https://docs.osmand.net/en/main@latest/osmand/purchases"), nightMode);
}
});
ImageButton backButton = toolbar.findViewById(R.id.close_button);
@ -153,7 +181,6 @@ public class PurchasesFragment extends BaseOsmAndFragment {
}
public void setFormatLink() {
TextView newDeviceAccountLink = mainView.findViewById(R.id.new_device_account_title);
TextView contactSupportLink = mainView.findViewById(R.id.contact_support_title);
TextView supportDescription = mainView.findViewById(R.id.support_link_title);
@ -161,10 +188,6 @@ public class PurchasesFragment extends BaseOsmAndFragment {
String urlSupport = "mailto:support@osmand.net";
spannableStringSupport.setSpan(new URLSpan(urlSupport), 0, spannableStringSupport.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
SpannableString spannableStringNewDeviceAccount = new SpannableString(getString(R.string.new_device_account));
String urlNewDeviceAccount = "https://docs.osmand.net/en/main@latest/osmand/purchases#new-device--new-account";
spannableStringNewDeviceAccount.setSpan(new URLSpan(urlNewDeviceAccount), 0, spannableStringNewDeviceAccount.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
String emailString = getString(R.string.contact_support_mail);
String supportDescriptionString = getString(R.string.contact_support_description, emailString);
SpannableString spannableStringMail = new SpannableString(supportDescriptionString);
@ -174,14 +197,11 @@ public class PurchasesFragment extends BaseOsmAndFragment {
spannableStringMail.setSpan(boldSpan, startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
contactSupportLink.setText(spannableStringSupport);
newDeviceAccountLink.setText(spannableStringNewDeviceAccount);
supportDescription.setText(spannableStringMail);
AndroidUtils.removeLinkUnderline(contactSupportLink);
AndroidUtils.removeLinkUnderline(newDeviceAccountLink);
contactSupportLink.setMovementMethod(LinkMovementMethod.getInstance());
newDeviceAccountLink.setMovementMethod(LinkMovementMethod.getInstance());
}
private void getSkuAppId() {