remove billing processor and donation utilities
This commit is contained in:
dkanada
parent
65a311e83b
commit
9ebef7eb08
6 changed files with 1 additions and 349 deletions
|
|
@ -63,7 +63,6 @@ dependencies {
|
||||||
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||||
implementation 'com.heinrichreimersoftware:material-intro:1.6'
|
implementation 'com.heinrichreimersoftware:material-intro:1.6'
|
||||||
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0'
|
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0'
|
||||||
implementation 'com.anjlab.android.iab.v3:library:1.0.44'
|
|
||||||
|
|
||||||
implementation 'com.jakewharton:butterknife:10.1.0'
|
implementation 'com.jakewharton:butterknife:10.1.0'
|
||||||
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
|
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
|
||||||
|
|
|
||||||
|
|
@ -1,236 +0,0 @@
|
||||||
package com.kabouzeid.gramophone.dialogs;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.graphics.Paint;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import androidx.annotation.LayoutRes;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.MaterialDialog;
|
|
||||||
import com.afollestad.materialdialogs.internal.MDTintHelper;
|
|
||||||
import com.afollestad.materialdialogs.internal.ThemeSingleton;
|
|
||||||
import com.anjlab.android.iab.v3.BillingProcessor;
|
|
||||||
import com.anjlab.android.iab.v3.SkuDetails;
|
|
||||||
import com.anjlab.android.iab.v3.TransactionDetails;
|
|
||||||
import com.kabouzeid.appthemehelper.ThemeStore;
|
|
||||||
import com.kabouzeid.appthemehelper.util.ATHUtil;
|
|
||||||
import com.kabouzeid.gramophone.App;
|
|
||||||
import com.kabouzeid.gramophone.R;
|
|
||||||
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
|
|
||||||
public class DonationsDialog extends DialogFragment implements BillingProcessor.IBillingHandler {
|
|
||||||
public static final String TAG = DonationsDialog.class.getSimpleName();
|
|
||||||
|
|
||||||
private static final int DONATION_PRODUCT_IDS = R.array.donation_ids;
|
|
||||||
|
|
||||||
private BillingProcessor billingProcessor;
|
|
||||||
|
|
||||||
private AsyncTask skuDetailsLoadAsyncTask;
|
|
||||||
|
|
||||||
public static DonationsDialog create() {
|
|
||||||
return new DonationsDialog();
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
@SuppressLint("InflateParams")
|
|
||||||
View customView = LayoutInflater.from(getContext()).inflate(R.layout.dialog_donation, null);
|
|
||||||
ProgressBar progressBar = customView.findViewById(R.id.progress);
|
|
||||||
MDTintHelper.setTint(progressBar, ThemeSingleton.get().positiveColor.getDefaultColor());
|
|
||||||
|
|
||||||
return new MaterialDialog.Builder(getContext())
|
|
||||||
.title(R.string.support_development)
|
|
||||||
.customView(customView, false)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void donate(int i) {
|
|
||||||
final String[] ids = getResources().getStringArray(DONATION_PRODUCT_IDS);
|
|
||||||
billingProcessor.purchase(getActivity(), ids[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
||||||
if (!billingProcessor.handleActivityResult(requestCode, resultCode, data)) {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onProductPurchased(@NonNull String productId, TransactionDetails details) {
|
|
||||||
loadSkuDetails();
|
|
||||||
Toast.makeText(getContext(), R.string.thank_you, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPurchaseHistoryRestored() {
|
|
||||||
loadSkuDetails();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBillingError(int errorCode, Throwable error) {
|
|
||||||
Log.e(TAG, "Billing error: code = " + errorCode, error);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBillingInitialized() {
|
|
||||||
loadSkuDetails();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
if (billingProcessor != null) {
|
|
||||||
billingProcessor.release();
|
|
||||||
}
|
|
||||||
if (skuDetailsLoadAsyncTask != null) {
|
|
||||||
skuDetailsLoadAsyncTask.cancel(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
super.onDestroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadSkuDetails() {
|
|
||||||
if (skuDetailsLoadAsyncTask != null) {
|
|
||||||
skuDetailsLoadAsyncTask.cancel(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
skuDetailsLoadAsyncTask = new SkuDetailsLoadAsyncTask(this).execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SkuDetailsLoadAsyncTask extends AsyncTask<Void, Void, List<SkuDetails>> {
|
|
||||||
private final WeakReference<DonationsDialog> donationDialogWeakReference;
|
|
||||||
|
|
||||||
public SkuDetailsLoadAsyncTask(DonationsDialog donationsDialog) {
|
|
||||||
this.donationDialogWeakReference = new WeakReference<>(donationsDialog);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPreExecute() {
|
|
||||||
super.onPreExecute();
|
|
||||||
DonationsDialog dialog = donationDialogWeakReference.get();
|
|
||||||
if (dialog == null) return;
|
|
||||||
|
|
||||||
View customView = ((MaterialDialog) dialog.getDialog()).getCustomView();
|
|
||||||
//noinspection ConstantConditions
|
|
||||||
customView.findViewById(R.id.progress_container).setVisibility(View.VISIBLE);
|
|
||||||
customView.findViewById(R.id.list).setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected List<SkuDetails> doInBackground(Void... params) {
|
|
||||||
DonationsDialog dialog = donationDialogWeakReference.get();
|
|
||||||
if (dialog != null) {
|
|
||||||
final String[] ids = dialog.getResources().getStringArray(DONATION_PRODUCT_IDS);
|
|
||||||
return dialog.billingProcessor.getPurchaseListingDetails(new ArrayList<>(Arrays.asList(ids)));
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel(false);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostExecute(List<SkuDetails> skuDetails) {
|
|
||||||
super.onPostExecute(skuDetails);
|
|
||||||
DonationsDialog dialog = donationDialogWeakReference.get();
|
|
||||||
if (dialog == null) return;
|
|
||||||
|
|
||||||
if (skuDetails == null || skuDetails.isEmpty()) {
|
|
||||||
dialog.dismiss();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
View customView = ((MaterialDialog) dialog.getDialog()).getCustomView();
|
|
||||||
//noinspection ConstantConditions
|
|
||||||
customView.findViewById(R.id.progress_container).setVisibility(View.GONE);
|
|
||||||
ListView listView = customView.findViewById(R.id.list);
|
|
||||||
listView.setAdapter(new SkuDetailsAdapter(dialog, skuDetails));
|
|
||||||
listView.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static class SkuDetailsAdapter extends ArrayAdapter<SkuDetails> {
|
|
||||||
@LayoutRes
|
|
||||||
private static int LAYOUT_RES_ID = R.layout.item_donation_option;
|
|
||||||
|
|
||||||
DonationsDialog donationsDialog;
|
|
||||||
|
|
||||||
public SkuDetailsAdapter(@NonNull DonationsDialog donationsDialog, @NonNull List<SkuDetails> objects) {
|
|
||||||
super(donationsDialog.getContext(), LAYOUT_RES_ID, objects);
|
|
||||||
this.donationsDialog = donationsDialog;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@NonNull
|
|
||||||
public View getView(final int position, View convertView, @NonNull ViewGroup parent) {
|
|
||||||
if (convertView == null) {
|
|
||||||
convertView = LayoutInflater.from(getContext()).inflate(LAYOUT_RES_ID, parent, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
SkuDetails skuDetails = getItem(position);
|
|
||||||
ViewHolder viewHolder = new ViewHolder(convertView);
|
|
||||||
|
|
||||||
viewHolder.title.setText(skuDetails.title.replace("(Phonograph Music Player)", "").trim());
|
|
||||||
viewHolder.text.setText(skuDetails.description);
|
|
||||||
viewHolder.price.setText(skuDetails.priceText);
|
|
||||||
|
|
||||||
final boolean purchased = donationsDialog.billingProcessor.isPurchased(skuDetails.productId);
|
|
||||||
int titleTextColor = purchased ? ATHUtil.resolveColor(getContext(), android.R.attr.textColorHint) : ThemeStore.textColorPrimary(getContext());
|
|
||||||
int contentTextColor = purchased ? titleTextColor : ThemeStore.textColorSecondary(getContext());
|
|
||||||
|
|
||||||
//noinspection ResourceAsColor
|
|
||||||
viewHolder.title.setTextColor(titleTextColor);
|
|
||||||
//noinspection ResourceAsColor
|
|
||||||
viewHolder.text.setTextColor(contentTextColor);
|
|
||||||
//noinspection ResourceAsColor
|
|
||||||
viewHolder.price.setTextColor(titleTextColor);
|
|
||||||
|
|
||||||
strikeThrough(viewHolder.title, purchased);
|
|
||||||
strikeThrough(viewHolder.text, purchased);
|
|
||||||
strikeThrough(viewHolder.price, purchased);
|
|
||||||
|
|
||||||
convertView.setOnTouchListener((v, event) -> purchased);
|
|
||||||
|
|
||||||
convertView.setOnClickListener(v -> donationsDialog.donate(position));
|
|
||||||
|
|
||||||
return convertView;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void strikeThrough(TextView textView, boolean strikeThrough) {
|
|
||||||
textView.setPaintFlags(strikeThrough ? textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG : textView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
|
|
||||||
}
|
|
||||||
|
|
||||||
static class ViewHolder {
|
|
||||||
@BindView(R.id.title)
|
|
||||||
TextView title;
|
|
||||||
@BindView(R.id.text)
|
|
||||||
TextView text;
|
|
||||||
@BindView(R.id.price)
|
|
||||||
TextView price;
|
|
||||||
|
|
||||||
public ViewHolder(View view) {
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -15,15 +15,11 @@ import android.widget.TextView;
|
||||||
|
|
||||||
import com.kabouzeid.appthemehelper.ThemeStore;
|
import com.kabouzeid.appthemehelper.ThemeStore;
|
||||||
import com.kabouzeid.gramophone.R;
|
import com.kabouzeid.gramophone.R;
|
||||||
import com.kabouzeid.gramophone.dialogs.DonationsDialog;
|
|
||||||
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
|
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Karim Abou Zeid (kabouzeid)
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("FieldCanBeLocal")
|
@SuppressWarnings("FieldCanBeLocal")
|
||||||
public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
|
public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
|
||||||
|
|
||||||
|
|
@ -182,7 +178,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
} else if (v == rateOnGooglePlay) {
|
} else if (v == rateOnGooglePlay) {
|
||||||
openUrl(RATE_ON_GOOGLE_PLAY);
|
openUrl(RATE_ON_GOOGLE_PLAY);
|
||||||
} else if (v == donate) {
|
} else if (v == donate) {
|
||||||
DonationsDialog.create().show(getSupportFragmentManager(), "DONATION_DIALOG");
|
openUrl(RATE_ON_GOOGLE_PLAY);
|
||||||
} else if (v == aidanFollestadGooglePlus) {
|
} else if (v == aidanFollestadGooglePlus) {
|
||||||
openUrl(AIDAN_FOLLESTAD_GOOGLE_PLUS);
|
openUrl(AIDAN_FOLLESTAD_GOOGLE_PLUS);
|
||||||
} else if (v == aidanFollestadGitHub) {
|
} else if (v == aidanFollestadGitHub) {
|
||||||
|
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/progress_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="end|center_vertical"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:paddingBottom="@dimen/md_content_padding_top"
|
|
||||||
android:paddingLeft="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingRight="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingTop="@dimen/md_content_padding_top">
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/progress"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:indeterminate="true" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fontFamily="sans-serif"
|
|
||||||
android:gravity="start"
|
|
||||||
android:paddingLeft="16dp"
|
|
||||||
android:text="@string/loading_products"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
|
|
||||||
tools:ignore="RtlHardcoded,RtlSymmetry" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<ListView
|
|
||||||
android:id="@+id/list"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
android:divider="@null"
|
|
||||||
android:dividerHeight="0dp"
|
|
||||||
android:paddingBottom="@dimen/md_content_padding_bottom"
|
|
||||||
android:paddingTop="@dimen/md_content_padding_top"
|
|
||||||
android:scrollbarStyle="outsideOverlay"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="?attr/rectSelector"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:paddingBottom="@dimen/md_simplelistitem_padding_top"
|
|
||||||
android:paddingEnd="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingLeft="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingRight="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingStart="@dimen/md_dialog_frame_margin"
|
|
||||||
android:paddingTop="@dimen/md_simplelistitem_padding_top">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fontFamily="sans-serif"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/text"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fontFamily="sans-serif"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
|
|
||||||
android:textColor="?android:textColorSecondary" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/price"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginLeft="16dp"
|
|
||||||
android:layout_marginStart="16dp"
|
|
||||||
android:fontFamily="sans-serif"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -18,13 +18,4 @@
|
||||||
|
|
||||||
<string name="random" translatable="false">\?</string>
|
<string name="random" translatable="false">\?</string>
|
||||||
|
|
||||||
<string-array name="donation_ids" translatable="false">
|
|
||||||
<item>donation_1</item>
|
|
||||||
<item>donation_2</item>
|
|
||||||
<item>donation_3</item>
|
|
||||||
<item>donation_4</item>
|
|
||||||
<item>donation_5</item>
|
|
||||||
<item>donation_6</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue