commit c7238c6778371f0358695eba3a82f1843c6a7f3d Author: Leszek Koltunski Date: Mon Aug 15 14:17:59 2022 +0200 IAP part 5: new 'Purchase' activity. diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 975b4cdc..524bbe22 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -32,6 +32,7 @@ + = Build.VERSION_CODES.KITKAT) + { + final View decorView = getWindow().getDecorView(); + + decorView.setSystemUiVisibility(FLAGS); + + decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() + { + @Override + public void onSystemUiVisibilityChange(int visibility) + { + if((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) + { + decorView.setSystemUiVisibility(FLAGS); + } + } + }); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// do not avoid cutouts + + private void cutoutHack() + { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) + { + getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + + if(mCurrentApiVersion >= Build.VERSION_CODES.KITKAT && hasFocus) + { + getWindow().getDecorView().setSystemUiVisibility(FLAGS); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onPause() + { + super.onPause(); + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + view.onPause(); + DistortedLibrary.onPause(ACTIVITY_NUMBER); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onResume() + { + super.onResume(); + DistortedLibrary.onResume(ACTIVITY_NUMBER); + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + view.onResume(); + + if( mScreen==null ) mScreen = new PurchaseScreen(); + mScreen.onAttachedToWindow(this,mObjectOrdinal); + + if( mObjectOrdinal>=0 && mObjectOrdinal< RubikObjectList.getNumObjects() ) + { + RubikObject object = RubikObjectList.getObject(mObjectOrdinal); + changeIfDifferent(object,mObjectOrdinal,view.getObjectControl()); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + protected void onDestroy() + { + super.onDestroy(); + DistortedLibrary.onDestroy(ACTIVITY_NUMBER); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void OpenGLError() + { + RubikDialogError errDiag = new RubikDialogError(); + errDiag.show(getSupportFragmentManager(), null); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void changeIfDifferent(RubikObject object,int ordinal,ObjectControl control) + { + if( object!=null ) + { + int meshState = object.getMeshState(); + int iconMode = TwistyObject.MODE_NORM; + InputStream jsonStream = object.getObjectStream(this); + InputStream meshStream = object.getMeshStream(this); + String name = object.getUpperName(); + + control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// PUBLIC API +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void changeObject(int ordinal) + { + mObjectOrdinal = ordinal; + RubikObject object = RubikObjectList.getObject(ordinal); + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + ObjectControl control = view.getObjectControl(); + changeIfDifferent(object,ordinal,control); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void changeMeshState(RubikObject object, int ordinal) + { + if( object!=null ) + { + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + ObjectControl control = view.getObjectControl(); + + int meshState = object.getMeshState(); + int iconMode = TwistyObject.MODE_NORM; + InputStream jsonStream = object.getObjectStream(this); + InputStream meshStream = object.getMeshStream(this); + + control.changeObject(ordinal,meshState,iconMode,jsonStream,meshStream); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getHeightBar() + { + return mHeightBar; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getScreenWidthInPixels() + { + return mScreenWidth; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getScreenHeightInPixels() + { + return mScreenHeight; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public ObjectControl getControl() + { + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + return view.getObjectControl(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int getDrawableSize() + { + if( mScreenHeight<1000 ) + { + return 0; + } + if( mScreenHeight<1600 ) + { + return 1; + } + if( mScreenHeight<1900 ) + { + return 2; + } + + return 3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int getDrawable(int small, int medium, int big, int huge) + { + int size = getDrawableSize(); + + switch(size) + { + case 0 : return small; + case 1 : return medium; + case 2 : return big; + default: return huge; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public boolean isVertical() + { + PurchaseSurfaceView view = findViewById(R.id.purchaseSurfaceView); + return view.isVertical(); + } +} diff --git a/src/main/java/org/distorted/purchase/PurchaseObjectLibInterface.java b/src/main/java/org/distorted/purchase/PurchaseObjectLibInterface.java new file mode 100644 index 00000000..99b5c224 --- /dev/null +++ b/src/main/java/org/distorted/purchase/PurchaseObjectLibInterface.java @@ -0,0 +1,130 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2021 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.purchase; + +import com.google.firebase.crashlytics.FirebaseCrashlytics; + +import org.distorted.library.message.EffectMessageSender; +import org.distorted.objectlib.BuildConfig; +import org.distorted.objectlib.helpers.BlockController; +import org.distorted.objectlib.helpers.ObjectLibInterface; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class PurchaseObjectLibInterface implements ObjectLibInterface +{ + public void onWinEffectFinished(long startTime, long endTime, String debug, int scrambleNum) { } + public void onScrambleEffectFinished() { } + public void onBeginRotation() { } + public void onSolved() { } + public void onObjectCreated(long time) { } + public void onReplaceModeDown(int cubit, int face) { } + public void onReplaceModeUp() { } + public void onFinishRotation(int axis, int row, int angle) { } + public void failedToDrag() { } + public void reportJSONError(String error, int ordinal) { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void reportProblem(String problem, boolean reportException) + { + if( BuildConfig.DEBUG ) + { + android.util.Log.e("interface", problem); + } + else + { + if( reportException ) + { + Exception ex = new Exception(problem); + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.setCustomKey("problem" , problem); + crashlytics.recordException(ex); + } + else + { + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.log(problem); + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void reportUIProblem(int place, long pause, long resume, long time) + { + String error = "UI BLOCK "+place+" blocked for "+time; + + if( BuildConfig.DEBUG ) + { + android.util.Log.e("D", error); + } + else + { + Exception ex = new Exception(error); + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.setCustomKey("pause" , pause ); + crashlytics.setCustomKey("resume", resume ); + crashlytics.recordException(ex); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void reportTouchProblem(int place, long pause, long resume, long time) + { + String error = "TOUCH BLOCK "+place+" blocked for "+time; + + if( BuildConfig.DEBUG ) + { + android.util.Log.e("D", error); + } + else + { + Exception ex = new Exception(error); + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.setCustomKey("pause" , pause ); + crashlytics.setCustomKey("resume", resume); + crashlytics.recordException(ex); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void reportThreadProblem(int place, long pause, long resume, long time) + { + String error = EffectMessageSender.reportState(); + + if( BuildConfig.DEBUG ) + { + android.util.Log.e("D", error); + } + else + { + Exception ex = new Exception(error); + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.setCustomKey("pause" , pause ); + crashlytics.setCustomKey("resume", resume ); + crashlytics.recordException(ex); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void reportBlockProblem(int type, int place, long pause, long resume, long time) + { + switch(type) + { + case BlockController.TYPE_UI : reportUIProblem(place,pause,resume,time); break; + case BlockController.TYPE_TOUCH : reportTouchProblem(place,pause,resume,time); break; + case BlockController.TYPE_THREAD: reportThreadProblem(place,pause,resume,time); break; + } + } +} diff --git a/src/main/java/org/distorted/purchase/PurchaseRenderer.java b/src/main/java/org/distorted/purchase/PurchaseRenderer.java new file mode 100644 index 00000000..ab112798 --- /dev/null +++ b/src/main/java/org/distorted/purchase/PurchaseRenderer.java @@ -0,0 +1,88 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 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.purchase; + +import android.opengl.GLSurfaceView; + +import org.distorted.library.effect.EffectType; +import org.distorted.library.effect.VertexEffectQuaternion; +import org.distorted.library.effect.VertexEffectRotate; +import org.distorted.library.main.DistortedLibrary; +import org.distorted.library.main.DistortedScreen; +import org.distorted.objectlib.effects.BaseEffect; +import org.distorted.objectlib.main.ObjectControl; + +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.opengles.GL10; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class PurchaseRenderer implements GLSurfaceView.Renderer, DistortedLibrary.ExceptionListener +{ + private final PurchaseSurfaceView mView; + private final DistortedScreen mScreen; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + PurchaseRenderer(PurchaseSurfaceView v) + { + final float BRIGHTNESS = 0.333f; + + mView = v; + mScreen = new DistortedScreen(); + mScreen.glClearColor(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS, 1.0f); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onDrawFrame(GL10 glUnused) + { + long time = System.currentTimeMillis(); + mView.getObjectControl().preRender(); + mScreen.render(time); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onSurfaceChanged(GL10 glUnused, int width, int height) + { + mScreen.resize(width,height); + mView.setScreenSize(width,height); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onSurfaceCreated(GL10 glUnused, EGLConfig config) + { + DistortedLibrary.setMax(EffectType.VERTEX, ObjectControl.MAX_QUATS+1); + VertexEffectRotate.enable(); + VertexEffectQuaternion.enable(); + BaseEffect.Type.enableEffects(); + + DistortedLibrary.onSurfaceCreated(mView.getContext(),this,1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void distortedException(Exception ex) + { + android.util.Log.e("PURCHASE", "unexpected exception: "+ex.getMessage() ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + DistortedScreen getScreen() + { + return mScreen; + } +} diff --git a/src/main/java/org/distorted/purchase/PurchaseScreen.java b/src/main/java/org/distorted/purchase/PurchaseScreen.java new file mode 100644 index 00000000..b160d102 --- /dev/null +++ b/src/main/java/org/distorted/purchase/PurchaseScreen.java @@ -0,0 +1,319 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2020 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.purchase; + +import android.os.Build; +import android.util.TypedValue; +import android.view.Gravity; +import android.view.View; +import android.widget.GridLayout; +import android.widget.ImageButton; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.ScrollView; +import android.widget.TextView; + +import org.distorted.helpers.PopupCreator; +import org.distorted.helpers.TransparentImageButton; +import org.distorted.main.R; +import org.distorted.main.RubikActivity; +import org.distorted.objectlib.main.ObjectControl; +import org.distorted.objects.RubikObject; +import org.distorted.objects.RubikObjectList; + +import static android.view.View.inflate; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class PurchaseScreen +{ + private static final int NUM_COLUMNS = 5; + private static final int[] mLocation = new int[2]; + + private TransparentImageButton mBackButton, mObjectButton, mPrevButton, mNextButton; + private TextView mMovesText; + private PopupWindow mObjectPopup; + private PurchaseScreenPane mPane; + private int mObjectOrdinal; + private int mColCount, mRowCount, mMaxRowCount; + private int mObjectSize; + private int mBarHeight; + private float mButtonSize; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupObjectWindow(final PurchaseActivity act, final float width, final float height) + { + int numObjects= RubikObjectList.getNumObjects(); + mRowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS; + mColCount = NUM_COLUMNS; + + int cubeSize = (int)(width/9); + int margin = (int)(width*RubikActivity.LARGE_MARGIN); + int padding = (int)(width*RubikActivity.POPUP_PADDING); + mObjectSize = (int)(cubeSize + 2*margin + 0.5f); + mMaxRowCount = (int)((height-mBarHeight)/mObjectSize); + + ScrollView view = (ScrollView)inflate( act, R.layout.popup_object_simple, null); + GridLayout objectGrid = view.findViewById(R.id.objectGrid); + + PopupCreator.createObjectGrid(objectGrid,act,mRowCount,mColCount,numObjects,margin,cubeSize,padding); + + for(int child=0; child= Build.VERSION_CODES.R || isFullScreen ) + { + window.showAsDropDown(view, xoff, yoff, Gravity.CENTER); + window.update(view, w, h); + } + else // Android 10 or below in pop-up mode or split-screen mode + { + view.getLocationOnScreen(mLocation); + int width = view.getWidth(); + int height = view.getHeight(); + int x = mLocation[0]+(width-w)/2; + int y = mLocation[1]+height+yoff; + + window.showAsDropDown(view); + window.update(x,y,w,h); + } + } + catch( IllegalArgumentException iae ) + { + // ignore, this means window is 'not attached to window manager' - + // which most probably is because we are already exiting the app. + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void prevObject(PurchaseActivity act, int numObjects) + { + mObjectOrdinal--; + if( mObjectOrdinal<0 ) mObjectOrdinal=numObjects-1; + + act.changeObject(mObjectOrdinal); + mPane.updatePane(act,mObjectOrdinal); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void nextObject(PurchaseActivity act, int numObjects) + { + mObjectOrdinal++; + if( mObjectOrdinal>=numObjects ) mObjectOrdinal=0; + + act.changeObject(mObjectOrdinal); + mPane.updatePane(act,mObjectOrdinal); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupPrevButton(final PurchaseActivity act) + { + int icon = RubikActivity.getDrawable(R.drawable.ui_small_left,R.drawable.ui_medium_left, R.drawable.ui_big_left, R.drawable.ui_huge_left); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f); + mPrevButton = new TransparentImageButton(act,icon,TransparentImageButton.GRAVITY_MIDDLE,params); + + mPrevButton.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + int numObjects = RubikObjectList.getNumObjects(); + prevObject(act,numObjects); + mMovesText.setText(act.getString(R.string.mo_placeholder,mObjectOrdinal+1,numObjects)); + } + }); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupNextButton(final PurchaseActivity act) + { + int icon = RubikActivity.getDrawable(R.drawable.ui_small_right,R.drawable.ui_medium_right, R.drawable.ui_big_right, R.drawable.ui_huge_right); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f); + mNextButton = new TransparentImageButton(act,icon,TransparentImageButton.GRAVITY_MIDDLE,params); + + mNextButton.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + int numObjects = RubikObjectList.getNumObjects(); + nextObject(act,numObjects); + mMovesText.setText(act.getString(R.string.mo_placeholder,mObjectOrdinal+1,numObjects)); + } + }); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupTextView(final PurchaseActivity act, final float width, int numObjects) + { + int padding = (int)(width*RubikActivity.PADDING); + int margin = (int)(width*RubikActivity.SMALL_MARGIN); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,2.0f); + params.topMargin = margin; + params.bottomMargin = margin; + params.leftMargin = margin; + params.rightMargin = margin; + + mMovesText = new TextView(act); + mMovesText.setTextSize(20); + mMovesText.setLayoutParams(params); + mMovesText.setPadding(padding,0,padding,0); + mMovesText.setGravity(Gravity.CENTER); + mMovesText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mButtonSize); + mMovesText.setText(act.getString(R.string.mo_placeholder,mObjectOrdinal+1,numObjects)); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void onAttachedToWindow(final PurchaseActivity act, final int objectOrdinal) + { + int numObjects = RubikObjectList.getNumObjects(); + int width = act.getScreenWidthInPixels(); + mBarHeight = act.getHeightBar(); + mButtonSize = width*RubikActivity.BUTTON_TEXT_SIZE; + mObjectOrdinal = objectOrdinal; + + LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams(width/4, LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsM = new LinearLayout.LayoutParams(width/2, LinearLayout.LayoutParams.MATCH_PARENT); + LinearLayout.LayoutParams paramsR = new LinearLayout.LayoutParams(width/4, LinearLayout.LayoutParams.MATCH_PARENT); + + LinearLayout layoutLeft = new LinearLayout(act); + layoutLeft.setLayoutParams(paramsL); + LinearLayout layoutMid = new LinearLayout(act); + layoutMid.setLayoutParams(paramsM); + LinearLayout layoutRight= new LinearLayout(act); + layoutRight.setLayoutParams(paramsR); + + setupObjectButton(act,width); + setupPrevButton(act); + setupNextButton(act); + setupTextView(act,width,numObjects); + setupBackButton(act); + + layoutLeft.addView(mObjectButton); + layoutMid.addView(mPrevButton); + layoutMid.addView(mMovesText); + layoutMid.addView(mNextButton); + layoutRight.addView(mBackButton); + + LinearLayout layout = act.findViewById(R.id.lowerBar); + layout.removeAllViews(); + layout.addView(layoutLeft); + layout.addView(layoutMid); + layout.addView(layoutRight); + + mPane = new PurchaseScreenPane(act,mObjectOrdinal); + } +} diff --git a/src/main/java/org/distorted/purchase/PurchaseScreenPane.java b/src/main/java/org/distorted/purchase/PurchaseScreenPane.java new file mode 100644 index 00000000..6ae2c9d2 --- /dev/null +++ b/src/main/java/org/distorted/purchase/PurchaseScreenPane.java @@ -0,0 +1,197 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2020 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.purchase; + +import android.graphics.PorterDuff; +import android.util.TypedValue; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import android.widget.TextView; + +import org.distorted.main.R; +import org.distorted.objectlib.json.JsonReader; +import org.distorted.objects.RubikObject; +import org.distorted.objects.RubikObjectList; + +import java.io.InputStream; + +import static org.distorted.objectlib.main.TwistyObject.MESH_FAST; +import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class PurchaseScreenPane +{ + private static final int[] IDS = + { + R.id.purchaseDifficulty0, + R.id.purchaseDifficulty1, + R.id.purchaseDifficulty2, + R.id.purchaseDifficulty3, + R.id.purchaseDifficulty4 + }; + + private static final int[] IMAGES = + { + R.drawable.difficulty1, + R.drawable.difficulty2, + R.drawable.difficulty3, + R.drawable.difficulty4, + R.drawable.difficulty5, + }; + + private static final int NUM_IDS = IDS.length; + public static final float PADDING_RATIO = 0.025f; + private static final float TEXT_RATIO = 0.042f; + private static final float RADIO_RATIO = 0.900f; + + private int mObjectOrdinal; + private boolean mProgramatic; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void switchMeshState(PurchaseActivity act, int meshState) + { + RubikObjectList.setMeshState(mObjectOrdinal,meshState); + RubikObject object = RubikObjectList.getObject(mObjectOrdinal); + act.changeMeshState(object,mObjectOrdinal); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void updatePane(PurchaseActivity act, int objectOrdinal) + { + RubikObject object = RubikObjectList.getObject(objectOrdinal); + + if( object!=null ) + { + InputStream stream = object.getObjectStream(act); + + mObjectOrdinal = objectOrdinal; + JsonReader reader = JsonReader.getInstance(); + String name,author; + int year, difficulty; + + try + { + reader.parseJsonFileMetadata(stream); + name = reader.getObjectName(); + author = reader.getInventor(); + year = reader.getYearOfInvention(); + difficulty = reader.getComplexity(); + } + catch(Exception ex) + { + name = "?"; + author = "?"; + year = 0; + difficulty = 0; + } + + String both = year>0 ? author+" "+year : author; + + LinearLayout layout = act.findViewById(R.id.purchaseLayout); + TextView view = layout.findViewById(R.id.purchaseDetailsName2); + view.setText(name); + view = layout.findViewById(R.id.purchaseDetailsAuthor2); + view.setText(both); + + if( difficulty<0 ) difficulty=0; + if( difficulty>NUM_IDS ) difficulty=NUM_IDS; + + for(int i=0; imScreenWidth; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + ObjectControl getObjectControl() + { + return mObjectController; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// PUBLIC API +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public PurchaseSurfaceView(Context context, AttributeSet attrs) + { + super(context,attrs); + + mCreated = false; + + if(!isInEditMode()) + { + PurchaseActivity act = (PurchaseActivity)context; + PurchaseObjectLibInterface ref = new PurchaseObjectLibInterface(); + mObjectController = new ObjectControl(act,ref); + mObjectController.setRotateOnCreation(true); + mRenderer = new PurchaseRenderer(this); + + final ActivityManager activityManager= (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + + try + { + final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo(); + int esVersion = configurationInfo.reqGlEsVersion>>16; + setEGLContextClientVersion(esVersion); + setRenderer(mRenderer); + } + catch(Exception ex) + { + act.OpenGLError(); + + String shading = GLES30.glGetString(GLES30.GL_SHADING_LANGUAGE_VERSION); + String version = GLES30.glGetString(GLES30.GL_VERSION); + String vendor = GLES30.glGetString(GLES30.GL_VENDOR); + String renderer= GLES30.glGetString(GLES30.GL_RENDERER); + + FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + crashlytics.setCustomKey("GLSL Version" , shading ); + crashlytics.setCustomKey("GL version" , version ); + crashlytics.setCustomKey("GL Vendor " , vendor ); + crashlytics.setCustomKey("GLSL renderer" , renderer); + crashlytics.recordException(ex); + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onPause() + { + super.onPause(); + mObjectController.onPause(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onResume() + { + super.onResume(); + mObjectController.onResume(); + } +} + diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java index 7701f05c..cd0ec504 100644 --- a/src/main/java/org/distorted/screens/RubikScreenPlay.java +++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java @@ -201,12 +201,19 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd @Override public void onClick(View v) { - if( act.getControl().isUINotBlocked() && ScreenList.getCurrentScreen()== ScreenList.PLAY ) + if( obj!=null && act.getControl().isUINotBlocked() && ScreenList.getCurrentScreen()==ScreenList.PLAY ) { - RubikObjectList.setCurrObject(ordinal); - act.changeObject(ordinal,true); - if( mMenuPopup!=null ) setupLevelColors(act); - mMovesController.clearMoves(act); + if( obj.isFree() ) + { + RubikObjectList.setCurrObject(ordinal); + act.changeObject(ordinal,true); + if( mMenuPopup!=null ) setupLevelColors(act); + mMovesController.clearMoves(act); + } + else + { + act.switchToPurchase(ordinal); + } } if( mObjectPopup!=null ) mObjectPopup.dismiss(); diff --git a/src/main/java/org/distorted/tutorials/TutorialActivity.java b/src/main/java/org/distorted/tutorials/TutorialActivity.java index d35ca5bf..b0852ccf 100644 --- a/src/main/java/org/distorted/tutorials/TutorialActivity.java +++ b/src/main/java/org/distorted/tutorials/TutorialActivity.java @@ -22,8 +22,6 @@ import android.widget.LinearLayout; import androidx.appcompat.app.AppCompatActivity; -import com.google.firebase.analytics.FirebaseAnalytics; - import org.distorted.library.main.DistortedLibrary; import org.distorted.objectlib.main.ObjectControl; @@ -53,7 +51,6 @@ public class TutorialActivity extends AppCompatActivity | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - private FirebaseAnalytics mFirebaseAnalytics; private static int mScreenWidth, mScreenHeight; private int mCurrentApiVersion; private TutorialScreen mScreen; @@ -79,8 +76,6 @@ public class TutorialActivity extends AppCompatActivity mObjectOrdinal = b.getInt("obj"); } - mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); - DisplayMetrics displaymetrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getRealMetrics(displaymetrics); mScreenWidth =displaymetrics.widthPixels; @@ -238,13 +233,6 @@ public class TutorialActivity extends AppCompatActivity /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC API -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public FirebaseAnalytics getAnalytics() - { - return mFirebaseAnalytics; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public int getScreenWidthInPixels() diff --git a/src/main/res/layout/purchase.xml b/src/main/res/layout/purchase.xml new file mode 100644 index 00000000..9ba28e0f --- /dev/null +++ b/src/main/res/layout/purchase.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +