Project

General

Profile

« Previous | Next » 

Revision d433b50e

Added by Leszek Koltunski over 2 years ago

In the 'magic' app, ObjectType is now only used in RubikObject and RubikObjectList classes and nowhere else.
This is a major step towards being able to download objects from an online repository.

View differences:

src/main/java/org/distorted/screens/RubikScreenPattern.java
29 29 
import android.widget.TextView;
30 30 

  		




  31
  31
  
    
import org.distorted.objectlib.main.ObjectControl;


  		




  32
  
  
    
import org.distorted.objectlib.main.ObjectType;


  		




  33
  32
  
    

  		




  34
  33
  
    
import org.distorted.main.R;


  		




  35
  34
  
    
import org.distorted.dialogs.RubikDialogPattern;


  		




  ......




  61
  60
  
    
  void leaveScreen(RubikActivity act)


  		




  62
  61
  
    
    {


  		




  63
  62
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  64
  
  
    
    ObjectType object = RubikPatternList.getObject(mPatternOrdinal);


  		




  
  63
  
    
    int object = RubikPatternList.getObject(mPatternOrdinal);


  		




  65
  64
  
    

  		




  66
  65
  
    
    if( !play.setObject(act,object) )


  		




  67
  66
  
    
      {


  		




  68
  
  
    
      act.changeObject(play.getObject(),false);


  		




  
  67
  
    
      act.changeObject(object,false);


  		




  69
  68
  
    
      }


  		




  70
  69
  
    
    }


  		




  71
  70
  
    

  		












Also available in:  Unified diff