/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 15846fe4

Added by Leszek Koltunski over 4 years ago

ID 15846fe4cbf48884b6642355d13f47162191fdaa
Parent e03e0352
Child 40c8c5fa

cube_back and cube_solve buttons.

     import org.distorted.objects.RubikObjectMovement;
     import org.distorted.solvers.SolverMain;
     import org.distorted.states.RubikState;
     import org.distorted.states.RubikStatePlay;
     import org.distorted.states.RubikStateSolver;
     import org.distorted.states.RubikStateSolving;
-...
           int angle = mPreRender.getObject().computeNearestAngle(mCurrentAngle, mCurrRotSpeed);
           mPreRender.finishRotation(angle);
           if( RubikState.getCurrentState()==RubikState.SOLV && angle!=0 )
           if( angle!=0 )
+            {
             RubikStateSolving solving = (RubikStateSolving)RubikState.SOLV.getStateClass();
             solving.addMove(mCurrentAxis, mCurrentRow, angle);
             if( RubikState.getCurrentState()==RubikState.SOLV )
+              {
               RubikStateSolving solving = (RubikStateSolving)RubikState.SOLV.getStateClass();
               solving.addMove(mCurrentAxis, mCurrentRow, angle);
+              }
             if( RubikState.getCurrentState()==RubikState.PLAY )
+              {
               RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass();
               play.addMove(mCurrentAxis, mCurrentRow, angle);
+              }
+            }
           mContinuingRotation = false;

     import org.distorted.dialogs.RubikDialogScores;
     import org.distorted.main.R;
     import org.distorted.main.RubikActivity;
     import org.distorted.main.RubikPreRender;
     import org.distorted.objects.RubikObject;
     import org.distorted.objects.RubikObjectList;
     import java.util.ArrayList;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikStatePlay extends RubikStateAbstract implements AdapterView.OnItemSelectedListener
     public class RubikStatePlay extends RubikStateAbstract implements AdapterView.OnItemSelectedListener,
                                                                       RubikPreRender.ActionFinishedListener
