Revision 7bb30586
Added by Leszek Koltunski 6 months ago
| src/main/java/org/distorted/playui/PlayActivity.java | ||
|---|---|---|
| 58 | 58 |
private int mHeightUpperBar; |
| 59 | 59 |
private boolean mObjectLocal; |
| 60 | 60 |
private int mObjectOrdinal; |
| 61 |
private int mLevel; |
|
| 61 | 62 |
private boolean mModeFree; |
| 62 | 63 |
private boolean mJustStarted; |
| 63 | 64 |
private FirebaseAnalytics mFirebaseAnalytics; |
| ... | ... | |
| 79 | 80 |
|
| 80 | 81 |
if( b!=null ) |
| 81 | 82 |
{
|
| 83 |
mLevel = b.getInt("level");
|
|
| 82 | 84 |
mObjectName = b.getString("name");
|
| 83 | 85 |
mNumScrambles = b.getInt("scrambles");
|
| 84 | 86 |
mObjectLocal = b.getBoolean("local");
|
| ... | ... | |
| 87 | 89 |
} |
| 88 | 90 |
else |
| 89 | 91 |
{
|
| 92 |
mLevel = 0; |
|
| 90 | 93 |
mObjectName = ""; |
| 91 | 94 |
mNumScrambles = 0; |
| 92 | 95 |
mObjectLocal = true; |
| ... | ... | |
| 216 | 219 |
ObjectControl control = view.getObjectControl(); |
| 217 | 220 |
view.onResume(); |
| 218 | 221 |
|
| 219 |
ScreenList.switchScreen(this, mModeFree ? ScreenList.FREE : ScreenList.SCRA ); |
|
| 220 | 222 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
| 221 | 223 |
restorePreferences(preferences); |
| 222 | 224 |
restoreMoves(preferences); |
| 223 | 225 |
|
| 226 |
ScreenList sl = mJustStarted ? |
|
| 227 |
(mModeFree ? ScreenList.FREE : ScreenList.SCRA) : |
|
| 228 |
ScreenList.getCurrentScreen(); |
|
| 229 |
|
|
| 230 |
ScreenList.switchScreen(this,sl); |
|
| 231 |
|
|
| 224 | 232 |
mJustStarted = false; |
| 225 | 233 |
|
| 226 | 234 |
if( mObjectName.length()>0 ) |
| ... | ... | |
| 367 | 375 |
return mNumScrambles; |
| 368 | 376 |
} |
| 369 | 377 |
|
| 378 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 379 |
|
|
| 380 |
public int getLevel() |
|
| 381 |
{
|
|
| 382 |
return mLevel; |
|
| 383 |
} |
|
| 384 |
|
|
| 370 | 385 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 371 | 386 |
|
| 372 | 387 |
public ObjectControl getControl() |
Also available in: Unified diff
Remove all old UI 1.0 classes