commit 1250d52b5ae5705f19e31d58d9144b029836c8ae Author: Leszek Koltunski Date: Sun Nov 16 23:10:55 2025 +0100 minor diff --git a/src/main/java/org/distorted/dialogs/DialogAbandon.java b/src/main/java/org/distorted/dialogs/DialogAbandon.java deleted file mode 100644 index 2b711f57..00000000 --- a/src/main/java/org/distorted/dialogs/DialogAbandon.java +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// 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.dialogs; - -import android.app.Dialog; -import android.util.TypedValue; -import android.view.View; -import android.widget.TextView; - -import androidx.fragment.app.FragmentActivity; - -import org.distorted.main.R; -import org.distorted.play.PlayActivity; -import org.distorted.play.ScreenList; -import org.distorted.play.ScreenSolving; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class DialogAbandon extends DialogAbstract - { - public int getResource() { return R.layout.dialog_message; } - public int getTitleResource() { return R.string.abandon_solve; } - public boolean hasArgument() { return false; } - public int getPositive() { return R.string.yes; } - public int getNeutral() { return R.string.cancel; } - public int getNegative() { return R.string.no; } - public void neutralAction() { } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void negativeAction() - { - final PlayActivity act = (PlayActivity)getContext(); - ScreenList.goBack(act); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void positiveAction() - { - final PlayActivity act = (PlayActivity)getContext(); - - if( act!=null ) - { - ScreenSolving solving = (ScreenSolving)ScreenList.SOLV.getScreenClass(); - int time = solving.stopTimerAndGetRecord(); - act.rememberSolve(time); - ScreenList.goBack(act); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void prepareBody(Dialog dialog, View view, FragmentActivity act, float size) - { - TextView mess = view.findViewById(R.id.dialog_message); - mess.setText(R.string.come_back_later); - mess.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); - } - } diff --git a/src/main/java/org/distorted/dialogs/DialogAbout.java b/src/main/java/org/distorted/dialogs/DialogAbout.java index 34526b5d..8cf8b7ec 100644 --- a/src/main/java/org/distorted/dialogs/DialogAbout.java +++ b/src/main/java/org/distorted/dialogs/DialogAbout.java @@ -33,7 +33,7 @@ import org.distorted.main.R; public class DialogAbout extends DialogAbstract { private static final String WHATS_NEW = - "1. If you made at least 7 moves, then the solve attempt gets automatically remembered. You can resume your solve at any later time.\n" + + "1. You can now save your ongoing solves and resume them at any later time.\n" + "2. A fix to the solved-state detection of the Container.\n" + "3. Every tutorial has been checked and a few non-working ones have beed replaced.\n" + "4. Fixes for scrambling: now (almost!) every puzzle should scramble perfectly, i.e. every scramble in level N should be exactly N moves from the solved state." diff --git a/src/main/java/org/distorted/dialogs/DialogRememberSolve.java b/src/main/java/org/distorted/dialogs/DialogRememberSolve.java new file mode 100644 index 00000000..5830e90f --- /dev/null +++ b/src/main/java/org/distorted/dialogs/DialogRememberSolve.java @@ -0,0 +1,67 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.dialogs; + +import android.app.Dialog; +import android.util.TypedValue; +import android.view.View; +import android.widget.TextView; + +import androidx.fragment.app.FragmentActivity; + +import org.distorted.main.R; +import org.distorted.play.PlayActivity; +import org.distorted.play.ScreenList; +import org.distorted.play.ScreenSolving; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class DialogRememberSolve extends DialogAbstract + { + public int getResource() { return R.layout.dialog_message; } + public int getTitleResource() { return R.string.abandon_solve; } + public boolean hasArgument() { return false; } + public int getPositive() { return R.string.yes; } + public int getNeutral() { return R.string.cancel; } + public int getNegative() { return R.string.no; } + public void neutralAction() { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void negativeAction() + { + final PlayActivity act = (PlayActivity)getContext(); + ScreenList.goBack(act); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void positiveAction() + { + final PlayActivity act = (PlayActivity)getContext(); + + if( act!=null ) + { + ScreenSolving solving = (ScreenSolving)ScreenList.SOLV.getScreenClass(); + int time = solving.stopTimerAndGetRecord(); + act.rememberSolve(time); + ScreenList.goBack(act); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void prepareBody(Dialog dialog, View view, FragmentActivity act, float size) + { + TextView mess = view.findViewById(R.id.dialog_message); + mess.setText(R.string.come_back_later); + mess.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); + } + } diff --git a/src/main/java/org/distorted/play/ScreenSolving.java b/src/main/java/org/distorted/play/ScreenSolving.java index eaed16ef..173f58ee 100644 --- a/src/main/java/org/distorted/play/ScreenSolving.java +++ b/src/main/java/org/distorted/play/ScreenSolving.java @@ -17,7 +17,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import org.distorted.dialogs.DialogAbandon; +import org.distorted.dialogs.DialogRememberSolve; import org.distorted.helpers.RubikScores; import org.distorted.helpers.TransparentImageButton; import org.distorted.main.R; @@ -85,7 +85,7 @@ public class ScreenSolving extends ScreenBase { if( mMovesController.getNumMoves() > MOVES_THRESHHOLD ) { - DialogAbandon abaDiag = new DialogAbandon(); + DialogRememberSolve abaDiag = new DialogRememberSolve(); abaDiag.show(act.getSupportFragmentManager(), null); } else