commit 99c2e3279901e757765413052b3f8b16dba7e582
Author: leszek <leszek@koltunski.pl>
Date:   Wed Mar 13 00:34:43 2024 +0100

    Color unification complete: 24 standard colors.

diff --git a/src/main/java/org/distorted/config/ConfigScreenPane.java b/src/main/java/org/distorted/config/ConfigScreenPane.java
index 13521552..cef491e9 100644
--- a/src/main/java/org/distorted/config/ConfigScreenPane.java
+++ b/src/main/java/org/distorted/config/ConfigScreenPane.java
@@ -44,10 +44,10 @@ public class ConfigScreenPane
 
   private static final int[][] COLORS =
     {
-      { COLOR_ICO_LPINK , COLOR_ICO_VIOLET , COLOR_ICO_PURPLE, COLOR_ICO_BURGUN, COLOR_ICO_DPINK , COLOR_ICO_YELLOW },
-      { COLOR_ICO_LGREEN, COLOR_ICO_BLUE   , COLOR_ICO_GREY  , COLOR_ICO_ORANGE, COLOR_ICO_DGREEN, COLOR_ICO_SELEDY },
-      { COLOR_ICO_GREEN , COLOR_ICO_BLUEISH, COLOR_ICO_SANDY , COLOR_ICO_DBLUE , COLOR_ICO_RED   , COLOR_ICO_DYELLO },
-      { COLOR_ICO_DWHITE, COLOR_ICO_LBLUE  , COLOR_ICO_BLACK , COLOR_ICO_DGREY , COLOR_ICO_LGREY , COLOR_ICO_WHITE  },
+      {COLOR_WHITE, COLOR_YELLOW, COLOR_BLUE, COLOR_LGREEN, COLOR_RED, COLOR_ORANGE},
+      {COLOR_LPINK, COLOR_VIOLET, COLOR_PURPLE, COLOR_BURGUN, COLOR_DPINK, COLOR_DYELLO},
+      {COLOR_DGREEN, COLOR_SELEDY, COLOR_GREEN, COLOR_BLUEISH, COLOR_SANDY, COLOR_DBLUE},
+      {COLOR_BROWN, COLOR_LBLUE, COLOR_BLACK, COLOR_DGREY, COLOR_LGREY, COLOR_GREY},
     };
 
   private final SeekBar mSeekBarBorders, mSeekBarCorners;
diff --git a/src/main/java/org/distorted/solvers/SolverDino4.java b/src/main/java/org/distorted/solvers/SolverDino4.java
index b9c61db7..0a17bcaf 100644
--- a/src/main/java/org/distorted/solvers/SolverDino4.java
+++ b/src/main/java/org/distorted/solvers/SolverDino4.java
@@ -60,10 +60,10 @@ public class SolverDino4 extends SolverTablebase
       {
       int color = hexColors[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;
+      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 fef4059d..3731e55b 100644
--- a/src/main/java/org/distorted/solverui/ScreenSolver.java
+++ b/src/main/java/org/distorted/solverui/ScreenSolver.java
@@ -209,7 +209,7 @@ public class ScreenSolver extends ScreenAbstract
     else if( object==MetadataDIN4_3.INDEX )
       {
       mNumColors  = 4;
-      mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE };
+      mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE};
       mColorMode  = MODE_DINO_4;
       }
     else