Project

General

Profile

« Previous | Next » 

Revision 967b79dc

Added by Leszek Koltunski almost 3 years ago

Progress with RubikControl.

View differences:

src/main/java/org/distorted/screens/RubikScreenPlay.java
33 33 
import android.widget.LinearLayout;
34 34 
import android.widget.PopupWindow;
35 35 

  		




  
  36
  
    
import org.distorted.control.RubikControl;


  		




  36
  37
  
    
import org.distorted.dialogs.RubikDialogAbout;


  		




  37
  38
  
    
import org.distorted.dialogs.RubikDialogPattern;


  		




  38
  39
  
    
import org.distorted.dialogs.RubikDialogScores;


  		




  ......




  55
  56
  
    

  		




  56
  57
  
    
  private static final int[] BUTTON_LABELS = { R.string.scores,


  		




  57
  58
  
    
                                               R.string.patterns,


  		




  58
  
  
    
                                           //    R.string.control,


  		




  
  59
  
    
                                               R.string.control,


  		




  59
  60
  
    
                                               R.string.solver,


  		




  60
  61
  
    
                                               R.string.tutorials,


  		




  61
  62
  
    
                                               R.string.about };


  		




  ......




  395
  396
  
    
              pDiag.setArguments(pBundle);


  		




  396
  397
  
    
              pDiag.show( act.getSupportFragmentManager(), RubikDialogPattern.getDialogTag() );


  		




  397
  398
  
    
              break;


  		




  398
  
  
    
/*


  		




  399
  399
  
    
      case 2: RubikControl control = RubikControl.getInstance();


  		




  400
  400
  
    
              control.animateAll(act);


  		




  401
  401
  
    
              break;


  		




  402
  
  
    
 */


  		




  403
  
  
    
      case 2: ScreenList.switchScreen(act, ScreenList.SVER);


  		




  
  402
  
    
      case 3: ScreenList.switchScreen(act, ScreenList.SVER);


  		




  404
  403
  
    
              break;


  		




  405
  
  
    
      case 3: RubikDialogTutorial tDiag = new RubikDialogTutorial();


  		




  
  404
  
    
      case 4: RubikDialogTutorial tDiag = new RubikDialogTutorial();


  		




  406
  405
  
    
              Bundle tBundle = new Bundle();


  		




  407
  406
  
    
              int tOrd = getTutorialOrdinal();


  		




  408
  407
  
    
              tBundle.putInt("tab", tOrd );


  		




  409
  408
  
    
              tDiag.setArguments(tBundle);


  		




  410
  409
  
    
              tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );


  		




  411
  410
  
    
              break;


  		




  412
  
  
    
      case 4: RubikDialogAbout aDiag = new RubikDialogAbout();


  		




  
  411
  
    
      case 5: RubikDialogAbout aDiag = new RubikDialogAbout();


  		




  413
  412
  
    
              aDiag.show(act.getSupportFragmentManager(), null);


  		




  414
  413
  
    
              break;


  		




  415
  414
  
    
      }


  		












Also available in:  Unified diff