Project

General

Profile

« Previous | Next » 

Revision dd1a65c1

Added by Leszek Koltunski over 2 years ago

Move ObjectControl, the next big chunk of code, to objectlib.

View differences:

src/main/java/org/distorted/screens/RubikScreenBase.java
22 22 
import android.widget.ImageButton;
23 23 
import android.widget.LinearLayout;
24 24 

  		




  25
  
  
    
import org.distorted.helpers.MovesAndLockController;


  		




  
  25
  
    
import org.distorted.helpers.LockController;


  		




  
  26
  
    
import org.distorted.helpers.MovesController;


  		




  26
  27
  
    
import org.distorted.objectlib.helpers.TwistyActivity;


  		




  27
  28
  
    
import org.distorted.main.R;


  		




  28
  29
  
    
import org.distorted.main.RubikActivity;


  		




  ......




  31
  32
  
    

  		




  32
  33
  
    
abstract class RubikScreenBase extends RubikScreenAbstract


  		




  33
  34
  
    
  {


  		




  34
  
  
    
  MovesAndLockController mController;


  		




  
  35
  
    
  private final LockController mLockController;


  		




  
  36
  
    
  protected MovesController mMovesController;


  		




  35
  37
  
    

  		




  36
  38
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  37
  39
  
    

  		




  38
  40
  
    
  void createBottomPane(final RubikActivity act, float width, ImageButton button)


  		




  39
  41
  
    
    {


  		




  40
  
  
    
    mController.clearMoves(act);


  		




  
  42
  
    
    mMovesController.clearMoves(act);


  		




  41
  43
  
    

  		




  42
  44
  
    
    LinearLayout layoutBot = act.findViewById(R.id.lowerBar);


  		




  43
  45
  
    
    layoutBot.removeAllViews();


  		




  ......




  51
  53
  
    
    LinearLayout layoutRight = new LinearLayout(act);


  		




  52
  54
  
    
    layoutRight.setLayoutParams(params);


  		




  53
  55
  
    

  		




  54
  
  
    
    mController.setupPrevButton(act,width);


  		




  55
  
  
    
    layoutLeft.addView(mController.getPrevButton());


  		




  56
  
  
    
    mController.setupLockButton(act,width);


  		




  57
  
  
    
    layoutMid.addView(mController.getLockButton());


  		




  
  56
  
    
    mMovesController.setupButton(act,width);


  		




  
  57
  
    
    layoutLeft.addView(mMovesController.getButton());


  		




  
  58
  
    
    mLockController.setupButton(act,width);


  		




  
  59
  
    
    layoutMid.addView(mLockController.getButton());


  		




  58
  60
  
    
    layoutRight.addView(button);


  		




  59
  61
  
    

  		




  60
  62
  
    
    layoutBot.addView(layoutLeft);


  		




  ......




  66
  68
  
    

  		




  67
  69
  
    
  public void setLockState(final RubikActivity act)


  		




  68
  70
  
    
    {


  		




  69
  
  
    
    mController.setLockState(act);


  		




  
  71
  
    
    mLockController.setState(act);


  		




  70
  72
  
    
    }


  		




  71
  73
  
    

  		




  72
  74
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  ......




  74
  76
  
    

  		




  75
  77
  
    
  public RubikScreenBase()


  		




  76
  78
  
    
    {


  		




  77
  
  
    
    mController = new MovesAndLockController();


  		




  
  79
  
    
    mLockController = new LockController();


  		




  
  80
  
    
    mMovesController= new MovesController();


  		




  78
  81
  
    
    }


  		




  79
  82
  
    

  		




  80
  83
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  81
  84
  
    

  		




  82
  85
  
    
  public void addMove(TwistyActivity act, int axis, int row, int angle)


  		




  83
  86
  
    
    {


  		




  84
  
  
    
    mController.addMove(act,axis,row,angle);


  		




  
  87
  
    
    mMovesController.addMove(act,axis,row,angle);


  		




  85
  88
  
    
    }


  		




  86
  89
  
    

  		




  87
  90
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  88
  91
  
    

  		




  89
  92
  
    
  public void reddenLock(final TwistyActivity act)


  		




  90
  93
  
    
    {


  		




  91
  
  
    
    mController.reddenLock(act);


  		




  
  94
  
    
    mLockController.reddenLock(act);


  		




  92
  95
  
    
    }


  		




  93
  96
  
    
  }


  		












Also available in:  Unified diff