Project

General

Profile

« Previous | Next » 

Revision cf14e8f1

Added by Leszek Koltunski 2 months ago

Beginnings of color unification

View differences:

src/main/java/org/distorted/solverui/ScreenSolver.java
9 9 

  		




  10
  10
  
    
package org.distorted.solverui;


  		




  11
  11
  
    

  		




  12
  
  
    
import static org.distorted.objectlib.main.TwistyObject.COLOR_BLUE;


  		




  13
  
  
    
import static org.distorted.objectlib.main.TwistyObject.COLOR_RED;


  		




  14
  
  
    
import static org.distorted.objectlib.main.TwistyObject.COLOR_WHITE;


  		




  15
  
  
    
import static org.distorted.objectlib.main.TwistyObject.COLOR_YELLOW;


  		




  16
  
  
    

  		




  17
  12
  
    
import android.content.SharedPreferences;


  		




  18
  13
  
    
import android.graphics.Bitmap;


  		




  19
  14
  
    
import android.graphics.Canvas;


  		




  ......




  58
  53
  
    
import org.distorted.objectlib.metadata.MetadataSTAR_3;


  		




  59
  54
  
    
import org.distorted.objectlib.metadata.MetadataTRAJ_3;


  		




  60
  55
  
    
import org.distorted.objectlib.metadata.MetadataTRAJ_4;


  		




  
  56
  
    
import org.distorted.objectlib.shape.ShapeColors;


  		




  61
  57
  
    
import org.distorted.objectlib.shape.ShapeDiamond;


  		




  62
  58
  
    
import org.distorted.objectlib.shape.ShapeDodecahedron;


  		




  63
  59
  
    
import org.distorted.objectlib.shape.ShapeHexahedron;


  		




  ......




  213
  209
  
    
    else if( object==MetadataDIN4_3.INDEX )


  		




  214
  210
  
    
      {


  		




  215
  211
  
    
      mNumColors  = 4;


  		




  216
  
  
    
      mFaceColors = new int[] { COLOR_YELLOW, COLOR_RED, COLOR_BLUE, COLOR_WHITE };


  		




  
  212
  
    
      mFaceColors = new int[] { ShapeColors.COLOR_YELLOW, ShapeColors.COLOR_RED, ShapeColors.COLOR_BLUE, ShapeColors.COLOR_WHITE };


  		




  217
  213
  
    
      mColorMode  = MODE_DINO_4;


  		




  218
  214
  
    
      }


  		




  219
  215
  
    
    else


  		












Also available in:  Unified diff