commit de697069f386cf7ea02183228bc0837b1b5e8d44 Author: leszek Date: Mon Sep 25 14:23:54 2023 +0200 separate ObjectSiguature into its own package and separate the BandagedSignatures out of it. diff --git a/src/main/java/org/distorted/objects/RubikObjectList.java b/src/main/java/org/distorted/objects/RubikObjectList.java index e3dbe30d..509baf0e 100644 --- a/src/main/java/org/distorted/objects/RubikObjectList.java +++ b/src/main/java/org/distorted/objects/RubikObjectList.java @@ -18,7 +18,7 @@ import android.content.SharedPreferences; import org.distorted.external.RubikFiles; import org.distorted.external.RubikScores; import org.distorted.main.RubikActivity; -import org.distorted.objectlib.main.ObjectSignatures; +import org.distorted.objectlib.signature.ObjectConstants; import org.distorted.objectlib.main.ObjectType; import static org.distorted.main.RubikActivity.SHOW_IAP_DEBUG; @@ -32,7 +32,7 @@ import static org.distorted.screens.RubikScreenPlay.LEVELS_SHOWN; public class RubikObjectList { - public static final int DEF_OBJECT= ObjectSignatures.CUBE_3; + public static final int DEF_OBJECT= ObjectConstants.CUBE_3; private static RubikObjectList mThis; private static int mNumObjects; private static int mNumExtras; diff --git a/src/main/java/org/distorted/screens/RubikScreenSolver.java b/src/main/java/org/distorted/screens/RubikScreenSolver.java index 98fe8569..840426e3 100644 --- a/src/main/java/org/distorted/screens/RubikScreenSolver.java +++ b/src/main/java/org/distorted/screens/RubikScreenSolver.java @@ -26,7 +26,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import org.distorted.objectlib.main.ObjectControl; -import org.distorted.objectlib.main.ObjectSignatures; +import org.distorted.objectlib.signature.ObjectConstants; import org.distorted.objectlib.main.TwistyObject; import org.distorted.dialogs.RubikDialogSolverError; @@ -144,50 +144,50 @@ public class RubikScreenSolver extends RubikScreenAbstract { mColorMode = MODE_NORMAL; - if( object== ObjectSignatures.PYRA_3 || - object== ObjectSignatures.PYRA_4 || - object== ObjectSignatures.PYRA_5 || - object== ObjectSignatures.PDUO_2 || - object== ObjectSignatures.JING_2 || - object== ObjectSignatures.MORP_2 || - object== ObjectSignatures.MORP_3 || - object== ObjectSignatures.MORP_4 ) + if( object== ObjectConstants.PYRA_3 || + object== ObjectConstants.PYRA_4 || + object== ObjectConstants.PYRA_5 || + object== ObjectConstants.PDUO_2 || + object== ObjectConstants.JING_2 || + object== ObjectConstants.MORP_2 || + object== ObjectConstants.MORP_3 || + object== ObjectConstants.MORP_4 ) { mNumColors = ShapeTetrahedron.NUM_FACES; mFaceColors = ShapeTetrahedron.FACE_COLORS; } - else if( object== ObjectSignatures.DIAM_2 || - object== ObjectSignatures.DIAM_3 || - object== ObjectSignatures.DIAM_4 || - object== ObjectSignatures.TRAJ_3 || - object== ObjectSignatures.TRAJ_4 || - object== ObjectSignatures.PDIA_3 ) + else if( object== ObjectConstants.DIAM_2 || + object== ObjectConstants.DIAM_3 || + object== ObjectConstants.DIAM_4 || + object== ObjectConstants.TRAJ_3 || + object== ObjectConstants.TRAJ_4 || + object== ObjectConstants.PDIA_3 ) { mNumColors = ShapeOctahedron.NUM_FACES; mFaceColors = ShapeOctahedron.FACE_COLORS; } - else if( object== ObjectSignatures.CRYS_3 || - object== ObjectSignatures.STAR_3 || - object== ObjectSignatures.PENT_2 || - object== ObjectSignatures.KILO_3 || - object== ObjectSignatures.KILO_5 || - object== ObjectSignatures.MEGA_3 || - object== ObjectSignatures.MEGA_5 ) + else if( object== ObjectConstants.CRYS_3 || + object== ObjectConstants.STAR_3 || + object== ObjectConstants.PENT_2 || + object== ObjectConstants.KILO_3 || + object== ObjectConstants.KILO_5 || + object== ObjectConstants.MEGA_3 || + object== ObjectConstants.MEGA_5 ) { mNumColors = ShapeDodecahedron.NUM_FACES; mFaceColors = ShapeDodecahedron.FACE_COLORS; } - else if( object== ObjectSignatures.BALL_4 ) + else if( object== ObjectConstants.BALL_4 ) { mNumColors = ShapeDiamond.NUM_FACES; mFaceColors = ShapeDiamond.FACE_COLORS; } - else if( object== ObjectSignatures.ICOS_2 ) + else if( object== ObjectConstants.ICOS_2 ) { mNumColors = ShapeIcosahedron.NUM_FACES; mFaceColors = ShapeIcosahedron.FACE_COLORS; } - else if( object== ObjectSignatures.DIN4_3 ) + else if( object== ObjectConstants.DIN4_3 ) { mNumColors = 4; mFaceColors = new int[] { COLOR_YELLOW, COLOR_RED, COLOR_BLUE, COLOR_WHITE }; diff --git a/src/main/java/org/distorted/solvers/ImplementedSolversList.java b/src/main/java/org/distorted/solvers/ImplementedSolversList.java index 1e7b9580..f89117fa 100644 --- a/src/main/java/org/distorted/solvers/ImplementedSolversList.java +++ b/src/main/java/org/distorted/solvers/ImplementedSolversList.java @@ -10,25 +10,25 @@ package org.distorted.solvers; import org.distorted.main.R; -import org.distorted.objectlib.main.ObjectSignatures; +import org.distorted.objectlib.signature.ObjectConstants; /////////////////////////////////////////////////////////////////////////////////////////////////// public enum ImplementedSolversList { - CUBE2 (ObjectSignatures.CUBE_2, R.string.solver_cube2_title, R.string.solver_cube2_description, true), - CUBE3_KOCIEMBA (ObjectSignatures.CUBE_3, R.string.solver_cube3_title, R.string.solver_cube3_description, true), - CU_232 (ObjectSignatures.CU_232, R.string.solver_cu232_title, R.string.solver_cu232_description, true), - CU_323 (ObjectSignatures.CU_323, R.string.solver_cu323_title, R.string.solver_cu323_description, true), - PYRAMINX (ObjectSignatures.PYRA_3, R.string.solver_pyra3_title, R.string.solver_pyra3_description, true), - SKEWB (ObjectSignatures.SKEW_2, R.string.solver_skew2_title, R.string.solver_skew2_description, true), - PYRAMINX_DUO (ObjectSignatures.PDUO_2, R.string.solver_pduo2_title, R.string.solver_pduo2_description, true), - IVY (ObjectSignatures.IVY_2 , R.string.solver_ivy_title, R.string.solver_ivy_description, true), - DIAMOND (ObjectSignatures.DIAM_2, R.string.solver_diam2_title, R.string.solver_diam2_description, true), - JING2 (ObjectSignatures.JING_2, R.string.solver_jing2_title, R.string.solver_jing2_description, true), - DINO6 (ObjectSignatures.DINO_3, R.string.solver_dino6_title, R.string.solver_dino6_description, true), - DINO4 (ObjectSignatures.DIN4_3, R.string.solver_dino4_title, R.string.solver_dino4_description, true), - PDIA (ObjectSignatures.PDIA_3, R.string.solver_pdia_title, R.string.solver_pdia_description, true), + CUBE2 (ObjectConstants.CUBE_2, R.string.solver_cube2_title, R.string.solver_cube2_description, true), + CUBE3_KOCIEMBA (ObjectConstants.CUBE_3, R.string.solver_cube3_title, R.string.solver_cube3_description, true), + CU_232 (ObjectConstants.CU_232, R.string.solver_cu232_title, R.string.solver_cu232_description, true), + CU_323 (ObjectConstants.CU_323, R.string.solver_cu323_title, R.string.solver_cu323_description, true), + PYRAMINX (ObjectConstants.PYRA_3, R.string.solver_pyra3_title, R.string.solver_pyra3_description, true), + SKEWB (ObjectConstants.SKEW_2, R.string.solver_skew2_title, R.string.solver_skew2_description, true), + PYRAMINX_DUO (ObjectConstants.PDUO_2, R.string.solver_pduo2_title, R.string.solver_pduo2_description, true), + IVY (ObjectConstants.IVY_2 , R.string.solver_ivy_title, R.string.solver_ivy_description, true), + DIAMOND (ObjectConstants.DIAM_2, R.string.solver_diam2_title, R.string.solver_diam2_description, true), + JING2 (ObjectConstants.JING_2, R.string.solver_jing2_title, R.string.solver_jing2_description, true), + DINO6 (ObjectConstants.DINO_3, R.string.solver_dino6_title, R.string.solver_dino6_description, true), + DINO4 (ObjectConstants.DIN4_3, R.string.solver_dino4_title, R.string.solver_dino4_description, true), + PDIA (ObjectConstants.PDIA_3, R.string.solver_pdia_title, R.string.solver_pdia_description, true), ; public static final int NUM_OBJECTS = values().length; diff --git a/src/main/java/org/distorted/solvers/SolverMain.java b/src/main/java/org/distorted/solvers/SolverMain.java index 18590877..12042e92 100644 --- a/src/main/java/org/distorted/solvers/SolverMain.java +++ b/src/main/java/org/distorted/solvers/SolverMain.java @@ -12,7 +12,7 @@ package org.distorted.solvers; import android.content.res.Resources; import org.distorted.objectlib.helpers.OperatingSystemInterface; -import org.distorted.objectlib.main.ObjectSignatures; +import org.distorted.objectlib.signature.ObjectConstants; import org.distorted.objectlib.main.TwistyObject; import org.distorted.main.R; @@ -47,7 +47,7 @@ public class SolverMain implements Runnable public static int cubitIsLocked(int object, int cubit) { - if( object == ObjectSignatures.CUBE_3 ) + if( object == ObjectConstants.CUBE_3 ) { if( cubit==20 ) return 0; // center of the right face if( cubit==21 ) return 1; // center of the left face @@ -74,67 +74,67 @@ public class SolverMain implements Runnable { RubikScreenSolver screen = (RubikScreenSolver) ScreenList.SVER.getScreenClass(); - if( mSignature==ObjectSignatures.CUBE_3 ) + if( mSignature==ObjectConstants.CUBE_3 ) { SolverCube3 solver = new SolverCube3(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.PDUO_2 ) + else if( mSignature==ObjectConstants.PDUO_2 ) { SolverTablebase solver = new SolverPyraminxDuo(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.IVY_2 ) + else if( mSignature==ObjectConstants.IVY_2 ) { SolverTablebase solver = new SolverIvyCube(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.CU_232 ) + else if( mSignature==ObjectConstants.CU_232 ) { SolverTablebase solver = new SolverCuboid232(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.CU_323 ) + else if( mSignature==ObjectConstants.CU_323 ) { SolverTablebase solver = new SolverCuboid323(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.PYRA_3 ) + else if( mSignature==ObjectConstants.PYRA_3 ) { SolverTablebase solver = new SolverPyraminx(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.DIAM_2 ) + else if( mSignature==ObjectConstants.DIAM_2 ) { SolverTablebase solver = new SolverSkewbDiamond(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.CUBE_2 ) + else if( mSignature==ObjectConstants.CUBE_2 ) { SolverTablebase solver = new SolverCube2(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.JING_2 ) + else if( mSignature==ObjectConstants.JING_2 ) { SolverTablebase solver = new SolverJing(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.SKEW_2 ) + else if( mSignature==ObjectConstants.SKEW_2 ) { SolverTablebase solver = new SolverSkewb(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.DINO_3 ) + else if( mSignature==ObjectConstants.DINO_3 ) { SolverTablebase solver = new SolverDino6(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.DIN4_3 ) + else if( mSignature==ObjectConstants.DIN4_3 ) { SolverTablebase solver = new SolverDino4(mOS,mRes,mObject); solver.solve(screen); } - else if( mSignature==ObjectSignatures.PDIA_3 ) + else if( mSignature==ObjectConstants.PDIA_3 ) { SolverTablebase solver = new SolverPyraminxDiamond(mOS,mRes,mObject); solver.solve(screen);