commit 61a7b812f163308c3811fadd291ed43bebec0a8e Author: Leszek Koltunski Date: Sat Mar 26 00:32:27 2022 +0100 Bandaged 3x3: saving dialog. diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java index 7f1730b1..1e3f26bd 100644 --- a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java +++ b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java @@ -24,6 +24,7 @@ import javax.microedition.khronos.opengles.GL10; import android.opengl.GLSurfaceView; +import org.distorted.dialogs.RubikDialogSaveBandaged; import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; @@ -316,7 +317,9 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte public void saveObject() { - + BandagedCreatorActivity act = (BandagedCreatorActivity)mView.getContext(); + RubikDialogSaveBandaged saveDiag = new RubikDialogSaveBandaged(); + saveDiag.show(act.getSupportFragmentManager(), null); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/dialogs/RubikDialogSaveBandaged.java b/src/main/java/org/distorted/dialogs/RubikDialogSaveBandaged.java new file mode 100644 index 00000000..aa25303a --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogSaveBandaged.java @@ -0,0 +1,112 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2022 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.view.WindowManager; +import android.widget.Button; +import android.widget.TextView; + +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; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogSaveBandaged 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 titleSize= displaymetrics.widthPixels * RubikActivity.MENU_BIG_TEXT_SIZE; + final float okSize = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE; + + TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null); + tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleSize); + tv.setText( R.string.save_object ); + builder.setCustomTitle(tv); + + final View view = inflater.inflate(R.layout.dialog_save_object, null); + + builder.setCancelable(true); + + builder.setPositiveButton( R.string.yes, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + + } + }); + + builder.setNegativeButton( R.string.no, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + + } + }); + + builder.setView(view); + final Dialog dialog = builder.create(); + dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + + 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, okSize); + Button btnNegative = ((AlertDialog)dialog).getButton(Dialog.BUTTON_NEGATIVE); + btnNegative.setTextSize(TypedValue.COMPLEX_UNIT_PX, okSize); + } + }); + + return dialog; + } + } diff --git a/src/main/java/org/distorted/dialogs/RubikDialogSetName.java b/src/main/java/org/distorted/dialogs/RubikDialogSetName.java index 197ecbc6..9715ace0 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogSetName.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogSetName.java @@ -183,7 +183,7 @@ public class RubikDialogSetName extends AppCompatDialogFragment if( window!=null ) { - window.getDecorView().setSystemUiVisibility(RubikActivity.FLAGS2); + window.getDecorView().setSystemUiVisibility(RubikActivity.FLAGS); } dialog.setOnShowListener(new DialogInterface.OnShowListener() diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java index 331c40cd..b7205b32 100644 --- a/src/main/java/org/distorted/main/RubikActivity.java +++ b/src/main/java/org/distorted/main/RubikActivity.java @@ -95,9 +95,6 @@ public class RubikActivity extends AppCompatActivity | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - public static final int FLAGS2= View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - private static final int ACTIVITY_NUMBER = 0; private static final float RATIO_BAR = 0.10f; private static final float RATIO_INSET= 0.09f; diff --git a/src/main/res/layout/dialog_save_object.xml b/src/main/res/layout/dialog_save_object.xml new file mode 100644 index 00000000..424e8773 --- /dev/null +++ b/src/main/res/layout/dialog_save_object.xml @@ -0,0 +1,31 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f63a5231..5b50ab4e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -38,6 +38,8 @@ Success View Full Scramble + Save Object + Do you want to save this Bandaged 3x3? High Scores Pretty Patterns