commit 017f24b316ee8500a3c5d78dbbb187df013029b4 Author: leszek Date: Thu Nov 9 00:00:59 2023 +0100 new Pattern Activity! diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java index 26e29161..bc670649 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java @@ -26,15 +26,15 @@ import org.distorted.main.R; class RubikDialogPatternListAdapter extends BaseExpandableListAdapter { private final Context mContext; - private final int mTab, mWidth; + private final int mTab, mHeight; /////////////////////////////////////////////////////////////////////////////////////////////////// - public RubikDialogPatternListAdapter(Context context, int tab, int width) + public RubikDialogPatternListAdapter(Context context, int tab, int height) { mContext = context; mTab = tab; - mWidth = width; + mHeight = height; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -67,7 +67,7 @@ class RubikDialogPatternListAdapter extends BaseExpandableListAdapter view = infalInflater.inflate(R.layout.dialog_pattern_child_item, null); } - int size = (int)(mWidth* RubikActivity.PATTERN_CHILD_TEXT); + int size = (int)(mHeight* RubikActivity.PATTERN_CHILD_TEXT); TextView childItem = view.findViewById(R.id.child); childItem.setText(childName); @@ -124,7 +124,7 @@ class RubikDialogPatternListAdapter extends BaseExpandableListAdapter view = inf.inflate(R.layout.dialog_pattern_group_item, null); } - int size = (int)(mWidth* RubikActivity.PATTERN_GROUP_TEXT); + int size = (int)(mHeight* RubikActivity.PATTERN_GROUP_TEXT); TextView heading = view.findViewById(R.id.heading); heading.setText(groupName); diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPatternSingle.java b/src/main/java/org/distorted/dialogs/RubikDialogPatternSingle.java index 9e996ab0..0da76e79 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPatternSingle.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPatternSingle.java @@ -47,14 +47,14 @@ public class RubikDialogPatternSingle extends RubikDialogAbstract { WindowManager.LayoutParams params = window.getAttributes(); params.width = (int)Math.min( mHeight*0.65f,mWidth*0.98f ); - params.height = (int)Math.min( mHeight*0.80f,mWidth*1.30f ); + //params.height = (int)Math.min( mHeight*0.80f,mWidth*1.30f ); window.setAttributes(params); } } /////////////////////////////////////////////////////////////////////////////////////////////////// - public int getResource() { return R.layout.dialog_pattern_tab; } + public int getResource() { return R.layout.dialog_pattern_single; } public int getTitleResource() { return R.string.choose_pattern; } public boolean hasArgument() { return true; } public int getPositive() { return -1; } @@ -82,6 +82,8 @@ public class RubikDialogPatternSingle extends RubikDialogAbstract return; } + android.util.Log.e("D", "prepareBody: object "+mArgument); + final PatternActivity pact = (PatternActivity)getContext(); int height = pact!=null ? pact.getScreenHeightInPixels() : 100; final ObjectControl control = pact!=null ? pact.getControl() : null; @@ -93,15 +95,11 @@ public class RubikDialogPatternSingle extends RubikDialogAbstract RubikDialogPatternListAdapter listAdapter = new RubikDialogPatternListAdapter(act,mPatternOrdinal,height); mListView.setAdapter(listAdapter); - if( mExpandedGroup>=0 ) - { - mListView.expandGroup(mExpandedGroup); - } + if( mExpandedGroup>=0 ) mListView.expandGroup(mExpandedGroup); int visible = pattern.recallVisiblePos(mPatternOrdinal); mListView.setSelectionFromTop(visible,0); - mListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override @@ -109,7 +107,7 @@ public class RubikDialogPatternSingle extends RubikDialogAbstract { RubikPattern pattern = RubikPattern.getInstance(); int[][] moves = pattern.reInitialize(mPatternOrdinal, groupPosition, childPosition); - control.initializeObject(moves); + if( control!=null ) control.initializeObject(moves); ScreenPattern state = (ScreenPattern) ScreenList.PATT.getScreenClass(); state.setPattern(pact, mPatternOrdinal, groupPosition, childPosition); diff --git a/src/main/java/org/distorted/patternui/PatternActivity.java b/src/main/java/org/distorted/patternui/PatternActivity.java index d13e3f92..ba9b27a4 100644 --- a/src/main/java/org/distorted/patternui/PatternActivity.java +++ b/src/main/java/org/distorted/patternui/PatternActivity.java @@ -46,7 +46,7 @@ public class PatternActivity extends AppCompatActivity public static final float PADDING = 0.010f; public static final float SMALL_MARGIN = 0.004f; public static final float BUTTON_TEXT_SIZE= 0.050f; - public static final float TITLE_TEXT_SIZE = 0.060f; + public static final float TITLE_TEXT_SIZE = 0.045f; private static final int ACTIVITY_NUMBER = 1; private static final float RATIO_INSET= 0.09f; @@ -194,9 +194,8 @@ public class PatternActivity extends AppCompatActivity createObject(); RubikObjectList.setCurrObject(mObjectOrdinal); - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); - restorePreferences(preferences,mJustStarted); + restorePreferences(preferences); ScreenList.setScreen(this); if( mJustStarted ) @@ -222,18 +221,10 @@ public class PatternActivity extends AppCompatActivity SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences.Editor editor = preferences.edit(); - for(int i = 0; i< ScreenList.LENGTH; i++ ) - { + for(int i=0; i< ScreenList.LENGTH; i++ ) ScreenList.getScreen(i).getScreenClass().savePreferences(editor); - } - RubikObjectList.savePreferences(editor); - RubikObjectList.saveMeshState(editor); ScreenList.savePreferences(editor); - PatternSurfaceView view = findViewById(R.id.patternSurfaceView); - OSInterface os = view.getInterface(); - os.setEditor(editor); - view.getObjectControl().savePreferences(); boolean success = editor.commit(); if( !success ) android.util.Log.e("D", "Failed to save preferences"); @@ -241,21 +232,12 @@ public class PatternActivity extends AppCompatActivity /////////////////////////////////////////////////////////////////////////////////////////////////// - private void restorePreferences(SharedPreferences preferences, boolean justStarted) + private void restorePreferences(SharedPreferences preferences) { - RubikObjectList.restorePreferences(this,preferences,justStarted); - - for (int i = 0; i=0 ) + { + RubikPattern pattern = RubikPattern.getInstance(); + ObjectControl control = act.getControl(); + pattern.backMove(control, mPatternOrdinal, mCategory, mPattern); + int currMove = pattern.getCurMove(mPatternOrdinal, mCategory, mPattern); + mMovesText.setText(act.getString(R.string.mo_placeholder, currMove, mNumMoves)); + } } }); } @@ -160,11 +238,14 @@ public class ScreenPattern extends ScreenAbstract @Override public void onClick(View v) { - RubikPattern pattern = RubikPattern.getInstance(); - ObjectControl control = act.getControl(); - pattern.makeMove( control, mPatternOrdinal, mCategory, mPattern); - int currMove = pattern.getCurMove(mPatternOrdinal, mCategory, mPattern); - mMovesText.setText(act.getString(R.string.mo_placeholder,currMove,mNumMoves)); + if( mPatternOrdinal>=0 ) + { + RubikPattern pattern = RubikPattern.getInstance(); + ObjectControl control = act.getControl(); + pattern.makeMove(control, mPatternOrdinal, mCategory, mPattern); + int currMove = pattern.getCurMove(mPatternOrdinal, mCategory, mPattern); + mMovesText.setText(act.getString(R.string.mo_placeholder, currMove, mNumMoves)); + } } }); } @@ -201,7 +282,7 @@ public class ScreenPattern extends ScreenAbstract RubikPattern patt = RubikPattern.getInstance(); String patternName = patt.getPatternName(ordinal,category,pattern); - mText.setText(patternName); + mTextButton.setText(patternName); mNumMoves = patt.getNumMoves(ordinal,category,pattern); int currMove= patt.getCurMove(ordinal,category,pattern); @@ -209,6 +290,66 @@ public class ScreenPattern extends ScreenAbstract mMovesText.setText(act.getString(R.string.mo_placeholder,currMove,mNumMoves)); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void prevPattern(final PatternActivity act) + { + RubikPattern patt = RubikPattern.getInstance(); + + if( mPattern>0 ) + { + setPattern(act,mPatternOrdinal,mCategory,mPattern-1); + } + else + { + if( mCategory>0 ) + { + int numPat = patt.getNumPatterns(mPatternOrdinal,mCategory-1); + setPattern(act,mPatternOrdinal,mCategory-1,numPat-1); + } + else + { + int numCat = patt.getNumCategories(mPatternOrdinal); + int numPat = patt.getNumPatterns(mPatternOrdinal,numCat-1); + setPattern(act,mPatternOrdinal,numCat-1,numPat-1); + } + } + + int[][] moves = patt.reInitialize(mPatternOrdinal, mCategory, mPattern); + ObjectControl control = act.getControl(); + if( control!=null ) control.initializeObject(moves); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void nextPattern(final PatternActivity act) + { + RubikPattern patt = RubikPattern.getInstance(); + int numPat = patt.getNumPatterns(mPatternOrdinal,mCategory); + + if( mPattern + + + + +