commit 3bedda3007d26fd9eecd17159d3e41a3154fbe26 Author: leszek Date: Sat Dec 21 23:09:26 2024 +0100 Full support for multiple solvers per object. 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..3906b643 --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogSolverView.java @@ -0,0 +1,72 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.LinearLayout; +import android.widget.TextView; + +import org.distorted.main.R; +import org.distorted.objectlib.main.TwistyObject; +import org.distorted.solvers.SolvingList; +import org.distorted.solvers.SolvingThread; +import org.distorted.solverui.SolverActivity; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogSolverView + { + private final View mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public RubikDialogSolverView(final SolverActivity act, final RubikDialogSolvers dialog, + int solverOrdinal, int title, int desc, 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); + Button button = mView.findViewById(R.id.solvers_pane_button); + + button.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + dialog.dismiss(); + SolvingList list = SolvingList.getSolver(solverOrdinal); + TwistyObject object = act.getObject(); + SolvingThread solver = new SolvingThread( act.getInterface(), act.getResources(), object, list ); + solver.start(); + } + }); + + 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..da6ac5ca --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogSolvers.java @@ -0,0 +1,101 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.util.DisplayMetrics; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.LinearLayout; +import android.widget.ScrollView; +import android.widget.TextView; + +import androidx.fragment.app.FragmentActivity; + +import org.distorted.main.R; +import org.distorted.objectlib.metadata.ListObjects; +import org.distorted.solverui.SolverActivity; +import org.distorted.solvers.SolvingList; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogSolvers extends RubikDialogAbstract + { + @Override + public void onResume() + { + super.onResume(); + + Window window = getDialog().getWindow(); + + if( window!=null ) + { + WindowManager.LayoutParams params = window.getAttributes(); + params.width = (int)Math.min( mHeight*0.60f,mWidth*0.75f ); + window.setAttributes(params); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getResource() { return R.layout.dialog_scrollable_panes; } + public int getTitleResource() { return R.string.solver; } + public boolean hasArgument() { return true; } + public int getPositive() { return -1; } + public int getNegative() { return -1; } + public static String getDialogTag() { return "DialogSolvers"; } + public void positiveAction() { } + public void negativeAction() { } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void prepareBody(Dialog dialog, View view, FragmentActivity act, float size) + { + int margin= (int)(mHeight*0.010f); + int padd = (int)(mHeight*0.010f); + int font = (int)(mHeight*0.025f); + + LinearLayout layout= view.findViewById(R.id.dialog_scrollable_main_layout); + TextView text = view.findViewById(R.id.dialog_scrollable_message); + text.setVisibility(View.GONE); + + DisplayMetrics metrics = new DisplayMetrics(); + act.getWindowManager().getDefaultDisplay().getMetrics(metrics); + float logicalDensity = metrics.density; + int px = (int) Math.ceil(10*logicalDensity); + ScrollView scroll = view.findViewById(R.id.updates_scroll); + scroll.setPadding(px,0,px,px); + + LinearLayout.LayoutParams pV = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); + pV.setMargins(margin, margin, margin, 0); + LinearLayout.LayoutParams pL = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); + pL.setMargins(margin, margin, margin, margin); + LinearLayout.LayoutParams pT = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); + pT.setMargins(0,0,0,2*margin); + LinearLayout.LayoutParams pB = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); + pB.setMargins(0,2*margin,0,0); + + SolverActivity sact = (SolverActivity) getContext(); + int objectOrdinal = ListObjects.getObjectIndex(mArgument); + int[] solverOrdinals = SolvingList.getSolverOrdinals(objectOrdinal); + int len = solverOrdinals==null ? 0 : solverOrdinals.length; + + for(int o=0; o + android:orientation="vertical"> - + - + - +