commit 88d281104bf31b98601680f4cc3f8a0f1526ef32
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Oct 18 14:17:26 2021 +0200

    Minor

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogScores.java b/src/main/java/org/distorted/dialogs/RubikDialogScores.java
index 865bcb1e..d9537a2f 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogScores.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogScores.java
@@ -104,13 +104,13 @@ public class RubikDialogScores extends AppCompatDialogFragment
     tabLayout.setupWithViewPager(viewPager);
 
     viewPager.setCurrentItem(curTab);
-    ObjectType list;
+    ObjectType type;
     int iconSize = RubikActivity.getDrawableSize();
 
     for (int object = 0; object< ObjectType.NUM_OBJECTS; object++)
       {
-      list = ObjectType.getObject(object);
-      int iconID = list.getIconID(iconSize);
+      type = ObjectType.getObject(object);
+      int iconID = type.getIconID(iconSize);
       ImageView imageView = new ImageView(act);
       imageView.setImageResource(iconID);
       TabLayout.Tab tab = tabLayout.getTabAt(object);
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 5b2d6842..18db3542 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -48,6 +48,8 @@ import org.distorted.helpers.TransparentButton;
 import org.distorted.helpers.TransparentImageButton;
 import org.distorted.network.RubikScores;
 
+import static org.distorted.objectlib.main.ObjectType.NUM_OBJECTS;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 public class RubikScreenPlay extends RubikScreenBase
@@ -110,7 +112,7 @@ public class RubikScreenPlay extends RubikScreenBase
     mButtonSize   = width*RubikActivity.BUTTON_TEXT_SIZE;
     mMenuItemSize = width*RubikActivity.MENU_ITEM_SIZE;
 
-    mRowCount = (ObjectType.NUM_OBJECTS + NUM_COLUMNS-1) / NUM_COLUMNS;
+    mRowCount = (NUM_OBJECTS + NUM_COLUMNS-1) / NUM_COLUMNS;
     mColCount = NUM_COLUMNS;
 
     // TOP ////////////////////////////
@@ -271,7 +273,7 @@ public class RubikScreenPlay extends RubikScreenBase
       colSpecs[col] = GridLayout.spec(col);
       }
 
-    for(int object = 0; object< ObjectType.NUM_OBJECTS; object++)
+    for(int object = 0; object< NUM_OBJECTS; object++)
       {
       final ObjectType type = ObjectType.getObject(object);
       int iconSize = RubikActivity.getDrawableSize();
@@ -443,7 +445,7 @@ public class RubikScreenPlay extends RubikScreenBase
     {
     String objName= preferences.getString("statePlay_objName", DEF_OBJECT.name() );
     int ordinal = ObjectType.getOrdinal(objName);
-    mObject = ordinal>=0 ? ObjectType.values()[ordinal] : DEF_OBJECT;
+    mObject = ordinal>=0 && ordinal<NUM_OBJECTS ? ObjectType.values()[ordinal] : DEF_OBJECT;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////