+      {
       private static final int DURATION_MILLIS = 750;
       private static final int DEF_LEVEL =  1;
       public  static final int DEF_OBJECT= RubikObjectList.CUBE.ordinal();
       public  static final int DEF_SIZE  =  3;
-...
       private static int[] BUTTON_LABELS = { R.string.scores, R.string.patterns, R.string.solver, R.string.about };
       private static final int NUM_BUTTONS = BUTTON_LABELS.length;
       private ImageButton mObjButton, mMenuButton;
       private Button mBackButton, mSolveButton, mPlayButton;
       private ImageButton mObjButton, mMenuButton, mPrevButton, mSolveButton;
       private Button mPlayButton;
       private PopupWindow mObjectPopup, mMenuPopup;
       private int mObject = DEF_OBJECT;
       private int mSize   = DEF_SIZE;
-...
       private int mLevelValue;
       private float mButtonSize, mTitleSize;
       private ArrayList<Move> mMoves;
       private boolean mCanPrevMove;
       private static class Move
+        {
         private int mAxis, mRow, mAngle;
         Move(int axis, int row, int angle)
+          {
           mAxis = axis;
           mRow  = row;
           mAngle= angle;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void leaveState(RubikActivity act)
-...
         mButtonSize = width*RubikActivity.BUTTON_TEXT_SIZE;
         mTitleSize  = width*RubikActivity.TITLE_TEXT_SIZE;
         mCanPrevMove = true;
         if( mMoves==null ) mMoves = new ArrayList<>();
         else               mMoves.clear();
         // TOP ////////////////////////////
         LinearLayout layoutTop = act.findViewById(R.id.upperBar);
         layoutTop.removeAllViews();
-...
         LinearLayout layoutLeft = act.findViewById(R.id.mainBarLeft);
         layoutLeft.removeAllViews();
         setupMenuButton(act,scale,width);
         layoutLeft.addView(mMenuButton);
         setupSolveButton(act,scale);
         setupPrevButton(act,scale,width);
         layoutLeft.addView(mPrevButton);
         setupSolveButton(act,scale,width);
         layoutLeft.addView(mSolveButton);
         LinearLayout layoutRight = act.findViewById(R.id.mainBarRight);
         layoutRight.removeAllViews();
         setupBackButton(act,scale);
         layoutRight.addView(mBackButton);
         setupMenuButton(act,scale);
         layoutRight.addView(mMenuButton);
         setupMenuWindow(act, scale);
+        }
-...
       private void setupLevelSpinner(final RubikActivity act, final float scale)
+        {
         int spinnerPadding = (int)(scale* 10 + 0.5f);
         int spinnerMargin  = (int)(scale*  3 + 0.5f);
         int padding = (int)(scale* 10 + 0.5f);
         int margin  = (int)(scale*  3 + 0.5f);
         LinearLayout.LayoutParams spinnerLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 1.0f);
         spinnerLayoutParams.topMargin    =   spinnerMargin;
         spinnerLayoutParams.bottomMargin =   spinnerMargin;
         spinnerLayoutParams.leftMargin   =   spinnerMargin;
         spinnerLayoutParams.rightMargin  = 2*spinnerMargin;
         spinnerLayoutParams.topMargin    = margin;
         spinnerLayoutParams.bottomMargin = margin;
         spinnerLayoutParams.leftMargin   = margin;
         spinnerLayoutParams.rightMargin  = margin;
         mLevelSpinner = new AppCompatSpinner(act);
         mLevelSpinner.setLayoutParams(spinnerLayoutParams);
         mLevelSpinner.setPadding(spinnerPadding,0,spinnerPadding,0);
         mLevelSpinner.setPadding(padding,0,padding,0);
         mLevelSpinner.setBackgroundResource(R.drawable.spinner);
         mLevelSpinner.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setupMenuButton(final RubikActivity act, final float scale, final float width)
       private void setupMenuButton(final RubikActivity act, final float scale)
+        {
         int padding = (int)(3*scale + 0.5f);
         int widthBut = (int)(width/6);
         LinearLayout.LayoutParams objectParams = new LinearLayout.LayoutParams(widthBut,LinearLayout.LayoutParams.MATCH_PARENT);
         LinearLayout.LayoutParams objectParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
         mMenuButton = new ImageButton(act);
         mMenuButton.setLayoutParams(objectParams);
         mMenuButton.setPadding(padding,0,padding,0);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setupSolveButton(final RubikActivity act, final float scale)
       private void setupSolveButton(final RubikActivity act, final float scale, final float width)
+        {
         int padding = (int)(3*scale + 0.5f);
         LinearLayout.LayoutParams backParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
         mSolveButton = new Button(act);
         int widthBut = (int)(width/6);
         LinearLayout.LayoutParams backParams = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT);
         mSolveButton = new ImageButton(act);
         mSolveButton.setLayoutParams(backParams);
         mSolveButton.setPadding(padding,0,padding,0);
         mSolveButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, mButtonSize);
         mSolveButton.setText(R.string.solve);
         mSolveButton.setImageResource(R.drawable.cube_solve);
         mSolveButton.setOnClickListener( new View.OnClickListener()
+          {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setupBackButton(final RubikActivity act, final float scale)
       private void setupPrevButton(final RubikActivity act, final float scale, final float width)
+        {
         int padding = (int)(3*scale + 0.5f);
         LinearLayout.LayoutParams backParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
         mBackButton = new Button(act);
         mBackButton.setLayoutParams(backParams);
         mBackButton.setPadding(padding,0,padding,0);
         mBackButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, mButtonSize);
         mBackButton.setText(R.string.exit);
         mBackButton.setOnClickListener( new View.OnClickListener()
         int widthBut = (int)(width/6);
         LinearLayout.LayoutParams backParams = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT);
         mPrevButton = new ImageButton(act);
         mPrevButton.setLayoutParams(backParams);
         mPrevButton.setPadding(padding,0,padding,0);
         mPrevButton.setImageResource(R.drawable.cube_back);
         mPrevButton.setOnClickListener( new View.OnClickListener()
+          {
           @Override
           public void onClick(View v)
+            {
             if( act.getPreRender().canPlay() ) RubikState.goBack(act);
             RubikPreRender pre = act.getPreRender();
             backMove(pre);
+            }
           });
+        }
-...
         mMenuLayoutHeight= (int)(margin + NUM_BUTTONS*(mButtonSize+margin));
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void backMove(RubikPreRender pre)
+        {
         if( mCanPrevMove )
+          {
           int numMoves = mMoves.size();
           if( numMoves>0 )
+            {
             Move move = mMoves.remove(numMoves-1);
             RubikObject object = pre.getObject();
             int axis  = move.mAxis;
             int row   = (1<<move.mRow);
             int angle = move.mAngle;
             int numRot= Math.abs(angle*object.getBasicAngle()/360);
             if( angle!=0 )
+              {
               mCanPrevMove = false;
               pre.addRotation(this, axis, row, -angle, numRot*DURATION_MILLIS);
+              }
             else
+              {
               android.util.Log.e("solution", "error: trying to back move of angle 0");
+              }
+            }
           else
+            {
             android.util.Log.e("solv", "error: no moves to back!");
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void Action(RubikActivity act, int button)
-...
         return mLevelValue;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void addMove(int axis, int row, int angle)
+        {
         mMoves.add(new Move(axis,row,angle));
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getObject()
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void onNothingSelected(AdapterView<?> parent) { }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void onActionFinished(final long effectID)
+        {
         mCanPrevMove = true;
+        }
+      }

     import android.view.LayoutInflater;
     import android.view.View;
     import android.widget.Button;
     import android.widget.ImageButton;
     import android.widget.LinearLayout;
     import android.widget.TextView;
-...
     public class RubikStateReady extends RubikStateAbstract
+      {
       private ImageButton mPrevButton;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void leaveState(RubikActivity act)
+        {
-...
         LinearLayout layoutLeft = act.findViewById(R.id.mainBarLeft);
         layoutLeft.removeAllViews();
         setupPrevMoveButtom(act,scale,width);
         layoutLeft.addView(mPrevButton);
         LinearLayout layoutRight = act.findViewById(R.id.mainBarRight);
         layoutRight.removeAllViews();
-...
         layoutRight.addView(back);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setupPrevMoveButtom(final RubikActivity act, float scale, float width)
+        {
         int padding = (int)( 3*scale + 0.5f);
         int widthBut= (int)(width/6);
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(widthBut,LinearLayout.LayoutParams.MATCH_PARENT);
         mPrevButton = new ImageButton(act);
         mPrevButton.setLayoutParams(params);
         mPrevButton.setPadding(padding,0,padding,0);
         mPrevButton.setImageResource(R.drawable.cube_back);
         mPrevButton.setOnClickListener( new View.OnClickListener()
+          {
           @Override
           public void onClick(View v)
+            {
             // empty
+            }
           });
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void savePreferences(SharedPreferences.Editor editor)

src/main/java/org/distorted/states/RubikStateSolving.java
152	152	mPrevButton = new ImageButton(act);
153	153	mPrevButton.setLayoutParams(params);
154	154	mPrevButton.setPadding(padding,0,padding,0);
155		mPrevButton.setImageResource(R.drawable.left);
156		mPrevButton.setVisibility(View.INVISIBLE);
	155	mPrevButton.setImageResource(R.drawable.cube_back);
157	156
158	157	mPrevButton.setOnClickListener( new View.OnClickListener()
159	158	{
...	...
188	187	{
189	188	mCanPrevMove = false;
190	189	pre.addRotation(this, axis, row, -angle, numRot*DURATION_MILLIS);
191
192		if( numMoves==1 )
193		{
194		mPrevButton.setVisibility(View.INVISIBLE);
195		}
196	190	}
197	191	else
198	192	{
...	...
211	205	public void addMove(int axis, int row, int angle)
212	206	{
213	207	mMoves.add(new Move(axis,row,angle));
214
215		if( mMoves.size()==1 )
216		{
217		mPrevButton.setVisibility(View.VISIBLE);
218		}
219	208	}
220	209
221	210	///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 15846fe4

Added by Leszek Koltunski over 4 years ago