commit 5a4ee1698102f856587da894326d171db90e0f72 Author: leszek Date: Tue Jul 25 21:43:18 2023 +0200 Progress with Bandaged UI. diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java index 5de230ac..4718df4a 100644 --- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java +++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java @@ -59,6 +59,7 @@ public class BandagedCreatorActivity extends AppCompatActivity private int mCurrentApiVersion; private BandagedCreatorScreen mScreen; private boolean mRTL; + private int mObjectOrdinal; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -79,6 +80,9 @@ public class BandagedCreatorActivity extends AppCompatActivity final int layoutDirection = config.getLayoutDirection(); mRTL = layoutDirection==LAYOUT_DIRECTION_RTL; + Bundle b = getIntent().getExtras(); + mObjectOrdinal = (b != null) ? b.getInt("obj") : 0; + hideNavigationBar(); cutoutHack(); computeHeights(); @@ -338,7 +342,7 @@ public class BandagedCreatorActivity extends AppCompatActivity public int getObjectOrdinal() { - return 0; + return mObjectOrdinal; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/dialogs/RubikDialogCreatorView.java b/src/main/java/org/distorted/dialogs/RubikDialogCreatorView.java new file mode 100644 index 00000000..68812b9a --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogCreatorView.java @@ -0,0 +1,70 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogCreatorView + { + private final View mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public RubikDialogCreatorView(final RubikActivity act, final RubikDialogCreators dialog, + final int index, int icon, int title, int desc, int padding, int fontSize, + LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt ) + { + mView = act.getLayoutInflater().inflate(R.layout.dialog_creators_pane, null); + mView.setLayoutParams(pView); + mView.setPadding(padding,padding,padding,padding); + + TextView titleView = mView.findViewById(R.id.creators_pane_title); + titleView.setText(title); + TextView descView = mView.findViewById(R.id.creators_pane_description); + descView.setText(desc); + + titleView.setLayoutParams(pText); + + ImageView iconView = mView.findViewById(R.id.creators_pane_image); + iconView.setImageResource(icon); + + Button button = mView.findViewById(R.id.creators_pane_button); + + button.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + dialog.dismiss(); + act.switchToBandagedCreator(index); + } + }); + + button.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize); + button.setLayoutParams(pButt); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public View getView() + { + return mView; + } + } diff --git a/src/main/java/org/distorted/dialogs/RubikDialogCreators.java b/src/main/java/org/distorted/dialogs/RubikDialogCreators.java new file mode 100644 index 00000000..7f6e0a54 --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogCreators.java @@ -0,0 +1,154 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.app.Dialog; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.fragment.app.FragmentActivity; + +import org.distorted.main.R; +import org.distorted.main.RubikActivity; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogCreators extends RubikDialogAbstract + { + private enum BandagedObjectDescription + { + CUBOID ( org.distorted.objectlib.R.drawable.cu_232, R.string.creator_cuboid_title , R.string.creator_cuboid_desc ), + PYRAMINX ( org.distorted.objectlib.R.drawable.pyra_3, R.string.creator_pyraminx_title, R.string.creator_pyraminx_desc ), + ; + + public static final int NUM_OBJECTS = values().length; + private static final BandagedObjectDescription[] objects; + + final int mIcon, mTitle, mDescription; + + BandagedObjectDescription(int icon, int title, int descripton) + { + mIcon = icon; + mTitle = title; + mDescription = descripton; + } + + static + { + int i=0; + objects = new BandagedObjectDescription[NUM_OBJECTS]; + for( BandagedObjectDescription object: BandagedObjectDescription.values() ) objects[i++] = object; + } + + //////////////////////////////////////////////////////////////////////// + + static int getIcon(int ordinal) + { + return objects[ordinal].mIcon; + } + + //////////////////////////////////////////////////////////////////////// + + static int getTitle(int ordinal) + { + return objects[ordinal].mTitle; + } + + //////////////////////////////////////////////////////////////////////// + + static int getDescription(int ordinal) + { + return objects[ordinal].mDescription; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @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.65f,mWidth*0.98f ); + window.setAttributes(params); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getResource() { return R.layout.dialog_scrollable_panes; } + public int getTitleResource() { return R.string.bandaged; } + 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 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); + + 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); + + int num = BandagedObjectDescription.NUM_OBJECTS; + RubikActivity ract = (RubikActivity) getContext(); + + for(int i=0; i + + + + + + + + + + +