Revision 88a3e972
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
import org.distorted.objectlib.main.TwistyObject; |
| 43 | 43 |
import org.distorted.objectlib.main.ObjectType; |
| 44 |
import org.distorted.objectlib.helpers.BlockController; |
|
| 45 |
import org.distorted.objectlib.helpers.TwistyPreRender; |
|
| 44 | 46 |
|
| 45 | 47 |
import org.distorted.dialogs.RubikDialogError; |
| 46 | 48 |
import org.distorted.dialogs.RubikDialogPrivacy; |
| 47 | 49 |
import org.distorted.effects.BaseEffect; |
| 48 |
import org.distorted.helpers.BlockController; |
|
| 49 |
import org.distorted.helpers.TwistyActivity; |
|
| 50 |
import org.distorted.helpers.TwistyPreRender; |
|
| 50 |
import org.distorted.objectlib.helpers.TwistyActivity; |
|
| 51 | 51 |
import org.distorted.network.RubikScores; |
| 52 | 52 |
import org.distorted.network.RubikNetwork; |
| 53 | 53 |
import org.distorted.screens.ScreenList; |
| ... | ... | |
| 499 | 499 |
pre.changeObject(newObject); |
| 500 | 500 |
} |
| 501 | 501 |
|
| 502 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 503 |
|
|
| 504 |
public boolean isLocked() |
|
| 505 |
{
|
|
| 506 |
ScreenList state = ScreenList.getCurrentScreen(); |
|
| 507 |
|
|
| 508 |
if( state== ScreenList.PLAY || state== ScreenList.READ || state== ScreenList.SOLV ) |
|
| 509 |
{
|
|
| 510 |
return retLocked(); |
|
| 511 |
} |
|
| 512 |
|
|
| 513 |
return false; |
|
| 514 |
} |
|
| 515 |
|
|
| 502 | 516 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 503 | 517 |
|
| 504 | 518 |
public void setupObject(ObjectType object, int[][] moves) |
Also available in: Unified diff
Move more code to objectlib.