commit 9f00648149057e0330f9d26ed978a7fe2703a0ef Author: Leszek Koltunski Date: Wed Jun 30 14:17:38 2021 +0200 Add a 'give up' dialog - if one made at least 10 moves when solving and presses a 'back' button, one needs to confirm. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogAbandon.java b/src/main/java/org/distorted/dialogs/RubikDialogAbandon.java new file mode 100644 index 00000000..422e15db --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogAbandon.java @@ -0,0 +1,104 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2020 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +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.screens.ScreenList; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogAbandon extends AppCompatDialogFragment + { + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + final RubikActivity ract = (RubikActivity)getContext(); + + 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.abandon_solve, null); + builder.setView(view); + builder.setCancelable(true); + + builder.setPositiveButton( R.string.yes, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + ScreenList.goBack(ract); + } + }); + + builder.setNegativeButton( R.string.no, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + // empty + } + }); + + 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/helpers/MovesAndLockController.java b/src/main/java/org/distorted/helpers/MovesAndLockController.java index 972c0b34..5ba9bdea 100644 --- a/src/main/java/org/distorted/helpers/MovesAndLockController.java +++ b/src/main/java/org/distorted/helpers/MovesAndLockController.java @@ -232,7 +232,7 @@ public class MovesAndLockController implements MovesFinished public void addMove(TwistyActivity act, int axis, int row, int angle) { - if( mMoves.isEmpty()) changeBackMove(act,true); + if( mMoves.isEmpty() ) changeBackMove(act,true); mMoves.add(new Move(axis,row,angle)); } @@ -252,6 +252,13 @@ public class MovesAndLockController implements MovesFinished changeBackMove(act,false); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getNumMoves() + { + return mMoves.size(); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public void setupPrevButton(final TwistyActivity act, final float width) diff --git a/src/main/java/org/distorted/screens/RubikScreenBase.java b/src/main/java/org/distorted/screens/RubikScreenBase.java index be4ab6d7..bccea3be 100644 --- a/src/main/java/org/distorted/screens/RubikScreenBase.java +++ b/src/main/java/org/distorted/screens/RubikScreenBase.java @@ -37,6 +37,8 @@ abstract class RubikScreenBase extends RubikScreenAbstract void createBottomPane(final RubikActivity act, float width, ImageButton button) { + mController.clearMoves(act); + LinearLayout layoutBot = act.findViewById(R.id.lowerBar); layoutBot.removeAllViews(); diff --git a/src/main/java/org/distorted/screens/RubikScreenSolving.java b/src/main/java/org/distorted/screens/RubikScreenSolving.java index 8f665113..a926b64a 100644 --- a/src/main/java/org/distorted/screens/RubikScreenSolving.java +++ b/src/main/java/org/distorted/screens/RubikScreenSolving.java @@ -27,6 +27,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import org.distorted.dialogs.RubikDialogAbandon; import org.distorted.helpers.TransparentImageButton; import org.distorted.main.R; import org.distorted.main.RubikActivity; @@ -40,6 +41,8 @@ import java.util.TimerTask; public class RubikScreenSolving extends RubikScreenBase { + private static final int MOVES_THRESHHOLD = 10; + private TextView mTime; private Timer mTimer; private long mStartTime; @@ -98,7 +101,15 @@ public class RubikScreenSolving extends RubikScreenBase @Override public void onClick(View v) { - ScreenList.goBack(act); + if( mController.getNumMoves() > MOVES_THRESHHOLD ) + { + RubikDialogAbandon abaDiag = new RubikDialogAbandon(); + abaDiag.show(act.getSupportFragmentManager(), null); + } + else + { + ScreenList.goBack(act); + } } }); } diff --git a/src/main/res/layout/abandon_solve.xml b/src/main/res/layout/abandon_solve.xml new file mode 100644 index 00000000..afc04019 --- /dev/null +++ b/src/main/res/layout/abandon_solve.xml @@ -0,0 +1,22 @@ + + + + + diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 5b4ab396..a68b1df1 100755 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -39,6 +39,7 @@ 3x3x3 Löser Lernprogrammen Über die App + Gib auf Open Source App, die mit der Distorted Graphics Library entwickelt wurde. Lizenziert unter GPL Version 2 oder wie gewünscht einer späteren Version. Hübsche Muster von Walter Randelshofer. Sehen Sie http://www.randelshofer.ch diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index cb4442ea..037a83cc 100755 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -39,6 +39,7 @@ Solucionador Tutoriales Acerca de + Abandonar Aplicación de código abierto desarrollada con la biblioteca de gráficos de Distorted. Con licencia GPL versión 2 o, a tu elección, cualquier versión posterior. Pretty Patterns por Walter Randelshofer. Mira http://www.randelshofer.ch diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 2828dd85..881fb184 100755 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -39,6 +39,7 @@ Solutionneur Tutoriels À propos de + Abandonner Appli Open Source développée à l\'aide de la bibliothèque graphique Distorted. Sous licence GPL version 2 ou - à votre choix - toute version ultérieure. Pretty Patterns par Walter Randelshofer. Voir http://www.randelshofer.ch diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index a67bbaf2..a929a0e8 100755 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -39,6 +39,7 @@ 3x3x3 ソルバー チュートリアル アプリについて + あきらめる ディストートグラフィックのライブラリを使用して開発されたオープンソースアプリ。GPL バージョン 2でライセンスされているか、または-オプション-それ以降のすべてのバージョン。 Pretty Patterns 沿って Walter Randelshofer. 見る http://www.randelshofer.ch diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index a364e86c..d95fd49b 100755 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -39,6 +39,7 @@ 3x3x3 해결사 튜토리얼 정보 + 포기 왜곡된 그래픽 라이브러리를 사용하여 개발된 오픈 소스 앱. GPL 버전 2 또는 귀하의 선택에 따라 최신 버전으로 라이센스가 부여됩니다. Pretty Patterns 으로 Walter Randelshofer. 보다 http://www.randelshofer.ch diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index a4a648fe..b8f353bc 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -39,6 +39,7 @@ Rozwiązywacz Tutoriale O aplikacji + Zrezygnuj Aplikacja open-source napisana wykorzystując bibliotekę Distorted. Licencja: GPL wersja 2 albo jakakolwiek poźniejsza. Piękne Wzory Waltera Randelshofera. Zobacz http://www.randelshofer.ch diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 63410ab2..ad0d404a 100755 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -39,6 +39,7 @@ Решебник 3х3х3 Учебники О нас + Сдаться Приложение с открытым исходным кодом, разработанное с использованием библиотеки графики Искажений. Лицензируется согласно версии 2 GPL или любой более поздней версии по вашему выбору. Pretty Patterns по Walter Randelshofer. Смотри http://www.randelshofer.ch diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 067cdb81..aea4021f 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -39,6 +39,7 @@ 3x3x3求解器 讲解 关于 + 放弃 此应用程式原始码开发使用Distorted图型库。根据通用公共许可版本2或者任何更新版本（根据您的选择）进行许可。 Pretty Patterns by Werner Randelshofer. 請看 http://www.randelshofer.ch diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 677ded1d..12db4195 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -39,6 +39,7 @@ 3x3x3求解器 講解 關於 + 放棄 此應用程式原始碼開發使用Distorted圖型庫。根據通用公共許可版本2或者任何更新版本（根據您的選擇）進行許可。 Pretty Patterns by Werner Randelshofer. 請看 http://www.randelshofer.ch diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 02cc6c23..b8125f84 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -50,6 +50,7 @@ Please see and accept our Privacy Policy Accept Decline + Give up Error This device does not support OpenGL 3.0