Revision 99c2e327
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/config/ConfigScreenPane.java | ||
|---|---|---|
| 44 | 44 |
|
| 45 | 45 |
private static final int[][] COLORS = |
| 46 | 46 |
{
|
| 47 |
{ COLOR_ICO_LPINK , COLOR_ICO_VIOLET , COLOR_ICO_PURPLE, COLOR_ICO_BURGUN, COLOR_ICO_DPINK , COLOR_ICO_YELLOW },
|
|
| 48 |
{ COLOR_ICO_LGREEN, COLOR_ICO_BLUE , COLOR_ICO_GREY , COLOR_ICO_ORANGE, COLOR_ICO_DGREEN, COLOR_ICO_SELEDY },
|
|
| 49 |
{ COLOR_ICO_GREEN , COLOR_ICO_BLUEISH, COLOR_ICO_SANDY , COLOR_ICO_DBLUE , COLOR_ICO_RED , COLOR_ICO_DYELLO },
|
|
| 50 |
{ COLOR_ICO_DWHITE, COLOR_ICO_LBLUE , COLOR_ICO_BLACK , COLOR_ICO_DGREY , COLOR_ICO_LGREY , COLOR_ICO_WHITE },
|
|
| 47 |
{COLOR_WHITE, COLOR_YELLOW, COLOR_BLUE, COLOR_LGREEN, COLOR_RED, COLOR_ORANGE},
|
|
| 48 |
{COLOR_LPINK, COLOR_VIOLET, COLOR_PURPLE, COLOR_BURGUN, COLOR_DPINK, COLOR_DYELLO},
|
|
| 49 |
{COLOR_DGREEN, COLOR_SELEDY, COLOR_GREEN, COLOR_BLUEISH, COLOR_SANDY, COLOR_DBLUE},
|
|
| 50 |
{COLOR_BROWN, COLOR_LBLUE, COLOR_BLACK, COLOR_DGREY, COLOR_LGREY, COLOR_GREY},
|
|
| 51 | 51 |
}; |
| 52 | 52 |
|
| 53 | 53 |
private final SeekBar mSeekBarBorders, mSeekBarCorners; |
| src/main/java/org/distorted/solvers/SolverDino4.java | ||
|---|---|---|
| 60 | 60 |
{
|
| 61 | 61 |
int color = hexColors[i]; |
| 62 | 62 |
|
| 63 |
if( color == ShapeColors.COLOR_WHITE ) indW = i;
|
|
| 64 |
if( color == ShapeColors.COLOR_YELLOW ) indY = i;
|
|
| 65 |
if( color == ShapeColors.COLOR_RED ) indR = i;
|
|
| 66 |
if( color == ShapeColors.COLOR_BLUE ) indB = i;
|
|
| 63 |
if( color == ShapeColors.COLOR_WHITE) indW = i; |
|
| 64 |
if( color == ShapeColors.COLOR_YELLOW) indY = i; |
|
| 65 |
if( color == ShapeColors.COLOR_RED) indR = i; |
|
| 66 |
if( color == ShapeColors.COLOR_BLUE) indB = i; |
|
| 67 | 67 |
} |
| 68 | 68 |
|
| 69 | 69 |
for(int i=0; i<12; i++) |
| src/main/java/org/distorted/solverui/ScreenSolver.java | ||
|---|---|---|
| 209 | 209 |
else if( object==MetadataDIN4_3.INDEX ) |
| 210 | 210 |
{
|
| 211 | 211 |
mNumColors = 4; |
| 212 |
mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE };
|
|
| 212 |
mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE};
|
|
| 213 | 213 |
mColorMode = MODE_DINO_4; |
| 214 | 214 |
} |
| 215 | 215 |
else |
Also available in: Unified diff
Color unification complete: 24 standard colors.