Project

General

Profile

« Previous | Next » 

Revision 15b600fd

Added by Leszek Koltunski 8 months ago

New TwistyObject API to only restore the stickers, and not the object positions.

View differences:

src/main/java/org/distorted/config/ConfigActivity.java
244 244 
      ConfigSurfaceView view = findViewById(R.id.configSurfaceView);
245 245 
      OSInterface os = view.getInterface();
246 246 
      os.setPreferences(preferences);
247 
      view.getObjectControl().restorePreferences();
247 
      view.getObjectControl().restoreStickers();
248 248 
      }
249 249 

  		




  250
  250
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/java/org/distorted/config/ConfigScreenPane.java
    
  





  44
  44
  
    

  		




  45
  45
  
    
  private static final int[][] COLORS =


  		




  46
  46
  
    
    {


  		




  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},


  		




  
  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;


  		












Also available in:  Unified diff