commit 4ab3d91bbc114d72ff579ea79febfd1715af7d39 Author: Leszek Koltunski Date: Tue Sep 21 02:15:03 2021 +0200 Remove class referencees from ObjectList. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java index 643b3985..2aeacd9a 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java @@ -104,9 +104,9 @@ public class RubikDialogPattern extends AppCompatDialogFragment for(int i=0; i< RubikPatternList.NUM_OBJECTS; i++) { ObjectList list = RubikPatternList.getObject(i); - int size = RubikPatternList.getSize(i); - int sizeIndex = ObjectList.getSizeIndex(list.ordinal(),size); - int iconID = list.getIconIDs()[sizeIndex]; + int size = RubikPatternList.getSize(i); + int sizeIndex = ObjectList.getSizeIndex(list.ordinal(),size); + int iconID = list.getIconIDs()[sizeIndex]; ImageView imageView = new ImageView(act); imageView.setImageResource(iconID); diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index a2a48c4b..186e585a 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -28,8 +28,6 @@ import org.distorted.library.type.Static4D; import org.distorted.main.R; import org.distorted.main.RubikActivity; -import java.lang.reflect.Field; - /////////////////////////////////////////////////////////////////////////////////////////////////// public enum ObjectList @@ -43,7 +41,6 @@ public enum ObjectList {4 , 20, 24, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} , {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5} }, - TwistyCube.class, 0 ), @@ -51,7 +48,6 @@ public enum ObjectList new int[][] { {2 , 11, 11, R.raw.jing, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} , }, - TwistyJing.class, 1 ), @@ -61,7 +57,6 @@ public enum ObjectList {4 , 15, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} , {5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5} }, - TwistyPyraminx.class, 1 ), @@ -70,7 +65,6 @@ public enum ObjectList {3 , 18, 18, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} , {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} , }, - TwistyKilominx.class, 2 ), @@ -79,7 +73,6 @@ public enum ObjectList {3 , 21, 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} , {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} , }, - TwistyMegaminx.class, 2 ), @@ -87,7 +80,6 @@ public enum ObjectList new int[][] { {2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} , }, - TwistyUltimate.class, 3 ), @@ -97,7 +89,6 @@ public enum ObjectList {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} , }, - TwistyDiamond.class, 3 ), @@ -105,7 +96,6 @@ public enum ObjectList new int[][] { {3 , 10, 10, R.raw.dino, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} , }, - TwistyDino6.class, 4 ), @@ -113,7 +103,6 @@ public enum ObjectList new int[][] { {3 , 7, 7, R.raw.dino, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} , }, - TwistyDino4.class, 4 ), @@ -121,7 +110,6 @@ public enum ObjectList new int[][] { {3 , 14, 16, R.raw.redi, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} , }, - TwistyRedi.class, 4 ), @@ -129,7 +117,6 @@ public enum ObjectList new int[][] { {3 , 18, 20, R.raw.heli, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} , }, - TwistyHelicopter.class, 4 ), @@ -138,7 +125,6 @@ public enum ObjectList {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} , {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} , }, - TwistySkewb.class, 5 ), @@ -146,7 +132,6 @@ public enum ObjectList new int[][] { {2 , 8, 8, R.raw.ivy, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} , }, - TwistyIvy.class, 5 ), @@ -154,7 +139,6 @@ public enum ObjectList new int[][] { {3 , 16, 19, R.raw.rex, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} , }, - TwistyRex.class, 5 ), @@ -162,7 +146,6 @@ public enum ObjectList new int[][] { {3 , 16, 16, R.raw.ban1, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} , }, - TwistyBandagedFused.class, 6 ), @@ -170,7 +153,6 @@ public enum ObjectList new int[][] { {3 , 16, 16, R.raw.ban2, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} , }, - TwistyBandaged2Bar.class, 6 ), @@ -178,7 +160,6 @@ public enum ObjectList new int[][] { {3 , 16, 16, R.raw.ban3, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} , }, - TwistyBandaged3Plate.class, 6 ), @@ -186,7 +167,6 @@ public enum ObjectList new int[][] { {3 , 16, 16, R.raw.ban4, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} , }, - TwistyBandagedEvil.class, 6 ), @@ -194,7 +174,6 @@ public enum ObjectList new int[][] { {3 , 24, 24, R.raw.square1, R.drawable.ui_small_square1, R.drawable.ui_medium_square1, R.drawable.ui_big_square1, R.drawable.ui_huge_square1} , }, - TwistySquare1.class, 7 ), @@ -202,7 +181,6 @@ public enum ObjectList new int[][] { {3 , 24, 24, R.raw.square2, R.drawable.ui_small_square2, R.drawable.ui_medium_square2, R.drawable.ui_big_square2, R.drawable.ui_huge_square2} , }, - TwistySquare2.class, 7 ), @@ -211,7 +189,6 @@ public enum ObjectList {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} , {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} , }, - TwistyMirror.class, 7 ), ; @@ -223,7 +200,6 @@ public enum ObjectList public static final int MAX_OBJECT_SIZE; private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs; - private final Class mObjectClass; private final int mRow, mNumSizes; private static final ObjectList[] objects; @@ -495,33 +471,7 @@ public enum ObjectList /////////////////////////////////////////////////////////////////////////////////////////////////// - public static int[] retFaceColors(ObjectList object) - { - Field field; - int[] faceColors=null; - - try - { - field = object.mObjectClass.getDeclaredField("FACE_COLORS"); - field.setAccessible(true); - Object obj = field.get(null); - faceColors = (int[]) obj; - } - catch(NoSuchFieldException ex) - { - android.util.Log.e("RubikObjectList", object.mObjectClass.getSimpleName()+": no such field exception getting field: "+ex.getMessage()); - } - catch(IllegalAccessException ex) - { - android.util.Log.e("RubikObjectList", object.mObjectClass.getSimpleName()+": illegal access exception getting field: "+ex.getMessage()); - } - - return faceColors; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - ObjectList(int[][] info, Class object , int row) + ObjectList(int[][] info, int row) { mNumSizes = info.length; @@ -546,8 +496,7 @@ public enum ObjectList mHugeIconIDs[i] = info[i][7]; } - mObjectClass= object; - mRow = row; + mRow = row; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/screens/RubikScreenSolver.java b/src/main/java/org/distorted/screens/RubikScreenSolver.java index 1dc8956e..06883e58 100644 --- a/src/main/java/org/distorted/screens/RubikScreenSolver.java +++ b/src/main/java/org/distorted/screens/RubikScreenSolver.java @@ -85,8 +85,7 @@ public class RubikScreenSolver extends RubikScreenAbstract RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); play.setObjectAndSize(act, currentObject, currentObjectSize); - mFaceColors = ObjectList.retFaceColors(currentObject); - mNumFaces = mFaceColors!=null ? mFaceColors.length : 0; + generateFaceColors(); // TOP //////////////////////////// LinearLayout layoutTop = act.findViewById(R.id.upperBar); @@ -125,6 +124,19 @@ public class RubikScreenSolver extends RubikScreenAbstract layoutBot.addView(layoutRight); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void generateFaceColors() + { + mFaceColors= new int[] { TwistyObject.COLOR_YELLOW, + TwistyObject.COLOR_WHITE, + TwistyObject.COLOR_BLUE , + TwistyObject.COLOR_GREEN, + TwistyObject.COLOR_RED , + TwistyObject.COLOR_ORANGE }; + mNumFaces = 6; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// private void setupBitmaps()