Project

General

Profile

« Previous | Next » 

Revision 55e6be1d

Added by Leszek Koltunski almost 3 years ago

Abstract the part that controls the 'Locked' and 'Back Moves' buttons from the two activities: the main one and the tutorial one.
This code had been duplicated there.

View differences:

src/main/java/org/distorted/screens/RubikScreenPlay.java
37 37 
import org.distorted.dialogs.RubikDialogPattern;
38 38 
import org.distorted.dialogs.RubikDialogScores;
39 39 
import org.distorted.dialogs.RubikDialogTutorial;
40 
import org.distorted.helpers.TransparentButton;
41 
import org.distorted.helpers.TransparentImageButton;
40 42 
import org.distorted.main.R;
41 43 
import org.distorted.main.RubikActivity;
42 44 
import org.distorted.main.RubikPreRender;
......
291 293 
              mSize   = sizes[index];
292 294 
              act.changeObject(list,sizes[index], true);
293 295 
              adjustLevels(act);
294 
              mMoves.clear();
296 
              mController.clearMoves();
295 297 
              }
296 298 

  		




  297
  299
  
    
            mObjectPopup.dismiss();


  		




  ......




  426
  428
  
    
      public void onClick(View v)


  		




  427
  429
  
    
        {


  		




  428
  430
  
    
        act.getPreRender().solveObject();


  		




  429
  
  
    
        mMoves.clear();


  		




  
  431
  
    
        mController.clearMoves();


  		




  430
  432
  
    
        }


  		




  431
  433
  
    
      });


  		




  432
  434
  
    
    }


  		












Also available in:  Unified diff