Project

General

Profile

« Previous | Next » 

Revision 85038b84

Added by Leszek Koltunski almost 2 years ago

New UI

View differences:

src/main/java/org/distorted/main/RubikObjectLibInterface.java
45 45
import org.distorted.external.RubikScores;
46 46
import org.distorted.objects.RubikObject;
47 47
import org.distorted.objects.RubikObjectList;
48
import org.distorted.screens.RubikScreenFreePlay;
48 49
import org.distorted.screens.RubikScreenPlay;
49 50
import org.distorted.screens.RubikScreenReady;
50 51
import org.distorted.screens.RubikScreenSolver;
......
254 255

  
255 256
  public void onFinishRotation(int axis, int row, int angle)
256 257
    {
257
    if( ScreenList.getCurrentScreen()== ScreenList.SOLV )
258
    ScreenList curr = ScreenList.getCurrentScreen();
259

  
260
    if( curr==ScreenList.SOLV )
258 261
      {
259 262
      RubikScreenSolving solv = (RubikScreenSolving) ScreenList.SOLV.getScreenClass();
260 263
      solv.addMove(mAct.get(), axis, row, angle);
261 264
      }
262
    if( ScreenList.getCurrentScreen()== ScreenList.PLAY )
265
    if( curr==ScreenList.FREE )
263 266
      {
264
      RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
265
      play.addMove(mAct.get(), axis, row, angle);
267
      RubikScreenFreePlay free = (RubikScreenFreePlay) ScreenList.FREE.getScreenClass();
268
      free.addMove(mAct.get(), axis, row, angle);
266 269
      }
267 270
    }
268 271

  
......
293 296
    {
294 297
    ScreenList curr = ScreenList.getCurrentScreen();
295 298

  
296
    if( curr==ScreenList.PLAY )
299
    if( curr==ScreenList.FREE )
297 300
      {
298
      RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
299
      play.reddenLock(mAct.get());
301
      RubikScreenFreePlay free = (RubikScreenFreePlay) ScreenList.FREE.getScreenClass();
302
      free.reddenLock(mAct.get());
300 303
      }
301 304
    else if( curr==ScreenList.READ )
302 305
      {

Also available in: Unified diff