Project

General

Profile

« Previous | Next » 

Revision 7cb8d4b0

Added by Leszek Koltunski about 2 years ago

Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)

View differences:

src/main/java/org/distorted/tutorials/TutorialActivity.java
34 34 

  		




  35
  35
  
    
import com.google.firebase.analytics.FirebaseAnalytics;


  		




  36
  36
  
    

  		




  37
  
  
    
import org.distorted.dmesh.ObjectMesh;


  		




  38
  
  
    
import org.distorted.jsons.ObjectJson;


  		




  39
  37
  
    
import org.distorted.library.main.DistortedLibrary;


  		




  40
  38
  
    

  		




  41
  39
  
    
import org.distorted.objectlib.main.ObjectControl;


  		




  
  40
  
    
import org.distorted.objectlib.main.TwistyObject;


  		




  42
  41
  
    

  		




  43
  42
  
    
import org.distorted.main.R;


  		




  44
  43
  
    
import org.distorted.dialogs.RubikDialogError;


  		




  ......




  232
  231
  
    
      {


  		




  233
  232
  
    
      RubikObject object = RubikObjectList.getObject(ordinal);


  		




  234
  233
  
    
      int meshState = object!=null ? object.getMeshState() : MESH_NICE;


  		




  
  234
  
    
      int iconMode  = TwistyObject.MODE_NORM;


  		




  235
  235
  
    
      InputStream jsonStream = object==null ? null : object.getObjectStream(this);


  		




  236
  236
  
    
      InputStream meshStream = object==null ? null : object.getMeshStream(this);


  		




  237
  237
  
    
      String name = object==null ? "NULL" : object.getUpperName();


  		




  238
  238
  
    

  		




  239
  
  
    
      control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream);


  		




  
  239
  
    
      control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream);


  		




  240
  240
  
    
      }


  		




  241
  241
  
    

  		




  242
  242
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff