Revision dd1a65c1
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/tutorials/TutorialActivity.java | ||
|---|---|---|
| 34 | 34 |
|
| 35 | 35 |
import org.distorted.library.main.DistortedLibrary; |
| 36 | 36 |
|
| 37 |
import org.distorted.main.RubikSurfaceView; |
|
| 38 |
import org.distorted.network.RubikScores; |
|
| 39 |
import org.distorted.objectlib.effects.BaseEffect; |
|
| 40 | 37 |
import org.distorted.objectlib.main.ObjectPreRender; |
| 41 | 38 |
import org.distorted.objectlib.main.ObjectType; |
| 42 | 39 |
import org.distorted.objectlib.main.TwistyObject; |
| ... | ... | |
| 45 | 42 |
|
| 46 | 43 |
import org.distorted.main.R; |
| 47 | 44 |
import org.distorted.dialogs.RubikDialogError; |
| 48 |
import org.distorted.screens.ScreenList; |
|
| 49 | 45 |
|
| 50 | 46 |
import static org.distorted.main.RubikRenderer.BRIGHTNESS; |
| 51 | 47 |
|
| ... | ... | |
| 67 | 63 |
private FirebaseAnalytics mFirebaseAnalytics; |
| 68 | 64 |
private static int mScreenWidth, mScreenHeight; |
| 69 | 65 |
private int mCurrentApiVersion; |
| 70 |
private TutorialState mState;
|
|
| 66 |
private TutorialScreen mState;
|
|
| 71 | 67 |
private String mURL; |
| 72 | 68 |
private int mObjectOrdinal; |
| 73 | 69 |
private TutorialWebView mWebView; |
| ... | ... | |
| 151 | 147 |
final int color = (int)(BRIGHTNESS*255); |
| 152 | 148 |
viewR.setBackgroundColor( (0xFF<<24)+(color<<16)+(color<<8)+color); |
| 153 | 149 |
|
| 154 |
if( mState==null ) mState = new TutorialState();
|
|
| 150 |
if( mState==null ) mState = new TutorialScreen();
|
|
| 155 | 151 |
|
| 156 | 152 |
mState.createRightPane(this,width); |
| 157 | 153 |
|
| ... | ... | |
| 249 | 245 |
|
| 250 | 246 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 251 | 247 |
|
| 252 |
TutorialState getState()
|
|
| 248 |
TutorialScreen getState()
|
|
| 253 | 249 |
{
|
| 254 | 250 |
return mState; |
| 255 | 251 |
} |
| ... | ... | |
| 296 | 292 |
|
| 297 | 293 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 298 | 294 |
|
| 299 |
public boolean isLocked() |
|
| 295 |
public boolean isLocked()
|
|
| 300 | 296 |
{
|
| 301 | 297 |
return retLocked(); |
| 302 | 298 |
} |
Also available in: Unified diff
Move ObjectControl, the next big chunk of code, to objectlib.