commit f8e8a08eda758411440b1b53e44aa4ec01cea1a4 Author: Leszek Koltunski Date: Mon Jan 2 21:04:27 2023 +0100 Purchase Pane: post-purchase dialogs. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogStarsError.java b/src/main/java/org/distorted/dialogs/RubikDialogStarsError.java index 76e8d074..77ef8aa1 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogStarsError.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogStarsError.java @@ -42,7 +42,7 @@ public class RubikDialogStarsError extends AppCompatDialogFragment DisplayMetrics displaymetrics = new DisplayMetrics(); act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); final float butSize = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE; - final View view = inflater.inflate(R.layout.dialog_explain_stars, null); + final View view = inflater.inflate(R.layout.dialog_stars_error, null); Bundle args = getArguments(); long price; diff --git a/src/main/java/org/distorted/dialogs/RubikDialogStarsExplain.java b/src/main/java/org/distorted/dialogs/RubikDialogStarsExplain.java index 48231c23..e67e6ff2 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogStarsExplain.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogStarsExplain.java @@ -41,7 +41,7 @@ public class RubikDialogStarsExplain extends AppCompatDialogFragment DisplayMetrics displaymetrics = new DisplayMetrics(); act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); final float butSize = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE; - final View view = inflater.inflate(R.layout.dialog_explain_stars, null); + final View view = inflater.inflate(R.layout.dialog_stars_explain, null); builder.setCancelable(true); diff --git a/src/main/java/org/distorted/dialogs/RubikDialogStarsSuccess.java b/src/main/java/org/distorted/dialogs/RubikDialogStarsSuccess.java deleted file mode 100644 index d41329d2..00000000 --- a/src/main/java/org/distorted/dialogs/RubikDialogStarsSuccess.java +++ /dev/null @@ -1,92 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2022 Leszek Koltunski // -// // -// This file is part of Magic Cube. // -// // -// Magic Cube is proprietary software licensed under an EULA which you should have received // -// along with the code. If not, check https://distorted.org/magic/License-Magic-Cube.html // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.dialogs; - -import android.app.Dialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.util.DisplayMetrics; -import android.util.TypedValue; -import android.view.LayoutInflater; -import android.view.View; -import android.view.Window; -import android.widget.Button; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDialogFragment; -import androidx.fragment.app.FragmentActivity; - -import org.distorted.main.R; -import org.distorted.main.RubikActivity; -import org.distorted.purchase.PurchaseScreenPane; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class RubikDialogStarsSuccess extends AppCompatDialogFragment - { - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) - { - FragmentActivity act = getActivity(); - LayoutInflater inflater = act.getLayoutInflater(); - AlertDialog.Builder builder = new AlertDialog.Builder(act); - DisplayMetrics displaymetrics = new DisplayMetrics(); - act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); - final float butSize = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE; - final View view = inflater.inflate(R.layout.dialog_explain_stars, null); - - Bundle args = getArguments(); - String objectName; - - try - { - objectName = args.getString("object"); - } - catch(Exception e) - { - objectName = null; - } - - builder.setCancelable(true); - - builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) { } - }); - - builder.setView(view); - - final Dialog dialog = builder.create(); - dialog.setCanceledOnTouchOutside(false); - Window window = dialog.getWindow(); - - if( window!=null ) - { - window.getDecorView().setSystemUiVisibility(RubikActivity.FLAGS); - } - - dialog.setOnShowListener(new DialogInterface.OnShowListener() - { - @Override - public void onShow(DialogInterface dialog) - { - Button btnPositive = ((AlertDialog)dialog).getButton(Dialog.BUTTON_POSITIVE); - btnPositive.setTextSize(TypedValue.COMPLEX_UNIT_PX, butSize); - Button btnNegative = ((AlertDialog)dialog).getButton(Dialog.BUTTON_NEGATIVE); - btnNegative.setTextSize(TypedValue.COMPLEX_UNIT_PX, butSize); - } - }); - - return dialog; - } - } diff --git a/src/main/java/org/distorted/overlays/OverlayStars.java b/src/main/java/org/distorted/overlays/OverlayStars.java index 389fe96a..486c2e45 100644 --- a/src/main/java/org/distorted/overlays/OverlayStars.java +++ b/src/main/java/org/distorted/overlays/OverlayStars.java @@ -51,6 +51,8 @@ public class OverlayStars extends OverlayGeneric implements EffectListener private static final int DUR_MOV = 3000; private static final int DUR_GLO = 600; + private static final int MAX_FALLING = 50; + private ListenerOverlay mListener; private DistortedNode mNodeFalling, mNodeCentral; private DistortedScreen mScreen; @@ -203,10 +205,11 @@ public class OverlayStars extends OverlayGeneric implements EffectListener { DistortedTexture texture = new DistortedTexture(); texture.setTexture(mStarBitmap); + int numFalling = Math.min(mNewStars,MAX_FALLING); - MeshQuad[] mesh = new MeshQuad[mNewStars]; + MeshQuad[] mesh = new MeshQuad[numFalling]; - for(int i=0; imScreenWidth; + return mObjectController; } /////////////////////////////////////////////////////////////////////////////////////////////////// - ObjectControl getObjectControl() + PurchaseRenderer getRenderer() { - return mObjectController; + return mRenderer; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/res/layout/dialog_explain_stars.xml b/src/main/res/layout/dialog_explain_stars.xml deleted file mode 100644 index 3ff6ac3c..00000000 --- a/src/main/res/layout/dialog_explain_stars.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/main/res/layout/dialog_stars_error.xml b/src/main/res/layout/dialog_stars_error.xml new file mode 100644 index 00000000..3ff6ac3c --- /dev/null +++ b/src/main/res/layout/dialog_stars_error.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/src/main/res/layout/dialog_stars_explain.xml b/src/main/res/layout/dialog_stars_explain.xml new file mode 100644 index 00000000..3ff6ac3c --- /dev/null +++ b/src/main/res/layout/dialog_stars_explain.xml @@ -0,0 +1,20 @@ + + + + +