commit 93a1c3642f176e848f2b4b5a38f11cbfc8ff40a4 Author: Leszek Koltunski Date: Sat Jan 21 01:02:05 2023 +0100 Introduce RubikDialogSolvers. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogSolverView.java b/src/main/java/org/distorted/dialogs/RubikDialogSolverView.java new file mode 100644 index 00000000..42f3a2ec --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogSolverView.java @@ -0,0 +1,74 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2023 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.util.TypedValue; +import android.view.View; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import org.distorted.main.R; +import org.distorted.main.RubikActivity; +import org.distorted.objects.RubikObject; +import org.distorted.objects.RubikObjectList; +import org.distorted.screens.ScreenList; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogSolverView + { + private final View mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public RubikDialogSolverView(final RubikActivity act, final RubikDialogSolvers dialog, int object, int title, int desc, boolean implemented, int padding, int fontSize, + LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt ) + { + mView = act.getLayoutInflater().inflate(R.layout.dialog_solvers_pane, null); + mView.setLayoutParams(pView); + mView.setPadding(padding,padding,padding,padding); + + TextView titleView = mView.findViewById(R.id.solvers_pane_title); + titleView.setText(title); + TextView descView = mView.findViewById(R.id.solvers_pane_description); + descView.setText(desc); + + titleView.setLayoutParams(pText); + descView.setLayoutParams(pText); + + ImageView icon = mView.findViewById(R.id.solvers_pane_image); + RubikObject robject = RubikObjectList.getObject(object); + if( robject!=null ) robject.setIconTo(act,icon); + + Button button = mView.findViewById(R.id.solvers_pane_button); + + button.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + dialog.dismiss(); + ScreenList.switchScreen(act, ScreenList.SVER); + } + }); + + button.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize); + button.setLayoutParams(pButt); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public View getView() + { + return mView; + } + } diff --git a/src/main/java/org/distorted/dialogs/RubikDialogSolvers.java b/src/main/java/org/distorted/dialogs/RubikDialogSolvers.java new file mode 100644 index 00000000..df5022e0 --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogSolvers.java @@ -0,0 +1,93 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.fragment.app.FragmentActivity; + +import org.distorted.main.R; +import org.distorted.main.RubikActivity; +import org.distorted.solvers.ImplementedSolversList; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogSolvers extends RubikDialogAbstract + { + public int getResource() { return R.layout.dialog_scrollable_panes; } + public int getTitleResource() { return R.string.solver; } + public boolean hasArgument() { return false; } + public int getPositive() { return R.string.ok; } + public int getNegative() { return -1; } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void positiveAction() + { + + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void negativeAction() + { + + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void prepareBody(Dialog dialog, View view, FragmentActivity act, float size) + { + int minH = (int)(mHeight*0.25f); + int margin= (int)(mHeight*0.01f); + int sizeH = (int)(mHeight*0.14f); + int textH = (int)(sizeH*0.27f); + int buttH = (int)(sizeH*0.35f); + int padd = (int)(mHeight*0.01f); + int font = (int)(mHeight*0.02f); + + LinearLayout layout= view.findViewById(R.id.updates_main_layout); + TextView text = view.findViewById(R.id.updates_message); + text.setVisibility(View.GONE); + + layout.setMinimumHeight(minH); + view.setMinimumHeight(minH); + + LinearLayout.LayoutParams pV = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, sizeH ); + pV.setMargins(margin, margin, margin, 0); + LinearLayout.LayoutParams pT = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, textH ); + LinearLayout.LayoutParams pB = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, buttH ); + + int num = ImplementedSolversList.NUM_OBJECTS; + RubikActivity ract = (RubikActivity) getContext(); + + for(int i=0; i(act); mSolving = false; - int currentObject= ImplementedSolversList.getObject(0); + int currentObject= ObjectSignatures.CUBE_3;//ImplementedSolversList.getObject(0); //TODO act.changeIfDifferent(currentObject,control); control.solveOnly(); diff --git a/src/main/java/org/distorted/solvers/ImplementedSolversList.java b/src/main/java/org/distorted/solvers/ImplementedSolversList.java index 449d48d0..276cd1ff 100644 --- a/src/main/java/org/distorted/solvers/ImplementedSolversList.java +++ b/src/main/java/org/distorted/solvers/ImplementedSolversList.java @@ -9,18 +9,24 @@ package org.distorted.solvers; +import org.distorted.main.R; import org.distorted.objectlib.main.ObjectSignatures; /////////////////////////////////////////////////////////////////////////////////////////////////// public enum ImplementedSolversList { - CUBE3 (ObjectSignatures.CUBE_3), + CUBE3_KOCIEMBA (ObjectSignatures.CUBE_3, R.string.solver_cube3_title, R.string.solver_cube3_description, true), + PYRAMINX (ObjectSignatures.PYRA_3, R.string.solver_pyra3_title, R.string.solver_pyra3_description, false), + IVY (ObjectSignatures.IVY_2 , R.string.solver_ivy_title, R.string.solver_ivy_description, false), ; public static final int NUM_OBJECTS = values().length; private final int mObject; + private final int mTitle; + private final int mDescription; + private final boolean mImplemented; private static final ImplementedSolversList[] objects; @@ -37,15 +43,46 @@ public enum ImplementedSolversList /////////////////////////////////////////////////////////////////////////////////////////////////// - public static int getObject(int ordinal) + public static ImplementedSolversList getSolver(int ordinal) { - return objects[ordinal].mObject; + return objects[ordinal]; } /////////////////////////////////////////////////////////////////////////////////////////////////// - ImplementedSolversList(int object) + ImplementedSolversList(int object, int title, int descripton, boolean implemented) { - mObject= object; + mObject = object; + mTitle = title; + mDescription = descripton; + mImplemented = implemented; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getObject() + { + return mObject; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getTitle() + { + return mTitle; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getDescription() + { + return mDescription; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public boolean isImplemented() + { + return mImplemented; } } diff --git a/src/main/res/layout/dialog_scrollable_panes.xml b/src/main/res/layout/dialog_scrollable_panes.xml new file mode 100644 index 00000000..f01de2c4 --- /dev/null +++ b/src/main/res/layout/dialog_scrollable_panes.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/dialog_solvers_pane.xml b/src/main/res/layout/dialog_solvers_pane.xml new file mode 100644 index 00000000..a8bbcc52 --- /dev/null +++ b/src/main/res/layout/dialog_solvers_pane.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + +