TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CppCheckout

Browse Source
This commit is contained in:
serso
2016-02-06 11:17:29 +01:00
parent dbf4c14d42
commit 5d30d57d8f
8 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java
View File

@@ -7,16 +7,14 @@ import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.annotation.XmlRes;
import android.util.SparseArray;
import org.solovyev.android.calculator.ActivityUi;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.BaseActivity;
import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.*;
import org.solovyev.android.checkout.ActivityCheckout;
import org.solovyev.android.checkout.Billing;
import org.solovyev.android.checkout.Checkout;
import org.solovyev.android.checkout.Products;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import static android.support.v7.app.ActionBar.NAVIGATION_MODE_STANDARD;
@@ -38,10 +36,14 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
preferences.append(R.xml.preferences_widget, new PrefDef("screen-widget", R.string.prefs_widget_title));
}
@Nonnull
private final ActivityCheckout checkout = Checkout.forActivity(this, App.getBilling(), App.getProducts());
ActivityCheckout checkout;
private boolean paused = true;
@Inject
Billing billing;
@Inject
Products products;
public PreferencesActivity() {
super(R.layout.main_empty);
}
@@ -90,9 +92,16 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
getSupportActionBar().setNavigationMode(NAVIGATION_MODE_STANDARD);
checkout = Checkout.forActivity(this, billing, products);
checkout.start();
}
@Override
protected void inject(@Nonnull AppComponent component) {
super.inject(component);
component.inject(this);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (!paused) {

25
app/src/main/java/org/solovyev/android/calculator/preferences/PurchaseDialogActivity.java
View File

@@ -30,28 +30,20 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;
import org.solovyev.android.calculator.*;
import org.solovyev.android.checkout.ActivityCheckout;
import org.solovyev.android.checkout.BillingRequests;
import org.solovyev.android.checkout.Checkout;
import org.solovyev.android.checkout.ProductTypes;
import org.solovyev.android.checkout.Purchase;
import org.solovyev.android.checkout.RequestListener;
import org.solovyev.android.checkout.*;
import org.solovyev.android.fragments.FragmentUtils;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import static org.solovyev.android.calculator.FragmentTab.purchase_dialog;
public class PurchaseDialogActivity extends BaseActivity {
@Nonnull
private final ActivityCheckout checkout = Checkout.forActivity(this, App.getBilling(), App.getProducts());
@Nonnull
private final RequestListener<Purchase> purchaseListener = new RequestListener<Purchase>() {
@Override
@@ -65,6 +57,12 @@ public class PurchaseDialogActivity extends BaseActivity {
}
};
@Inject
Billing billing;
@Inject
Products products;
ActivityCheckout checkout;
public PurchaseDialogActivity() {
super(R.layout.cpp_dialog);
}
@@ -75,10 +73,17 @@ public class PurchaseDialogActivity extends BaseActivity {
FragmentUtils.createFragment(this, PurchaseDialogFragment.class, R.id.dialog_layout, "purchase-dialog");
checkout = Checkout.forActivity(this, billing, products);
checkout.start();
checkout.createPurchaseFlow(purchaseListener);
}
@Override
protected void inject(@Nonnull AppComponent component) {
super.inject(component);
component.inject(this);
}
@Override
protected void onStart() {
super.onStart();