/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision fa679111

Added by Leszek Koltunski about 5 years ago

ID fa67911153665e1cca36b4a8f94b8e7be816d10b
Parent e07c48a2
Child 1576f41c

Make the ObjectPopup a 2D grid - corrections.

                            {5 , 24, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}
                          },
              RubikCube.class,
              new RubikMovementCube()
              new RubikMovementCube(),
            ),
       PYRA (
-...
                            {5 , 20, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
                          },
              RubikPyraminx.class,
              new RubikMovementPyraminx()
              new RubikMovementPyraminx(),
            ),
       DINO (
-...
                            {3 , 10, R.raw.dino, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,
                          },
              RubikDino.class,
              new RubikMovementDino()
              new RubikMovementDino(),
            ),
+      ;
-...
       private final int[] mObjectSizes, mMaxLevels, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;
       private final Class<? extends RubikObject> mObjectClass;
       private final RubikMovement mObjectMovementClass;
       private final int mColumn, mNumSizes;
       private static final RubikObjectList[] objects;
       private static int mNumAll;
       private static int[] mIndices;
       private static int mColCount, mRowCount;
       static
+        {
-...
         int maxLevel= Integer.MIN_VALUE;
         int maxSize = Integer.MIN_VALUE;
         mIndices = new int[] {0,1,2};
         for(RubikObjectList object: RubikObjectList.values())
+          {
           objects[i] = object;
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // TODO
       private static void setUpColAndRow()
+        {
         mIndices = new int[NUM_OBJECTS];
         mColCount= 0;
         for(int obj=0; obj<NUM_OBJECTS; obj++)
+          {
           mIndices[obj] = objects[obj].mColumn;
           if( mIndices[obj]>=mColCount ) mColCount = mIndices[obj]+1;
+          }
         mRowCount = 0;
         for(int col=0; col<mColCount; col++)
+          {
           int numObjects = computeNumObjectsInColumn(col);
           if( numObjects>mRowCount ) mRowCount = numObjects;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private static int computeNumObjectsInColumn(int column)
+        {
         int num=0;
         for(int object=0; object<NUM_OBJECTS; object++)
+          {
           if( objects[object].mColumn == column )
+            {
             num += objects[object].mNumSizes;
+            }
+          }
         return num;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static int getColumnCount()
+        {
         return 3;
         if( mIndices==null ) setUpColAndRow();
         return mColCount;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // TODO
       public static int getRowCount()
+        {
         return 4;
         if( mIndices==null ) setUpColAndRow();
         return mRowCount;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // TODO
       public static int[] getIndices()
+        {
         if( mIndices==null ) setUpColAndRow();
         return mIndices;
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       RubikObjectList(int[][] info, Class<? extends RubikObject> object , RubikMovement movement)
       RubikObjectList(int[][] info, Class<? extends RubikObject> object , RubikMovement movement, int column)
+        {
         int length = info.length;
         mNumSizes = info.length;
         mObjectSizes  = new int[length];
         mMaxLevels    = new int[length];
         mResourceIDs  = new int[length];
         mSmallIconIDs = new int[length];
         mMediumIconIDs= new int[length];
         mBigIconIDs   = new int[length];
         mHugeIconIDs  = new int[length];
         mObjectSizes  = new int[mNumSizes];
         mMaxLevels    = new int[mNumSizes];
         mResourceIDs  = new int[mNumSizes];
         mSmallIconIDs = new int[mNumSizes];
         mMediumIconIDs= new int[mNumSizes];
         mBigIconIDs   = new int[mNumSizes];
         mHugeIconIDs  = new int[mNumSizes];
         for(int i=0; i<length; i++)
         for(int i=0; i<mNumSizes; i++)
+          {
           mObjectSizes[i]  = info[i][0];
           mMaxLevels[i]    = info[i][1];
-...
         mObjectClass         = object;
         mObjectMovementClass = movement;
         mColumn              = column;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

+              {
               boolean vertical = act.isVertical();
               mObjectGrid.setOrientation(vertical ? GridLayout.VERTICAL:GridLayout.HORIZONTAL);
               mObjectPopup.showAsDropDown(view, 0, margin, Gravity.LEFT);
               mObjectPopup.showAsDropDown(view, margin, margin, Gravity.LEFT);
               if( android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 )
+                {
                 int layhei = mObjectSize * (vertical? mRowCount:mColCount);
                 int laywid = mObjectSize * (vertical? mColCount:mRowCount);
                 mObjectPopup.update(view, laywid, layhei);
+                }
               int layhei = mObjectSize * (vertical? mRowCount:mColCount);
               int laywid = mObjectSize * (vertical? mColCount:mRowCount);
               mObjectPopup.update(view, laywid, layhei);
+              }
+            }
           });
-...
         mObjectGrid.setColumnCount(mColCount);
         mObjectGrid.setRowCount(mRowCount);
         int[] nextInColumn = new int[mColCount];
         for(int row=0; row<mRowCount; row++)
+          {
           rowSpecs[row] = GridLayout.spec(row);
-...
         for(int col=0; col<mColCount; col++)
+          {
           colSpecs[col] = GridLayout.spec(col);
           nextInColumn[col] =0;
+          }
         mObjectPopup = new PopupWindow(act);
-...
           int[] icons = list.getIconIDs();
           int len = sizes.length;
           final int obj = object;
           int col = indices[object];
           for(int i=0; i<len; i++)
+            {
-...
+                }
               });
             GridLayout.LayoutParams params = new GridLayout.LayoutParams(rowSpecs[index],colSpecs[indices[object]]);
             GridLayout.LayoutParams params = new GridLayout.LayoutParams(rowSpecs[nextInColumn[col]],colSpecs[col]);
             params.bottomMargin = margin;
             params.topMargin    = margin;
             params.leftMargin   = margin;
             params.rightMargin  = margin;
             nextInColumn[col]++;
             mObjectGrid.addView(button, params);
+            }
+          }

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision fa679111

Added by Leszek Koltunski about 5 years ago