Revision be576d14
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 41 | 41 |
import org.distorted.scores.RubikScores; |
| 42 | 42 |
import org.distorted.scores.RubikScoresDownloader; |
| 43 | 43 |
import org.distorted.objects.ObjectList; |
| 44 |
import org.distorted.states.RubikState;
|
|
| 44 |
import org.distorted.states.StateList;
|
|
| 45 | 45 |
import org.distorted.states.RubikStatePlay; |
| 46 | 46 |
|
| 47 | 47 |
import java.util.Locale; |
| ... | ... | |
| 204 | 204 |
view.onResume(); |
| 205 | 205 |
view.initialize(); |
| 206 | 206 |
restorePreferences(); |
| 207 |
RubikState.setState(this);
|
|
| 207 |
StateList.setState(this);
|
|
| 208 | 208 |
|
| 209 | 209 |
if( mJustStarted ) |
| 210 | 210 |
{
|
| ... | ... | |
| 215 | 215 |
} |
| 216 | 216 |
|
| 217 | 217 |
boolean success = false; |
| 218 |
RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass();
|
|
| 218 |
RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
|
|
| 219 | 219 |
int object = play.getObject(); |
| 220 | 220 |
int size = play.getSize(); |
| 221 | 221 |
|
| ... | ... | |
| 267 | 267 |
BaseEffect.Type.getType(i).savePreferences(editor); |
| 268 | 268 |
} |
| 269 | 269 |
|
| 270 |
for (int i=0; i<RubikState.LENGTH; i++)
|
|
| 270 |
for (int i = 0; i< StateList.LENGTH; i++)
|
|
| 271 | 271 |
{
|
| 272 |
RubikState.getState(i).getStateClass().savePreferences(editor);
|
|
| 272 |
StateList.getState(i).getStateClass().savePreferences(editor);
|
|
| 273 | 273 |
} |
| 274 | 274 |
|
| 275 |
RubikState.savePreferences(editor);
|
|
| 275 |
StateList.savePreferences(editor);
|
|
| 276 | 276 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 277 | 277 |
view.getPreRender().savePreferences(editor); |
| 278 | 278 |
|
| ... | ... | |
| 292 | 292 |
BaseEffect.Type.getType(i).restorePreferences(preferences); |
| 293 | 293 |
} |
| 294 | 294 |
|
| 295 |
for (int i=0; i< RubikState.LENGTH; i++)
|
|
| 295 |
for (int i = 0; i< StateList.LENGTH; i++)
|
|
| 296 | 296 |
{
|
| 297 |
RubikState.getState(i).getStateClass().restorePreferences(preferences);
|
|
| 297 |
StateList.getState(i).getStateClass().restorePreferences(preferences);
|
|
| 298 | 298 |
} |
| 299 | 299 |
|
| 300 |
RubikState.restorePreferences(preferences);
|
|
| 300 |
StateList.restorePreferences(preferences);
|
|
| 301 | 301 |
|
| 302 | 302 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 303 | 303 |
view.getPreRender().restorePreferences(preferences); |
| ... | ... | |
| 503 | 503 |
|
| 504 | 504 |
public boolean isLocked() |
| 505 | 505 |
{
|
| 506 |
RubikState state = RubikState.getCurrentState();
|
|
| 506 |
StateList state = StateList.getCurrentState();
|
|
| 507 | 507 |
|
| 508 |
if( state==RubikState.PLAY || state==RubikState.READ || state==RubikState.SOLV )
|
|
| 508 |
if( state== StateList.PLAY || state== StateList.READ || state== StateList.SOLV )
|
|
| 509 | 509 |
{
|
| 510 | 510 |
return mIsLocked; |
| 511 | 511 |
} |
Also available in: Unified diff
Rename some classes.