commit cf14e8f1db2a52bb73956cc34a87f136abc5454c
Author: leszek <leszek@koltunski.pl>
Date:   Tue Mar 12 16:46:10 2024 +0100

    Beginnings of color unification

diff --git a/src/main/java/org/distorted/solvers/SolverDino4.java b/src/main/java/org/distorted/solvers/SolverDino4.java
index 8efacba5..b9c61db7 100644
--- a/src/main/java/org/distorted/solvers/SolverDino4.java
+++ b/src/main/java/org/distorted/solvers/SolverDino4.java
@@ -9,14 +9,13 @@
 
 package org.distorted.solvers;
 
-import static org.distorted.objectlib.main.TwistyObject.*;
-
 import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
 import org.distorted.objectlib.metadata.ListObjects;
 import org.distorted.objectlib.main.TwistyObject;
+import org.distorted.objectlib.shape.ShapeColors;
 import org.distorted.objectlib.shape.ShapeHexahedron;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TBDino4;
@@ -61,10 +60,10 @@ public class SolverDino4 extends SolverTablebase
       {
       int color = hexColors[i];
 
-      if( color==COLOR_WHITE  ) indW = i;
-      if( color==COLOR_YELLOW ) indY = i;
-      if( color==COLOR_RED    ) indR = i;
-      if( color==COLOR_BLUE   ) indB = i;
+      if( color == ShapeColors.COLOR_WHITE  ) indW = i;
+      if( color == ShapeColors.COLOR_YELLOW ) indY = i;
+      if( color == ShapeColors.COLOR_RED    ) indR = i;
+      if( color == ShapeColors.COLOR_BLUE   ) indB = i;
       }
 
     for(int i=0; i<12; i++)
diff --git a/src/main/java/org/distorted/solverui/ScreenSolver.java b/src/main/java/org/distorted/solverui/ScreenSolver.java
index 50b67e42..fef4059d 100644
--- a/src/main/java/org/distorted/solverui/ScreenSolver.java
+++ b/src/main/java/org/distorted/solverui/ScreenSolver.java
@@ -9,11 +9,6 @@
 
 package org.distorted.solverui;
 
-import static org.distorted.objectlib.main.TwistyObject.COLOR_BLUE;
-import static org.distorted.objectlib.main.TwistyObject.COLOR_RED;
-import static org.distorted.objectlib.main.TwistyObject.COLOR_WHITE;
-import static org.distorted.objectlib.main.TwistyObject.COLOR_YELLOW;
-
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -58,6 +53,7 @@ import org.distorted.objectlib.metadata.MetadataPYRA_5;
 import org.distorted.objectlib.metadata.MetadataSTAR_3;
 import org.distorted.objectlib.metadata.MetadataTRAJ_3;
 import org.distorted.objectlib.metadata.MetadataTRAJ_4;
+import org.distorted.objectlib.shape.ShapeColors;
 import org.distorted.objectlib.shape.ShapeDiamond;
 import org.distorted.objectlib.shape.ShapeDodecahedron;
 import org.distorted.objectlib.shape.ShapeHexahedron;
@@ -213,7 +209,7 @@ public class ScreenSolver extends ScreenAbstract
     else if( object==MetadataDIN4_3.INDEX )
       {
       mNumColors  = 4;
-      mFaceColors = new int[] { COLOR_YELLOW, COLOR_RED, COLOR_BLUE, COLOR_WHITE };
+      mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE };
       mColorMode  = MODE_DINO_4;
       }
     else