Purchase dialog fixed

This commit is contained in:
serso 2016-02-20 12:51:52 +01:00
parent 9e62536d68
commit dc1c392a94
4 changed files with 72 additions and 112 deletions

View File

@ -105,7 +105,7 @@
<activity <activity
android:name=".preferences.PurchaseDialogActivity" android:name=".preferences.PurchaseDialogActivity"
android:label="@string/cpp_purchase_title" android:label="@string/cpp_purchase_title"
android:theme="@style/Cpp.Theme.Material.Dialog" /> android:theme="@style/Cpp.Theme.Translucent" />
<!-- todo serso: strings--> <!-- todo serso: strings-->
<activity <activity

View File

@ -25,16 +25,14 @@ package org.solovyev.android.calculator;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import org.solovyev.android.calculator.about.AboutFragment; import org.solovyev.android.calculator.about.AboutFragment;
import org.solovyev.android.calculator.about.ReleaseNotesFragment; import org.solovyev.android.calculator.about.ReleaseNotesFragment;
import org.solovyev.android.calculator.functions.FunctionsFragment;
import org.solovyev.android.calculator.history.RecentHistoryFragment; import org.solovyev.android.calculator.history.RecentHistoryFragment;
import org.solovyev.android.calculator.history.SavedHistoryFragment; import org.solovyev.android.calculator.history.SavedHistoryFragment;
import org.solovyev.android.calculator.functions.FunctionsFragment; import org.solovyev.android.calculator.matrix.EditMatrixFragment;
import org.solovyev.android.calculator.operators.OperatorsFragment; import org.solovyev.android.calculator.operators.OperatorsFragment;
import org.solovyev.android.calculator.variables.VariablesFragment; import org.solovyev.android.calculator.variables.VariablesFragment;
import org.solovyev.android.calculator.matrix.EditMatrixFragment;
import org.solovyev.android.calculator.preferences.PurchaseDialogActivity;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -48,9 +46,6 @@ public enum FragmentTab {
variables(VariablesFragment.class, R.layout.fragment_entities, R.string.c_vars), variables(VariablesFragment.class, R.layout.fragment_entities, R.string.c_vars),
functions(FunctionsFragment.class, R.layout.fragment_entities, R.string.c_functions), functions(FunctionsFragment.class, R.layout.fragment_entities, R.string.c_functions),
operators(OperatorsFragment.class, R.layout.fragment_entities, R.string.c_operators), operators(OperatorsFragment.class, R.layout.fragment_entities, R.string.c_operators),
purchase_dialog(PurchaseDialogActivity.PurchaseDialogFragment.class, R.layout.cpp_purchase_dialog_fragment, R.string.cpp_purchase_title),
about(AboutFragment.class, R.layout.about_fragment, R.string.c_about), about(AboutFragment.class, R.layout.about_fragment, R.string.c_about),
// todo serso: strings // todo serso: strings

View File

@ -23,39 +23,26 @@
package org.solovyev.android.calculator.preferences; package org.solovyev.android.calculator.preferences;
import android.app.Activity; import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.ScrollingMovementMethod; import android.support.annotation.NonNull;
import android.view.LayoutInflater; import android.support.v4.app.Fragment;
import android.view.View; import android.support.v7.app.AlertDialog;
import android.view.ViewGroup; import android.support.v7.app.AppCompatActivity;
import android.widget.TextView; import org.solovyev.android.calculator.ActivityUi;
import butterknife.Bind; import org.solovyev.android.calculator.App;
import butterknife.ButterKnife; import org.solovyev.android.calculator.BaseDialogFragment;
import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.R;
import org.solovyev.android.checkout.*; import org.solovyev.android.checkout.*;
import org.solovyev.android.fragments.FragmentUtils;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static org.solovyev.android.calculator.FragmentTab.purchase_dialog; import static org.solovyev.android.calculator.App.cast;
public class PurchaseDialogActivity extends BaseActivity { public class PurchaseDialogActivity extends AppCompatActivity implements RequestListener<Purchase> {
@Nonnull
private final RequestListener<Purchase> purchaseListener = new RequestListener<Purchase>() {
@Override
public void onSuccess(@Nonnull Purchase purchase) {
finish();
}
@Override
public void onError(int i, @Nonnull Exception e) {
finish();
}
};
@Inject @Inject
Billing billing; Billing billing;
@ -63,25 +50,19 @@ public class PurchaseDialogActivity extends BaseActivity {
Products products; Products products;
ActivityCheckout checkout; ActivityCheckout checkout;
public PurchaseDialogActivity() {
super(R.layout.cpp_dialog);
}
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
FragmentUtils.createFragment(this, PurchaseDialogFragment.class, R.id.dialog_layout, "purchase-dialog"); cast(getApplication()).getComponent().inject(this);
if (savedInstanceState == null) {
App.showDialog(new PurchaseDialogFragment(), PurchaseDialogFragment.FRAGMENT_TAG, getSupportFragmentManager());
}
checkout = Checkout.forActivity(this, billing, products); checkout = Checkout.forActivity(this, billing, products);
checkout.start(); checkout.start();
checkout.createPurchaseFlow(purchaseListener); checkout.createPurchaseFlow(this);
}
@Override
protected void inject(@Nonnull AppComponent component) {
super.inject(component);
component.inject(this);
} }
@Override @Override
@ -118,34 +99,66 @@ public class PurchaseDialogActivity extends BaseActivity {
super.onDestroy(); super.onDestroy();
} }
public static class PurchaseDialogFragment extends BaseFragment { public void onDialogClosed() {
final Fragment fragment = getSupportFragmentManager().findFragmentByTag(PurchaseDialogFragment.FRAGMENT_TAG);
@Bind(R.id.cpp_purchase_text) if (fragment == null) {
TextView purchaseText; // activity is closing
@Bind(R.id.cpp_continue_button) return;
View continueButton; }
finish();
@Nonnull
@Override
protected FragmentUi createUi() {
return createUi(purchase_dialog);
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public void onSuccess(@Nonnull Purchase result) {
final View view = super.onCreateView(inflater, container, savedInstanceState); finish();
ButterKnife.bind(this, view); }
purchaseText.setMovementMethod(ScrollingMovementMethod.getInstance());
continueButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onError(int response, @Nonnull Exception e) {
final Activity activity = getActivity(); finish();
}
public static class PurchaseDialogFragment extends BaseDialogFragment {
public static final String FRAGMENT_TAG = "purchase-dialog";
@Nullable
private PurchaseDialogActivity activity;
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
this.activity = (PurchaseDialogActivity) activity;
}
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
super.onPrepareDialog(builder);
builder.setTitle(R.string.cpp_purchase_title);
builder.setMessage(R.string.cpp_purchase_text);
builder.setPositiveButton(R.string.cpp_continue, null);
}
@Override
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
if (activity != null) { if (activity != null) {
((PurchaseDialogActivity) activity).purchase(); activity.purchase();
}
break;
default:
super.onClick(dialog, which);
break;
} }
} }
});
return view; @Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
if (activity != null) {
activity.onDialogClosed();
activity = null;
}
} }
} }
} }

View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:layout_gravity="center_horizontal"
a:orientation="vertical">
<TextView
a:id="@+id/cpp_purchase_text"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:maxLines="10"
a:scrollbars="vertical"
a:text="@string/cpp_purchase_text" />
<Button
a:id="@+id/cpp_continue_button"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:text="@string/cpp_continue" />
</LinearLayout>