Project

General

Profile

« Previous | Next » 

Revision 2afc6754

Added by Leszek Koltunski over 2 years ago

Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.

View differences:

src/main/java/org/distorted/screens/RubikScreenPattern.java
30 30 
import android.widget.LinearLayout;
31 31 
import android.widget.TextView;
32 32 

  		




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


  		




  33
  34
  
    
import org.distorted.objectlib.main.ObjectType;


  		




  34
  35
  
    

  		




  35
  36
  
    
import org.distorted.main.R;


  		




  36
  37
  
    
import org.distorted.dialogs.RubikDialogPattern;


  		




  37
  38
  
    
import org.distorted.helpers.TransparentImageButton;


  		




  38
  39
  
    
import org.distorted.main.RubikActivity;


  		




  39
  
  
    
import org.distorted.objectlib.main.ObjectPreRender;


  		




  40
  40
  
    
import org.distorted.patterns.RubikPattern;


  		




  41
  41
  
    
import org.distorted.patterns.RubikPatternList;


  		




  42
  42
  
    

  		




  ......




  177
  177
  
    
      public void onClick(View v)


  		




  178
  178
  
    
        {


  		




  179
  179
  
    
        RubikPattern pattern = RubikPattern.getInstance();


  		




  180
  
  
    
        ObjectPreRender pre = act.getPreRender();


  		




  181
  
  
    
        pattern.backMove( pre, mPatternOrdinal, mCategory, mPattern);


  		




  
  180
  
    
        ObjectControl control = act.getControl();


  		




  
  181
  
    
        pattern.backMove( control, mPatternOrdinal, mCategory, mPattern);


  		




  182
  182
  
    
        int currMove = pattern.getCurMove(mPatternOrdinal, mCategory, mPattern);


  		




  183
  183
  
    
        mMovesText.setText(act.getString(R.string.mo_placeholder,currMove,mNumMoves));


  		




  184
  184
  
    
        }


  		




  ......




  198
  198
  
    
      public void onClick(View v)


  		




  199
  199
  
    
        {


  		




  200
  200
  
    
        RubikPattern pattern = RubikPattern.getInstance();


  		




  201
  
  
    
        ObjectPreRender pre = act.getPreRender();


  		




  202
  
  
    
        pattern.makeMove( pre, mPatternOrdinal, mCategory, mPattern);


  		




  
  201
  
    
        ObjectControl control = act.getControl();


  		




  
  202
  
    
        pattern.makeMove( control, mPatternOrdinal, mCategory, mPattern);


  		




  203
  203
  
    
        int currMove = pattern.getCurMove(mPatternOrdinal, mCategory, mPattern);


  		




  204
  204
  
    
        mMovesText.setText(act.getString(R.string.mo_placeholder,currMove,mNumMoves));


  		




  205
  205
  
    
        }


  		












Also available in:  Unified diff