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/bandaged/BandagedPlayActivity.java
31 31 

  		




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


  		




  33
  33
  
    

  		




  34
  
  
    
import org.distorted.config.ConfigSurfaceView;


  		




  35
  34
  
    
import org.distorted.dialogs.RubikDialogError;


  		




  36
  35
  
    
import org.distorted.library.main.DistortedLibrary;


  		




  37
  36
  
    
import org.distorted.main.R;


  		




  38
  37
  
    
import org.distorted.objectlib.main.ObjectControl;


  		




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


  		




  39
  39
  
    
import org.distorted.objects.RubikObject;


  		




  40
  40
  
    
import org.distorted.objects.RubikObjectList;


  		




  41
  41
  
    

  		




  ......




  211
  211
  
    
      if( object!=null )


  		




  212
  212
  
    
        {


  		




  213
  213
  
    
        int meshState          = object.getMeshState();


  		




  
  214
  
    
        int iconMode           = TwistyObject.MODE_NORM;


  		




  214
  215
  
    
        InputStream jsonStream = object.getObjectStream(this);


  		




  215
  216
  
    
        InputStream meshStream = object.getMeshStream(this);


  		




  216
  217
  
    
        String name            = object.getUpperName();


  		




  217
  218
  
    

  		




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


  		




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


  		




  219
  220
  
    
        }


  		




  220
  221
  
    
      }


  		




  221
  222
  
    

  		












Also available in:  Unified diff