Revision 337f4660
Added by Leszek Koltunski 8 months ago
src/main/java/org/distorted/patternui/PatternActivity.java | ||
---|---|---|
9 | 9 |
|
10 | 10 |
package org.distorted.patternui; |
11 | 11 |
|
12 |
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; |
|
13 |
|
|
14 | 12 |
import android.content.SharedPreferences; |
15 | 13 |
import android.os.Build; |
16 | 14 |
import android.os.Bundle; |
... | ... | |
51 | 49 |
private static final int ACTIVITY_NUMBER = 1; |
52 | 50 |
private static final float RATIO_INSET= 0.09f; |
53 | 51 |
|
54 |
private boolean mJustStarted; |
|
55 | 52 |
private static int mScreenWidth, mScreenHeight; |
56 | 53 |
private int mCurrentApiVersion; |
57 | 54 |
private int mHeightUpperBar; |
... | ... | |
68 | 65 |
setContentView(R.layout.pattern); |
69 | 66 |
hideNavigationBar(); |
70 | 67 |
|
71 |
mJustStarted = true; |
|
72 | 68 |
Bundle b = getIntent().getExtras(); |
73 | 69 |
mObjectOrdinal = b!=null ? b.getInt("obj") : 0; |
74 | 70 |
|
... | ... | |
197 | 193 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
198 | 194 |
restorePreferences(preferences); |
199 | 195 |
ScreenList.setScreen(this); |
200 |
|
|
201 |
if( mJustStarted ) |
|
202 |
{ |
|
203 |
mJustStarted = false; |
|
204 |
RubikObjectList.restoreMeshState(preferences); |
|
205 |
} |
|
206 | 196 |
} |
207 | 197 |
|
208 | 198 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
302 | 292 |
OSInterface os = view.getInterface(); |
303 | 293 |
InitAssets asset = new InitAssets(jsonStream,meshStream,os); |
304 | 294 |
|
305 |
control.changeIfDifferent(mObjectOrdinal,name,MESH_NICE,iconMode,asset);
|
|
295 |
control.changeIfDifferent(mObjectOrdinal,name,iconMode,asset); |
|
306 | 296 |
} |
307 | 297 |
} |
Also available in: Unified diff
remove 'MESH_NICE'