commit 0501a4b8f52026ec042fe62ad71b3d8e37817634
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Mar 19 22:28:38 2021 +0100

    Transpose the Object Popup

diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java
index 553cad98..76cd8126 100644
--- a/src/main/java/org/distorted/objects/ObjectList.java
+++ b/src/main/java/org/distorted/objects/ObjectList.java
@@ -210,7 +210,7 @@ public enum ObjectList
   private final int[] mObjectSizes, mMaxLevels, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;
   private final Class<? extends TwistyObject> mObjectClass;
   private final Movement mObjectMovementClass;
-  private final int mColumn, mNumSizes;
+  private final int mRow, mNumSizes;
   private final int mFOV;
 
   private static final ObjectList[] objects;
@@ -252,32 +252,32 @@ public enum ObjectList
   private static void setUpColAndRow()
     {
     mIndices = new int[NUM_OBJECTS];
-    mColCount= 0;
+    mRowCount= 0;
 
     for(int obj=0; obj<NUM_OBJECTS; obj++)
       {
-      mIndices[obj] = objects[obj].mColumn;
-      if( mIndices[obj]>=mColCount ) mColCount = mIndices[obj]+1;
+      mIndices[obj] = objects[obj].mRow;
+      if( mIndices[obj]>=mRowCount ) mRowCount = mIndices[obj]+1;
       }
 
-    mRowCount = 0;
+    mColCount = 0;
 
-    for(int col=0; col<mColCount; col++)
+    for(int row=0; row<mRowCount; row++)
       {
-      int numObjects = computeNumObjectsInColumn(col);
-      if( numObjects>mRowCount ) mRowCount = numObjects;
+      int numObjects = computeNumObjectsInRow(row);
+      if( numObjects>mColCount ) mColCount = numObjects;
       }
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private static int computeNumObjectsInColumn(int column)
+  private static int computeNumObjectsInRow(int row)
     {
     int num=0;
 
     for(int object=0; object<NUM_OBJECTS; object++)
       {
-      if( objects[object].mColumn == column )
+      if( objects[object].mRow == row )
         {
         num += objects[object].mNumSizes;
         }
@@ -492,7 +492,7 @@ public enum ObjectList
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  ObjectList(int[][] info, Class<? extends TwistyObject> object , Movement movement, int column, int fov)
+  ObjectList(int[][] info, Class<? extends TwistyObject> object , Movement movement, int row, int fov)
     {
     mNumSizes = info.length;
 
@@ -517,7 +517,7 @@ public enum ObjectList
 
     mObjectClass         = object;
     mObjectMovementClass = movement;
-    mColumn              = column;
+    mRow                 = row;
     mFOV                 = fov;
     }
 
diff --git a/src/main/java/org/distorted/states/RubikStatePlay.java b/src/main/java/org/distorted/states/RubikStatePlay.java
index 00825561..be27d79e 100644
--- a/src/main/java/org/distorted/states/RubikStatePlay.java
+++ b/src/main/java/org/distorted/states/RubikStatePlay.java
@@ -238,16 +238,16 @@ public class RubikStatePlay extends RubikStateBase
     objectGrid.setColumnCount(mColCount);
     objectGrid.setRowCount(mRowCount);
 
-    int[] nextInColumn = new int[mColCount];
+    int[] nextInRow = new int[mRowCount];
 
     for(int row=0; row<mRowCount; row++)
       {
       rowSpecs[row] = GridLayout.spec(row);
+      nextInRow[row]= 0;
       }
     for(int col=0; col<mColCount; col++)
       {
       colSpecs[col] = GridLayout.spec(col);
-      nextInColumn[col] =0;
       }
 
     mObjectPopup = new PopupWindow(act);
@@ -260,14 +260,14 @@ public class RubikStatePlay extends RubikStateBase
     int margin = (int)(width*RubikActivity.LARGE_MARGIN);
     mObjectSize = (int)(cubeWidth + 2*margin + 0.5f);
 
-    for(int object = 0; object< ObjectList.NUM_OBJECTS; object++)
+    for(int object=0; object< ObjectList.NUM_OBJECTS; object++)
       {
       final ObjectList list = ObjectList.getObject(object);
       final int[] sizes = list.getSizes();
       int[] icons = list.getIconIDs();
       int len = sizes.length;
       final int obj = object;
-      int col = indices[object];
+      int row = indices[object];
 
       for(int i=0; i<len; i++)
         {
@@ -293,13 +293,13 @@ public class RubikStatePlay extends RubikStateBase
             }
           });
 
-        GridLayout.LayoutParams params = new GridLayout.LayoutParams(rowSpecs[nextInColumn[col]],colSpecs[col]);
+        GridLayout.LayoutParams params = new GridLayout.LayoutParams(rowSpecs[row],colSpecs[nextInRow[row]]);
         params.bottomMargin = margin;
         params.topMargin    = margin;
         params.leftMargin   = margin;
         params.rightMargin  = margin;
 
-        nextInColumn[col]++;
+        nextInRow[row]++;
 
         objectGrid.addView(button, params);
         }