Project

General

Profile

« Previous | Next » 

Revision f5da732a

Added by Leszek Koltunski almost 3 years ago

Cube Control: step 2.

View differences:

src/main/java/org/distorted/main/RubikActivity.java
87 87
    private static int mScreenWidth, mScreenHeight;
88 88
    private boolean mPolicyAccepted, mIsChinese;
89 89
    private int mCurrentApiVersion;
90
    private boolean mIsLocked;
90
    private boolean mIsLocked, mRemLocked;
91 91

  
92 92
///////////////////////////////////////////////////////////////////////////////////////////////////
93 93

  
......
242 242
      view.onResume();
243 243
      view.initialize();
244 244
      restorePreferences();
245
      ScreenList.setState(this);
245
      ScreenList.setScreen(this);
246 246

  
247 247
      if( mJustStarted )
248 248
        {
......
253 253
        }
254 254

  
255 255
      boolean success = false;
256
      RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getStateClass();
256
      RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
257 257
      int object = play.getObject();
258 258
      int size   = play.getSize();
259 259

  
......
307 307

  
308 308
      for (int i = 0; i< ScreenList.LENGTH; i++)
309 309
        {
310
        ScreenList.getState(i).getStateClass().savePreferences(editor);
310
        ScreenList.getScreen(i).getScreenClass().savePreferences(editor);
311 311
        }
312 312

  
313 313
      ScreenList.savePreferences(editor);
......
332 332

  
333 333
      for (int i = 0; i< ScreenList.LENGTH; i++)
334 334
        {
335
        ScreenList.getState(i).getStateClass().restorePreferences(preferences);
335
        ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences);
336 336
        }
337 337

  
338 338
      ScreenList.restorePreferences(preferences);
......
545 545

  
546 546
    public boolean isLocked()
547 547
      {
548
      ScreenList state = ScreenList.getCurrentState();
548
      ScreenList state = ScreenList.getCurrentScreen();
549 549

  
550 550
      if( state== ScreenList.PLAY || state== ScreenList.READ || state== ScreenList.SOLV )
551 551
        {
......
555 555
      return false;
556 556
      }
557 557

  
558
///////////////////////////////////////////////////////////////////////////////////////////////////
559

  
560
    public void blockEverything()
561
      {
562
      mRemLocked = mIsLocked;
563
      mIsLocked = true;
564

  
565
      RubikPreRender pre = getPreRender();
566
      pre.blockEverything();
567
      }
568

  
569
///////////////////////////////////////////////////////////////////////////////////////////////////
570

  
571
    public void unblockEverything()
572
      {
573
      mIsLocked = mRemLocked;
574

  
575
      RubikPreRender pre = getPreRender();
576
      pre.unblockEverything();
577
      }
578

  
558 579
///////////////////////////////////////////////////////////////////////////////////////////////////
559 580

  
560 581
    public boolean retLocked()

Also available in: Unified diff