Revision 79c7c950
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/effects/BaseEffect.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import java.lang.reflect.InvocationTargetException; |
| 13 | 13 |
import java.lang.reflect.Method; |
| 14 |
import android.content.SharedPreferences; |
|
| 15 | 14 |
|
| 16 | 15 |
import org.distorted.objectlib.effects.fastscramble.FastScrambleEffect; |
| 17 | 16 |
import org.distorted.objectlib.effects.present.PresentEffect; |
| ... | ... | |
| 21 | 20 |
import org.distorted.objectlib.effects.solve.SolveEffect; |
| 22 | 21 |
import org.distorted.objectlib.effects.win.WinEffect; |
| 23 | 22 |
import org.distorted.objectlib.R; |
| 23 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
|
| 24 | 24 |
import org.distorted.objectlib.main.ObjectPreRender; |
| 25 | 25 |
|
| 26 | 26 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 104 | 104 |
|
| 105 | 105 |
//////////////////////////////////////////////////////////////////////////////// |
| 106 | 106 |
|
| 107 |
public void savePreferences(SharedPreferences.Editor editor)
|
|
| 107 |
public void savePreferences(OperatingSystemInterface os)
|
|
| 108 | 108 |
{
|
| 109 | 109 |
String name = name(); |
| 110 | 110 |
|
| 111 |
editor.putInt(name+"_Pos" , mCurrentPos );
|
|
| 112 |
editor.putInt(name+"_Type", mCurrentType);
|
|
| 111 |
os.putInt(name+"_Pos" , mCurrentPos );
|
|
| 112 |
os.putInt(name+"_Type", mCurrentType);
|
|
| 113 | 113 |
} |
| 114 | 114 |
|
| 115 | 115 |
//////////////////////////////////////////////////////////////////////////////// |
| 116 | 116 |
|
| 117 |
public void restorePreferences(SharedPreferences preferences)
|
|
| 117 |
public void restorePreferences(OperatingSystemInterface os)
|
|
| 118 | 118 |
{
|
| 119 | 119 |
String name = name(); |
| 120 | 120 |
|
| 121 |
mCurrentPos = preferences.getInt(name+"_Pos" , mDefaultPos );
|
|
| 122 |
mCurrentType = preferences.getInt(name+"_Type", mDefaultType);
|
|
| 121 |
mCurrentPos = os.getInt(name+"_Pos" , mDefaultPos );
|
|
| 122 |
mCurrentType = os.getInt(name+"_Type", mDefaultType);
|
|
| 123 | 123 |
} |
| 124 | 124 |
|
| 125 | 125 |
//////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import static org.distorted.objectlib.helpers.OperatingSystemInterface.*; |
| 13 | 13 |
|
| 14 |
import android.content.SharedPreferences; |
|
| 15 |
|
|
| 16 | 14 |
import org.distorted.library.main.QuatHelper; |
| 17 | 15 |
import org.distorted.library.type.Static4D; |
| 18 | 16 |
|
| ... | ... | |
| 784 | 782 |
|
| 785 | 783 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 786 | 784 |
|
| 787 |
public void savePreferences(SharedPreferences.Editor editor) |
|
| 785 |
public OperatingSystemInterface getOS() |
|
| 786 |
{
|
|
| 787 |
return mOS; |
|
| 788 |
} |
|
| 789 |
|
|
| 790 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 791 |
|
|
| 792 |
public void savePreferences() |
|
| 788 | 793 |
{
|
| 789 |
mPreRender.savePreferences(editor);
|
|
| 794 |
mPreRender.savePreferences(mOS);
|
|
| 790 | 795 |
|
| 791 | 796 |
for( int i=0; i< BaseEffect.Type.LENGTH; i++ ) |
| 792 | 797 |
{
|
| 793 |
BaseEffect.Type.getType(i).savePreferences(editor);
|
|
| 798 |
BaseEffect.Type.getType(i).savePreferences(mOS);
|
|
| 794 | 799 |
} |
| 795 | 800 |
} |
| 796 | 801 |
|
| 797 | 802 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 798 | 803 |
|
| 799 |
public void restorePreferences(SharedPreferences preferences)
|
|
| 804 |
public void restorePreferences() |
|
| 800 | 805 |
{
|
| 801 |
mPreRender.restorePreferences(preferences);
|
|
| 806 |
mPreRender.restorePreferences(mOS);
|
|
| 802 | 807 |
|
| 803 | 808 |
for (int i=0; i<BaseEffect.Type.LENGTH; i++) |
| 804 | 809 |
{
|
| 805 |
BaseEffect.Type.getType(i).restorePreferences(preferences);
|
|
| 810 |
BaseEffect.Type.getType(i).restorePreferences(mOS);
|
|
| 806 | 811 |
} |
| 807 | 812 |
} |
| 808 | 813 |
|
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import android.content.SharedPreferences; |
|
| 13 |
|
|
| 14 | 12 |
import org.distorted.library.message.EffectListener; |
| 15 | 13 |
import org.distorted.library.type.Static3D; |
| 16 | 14 |
|
| ... | ... | |
| 20 | 18 |
import org.distorted.objectlib.effects.scramble.ScrambleEffect; |
| 21 | 19 |
import org.distorted.objectlib.helpers.BlockController; |
| 22 | 20 |
import org.distorted.objectlib.helpers.MovesFinished; |
| 21 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
|
| 23 | 22 |
import org.distorted.objectlib.shape.ShapeDodecahedron; |
| 24 | 23 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 25 | 24 |
import org.distorted.objectlib.shape.ShapeOctahedron; |
| ... | ... | |
| 35 | 34 |
private InitAssets mAsset; |
| 36 | 35 |
private int mOrdinal; |
| 37 | 36 |
private TwistyObject mOldObject, mNewObject; |
| 38 |
private SharedPreferences mPreferences;
|
|
| 37 |
private OperatingSystemInterface mOS;
|
|
| 39 | 38 |
private MovesFinished mAddActionListener; |
| 40 | 39 |
private final BlockController mBlockController; |
| 41 | 40 |
private final ObjectLibInterface mInterface; |
| ... | ... | |
| 137 | 136 |
mController.setTouchControl(mNewObject); |
| 138 | 137 |
mNewObject.setObjectRatioNow(mScale, mController.getScalingSize() ); |
| 139 | 138 |
|
| 140 |
if( mPreferences!=null )
|
|
| 139 |
if( mOS!=null )
|
|
| 141 | 140 |
{
|
| 142 |
mNewObject.restorePreferences(mPreferences);
|
|
| 143 |
mPreferences = null;
|
|
| 141 |
mNewObject.restorePreferences(mOS);
|
|
| 142 |
mOS = null;
|
|
| 144 | 143 |
} |
| 145 | 144 |
|
| 146 | 145 |
mIsSolved = mNewObject.isSolved(); |
| ... | ... | |
| 511 | 510 |
// PUBLIC API |
| 512 | 511 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 513 | 512 |
|
| 514 |
public void savePreferences(SharedPreferences.Editor editor)
|
|
| 513 |
public void savePreferences(OperatingSystemInterface os)
|
|
| 515 | 514 |
{
|
| 516 | 515 |
if( mNewObject!=null ) |
| 517 | 516 |
{
|
| 518 |
mNewObject.savePreferences(editor);
|
|
| 517 |
mNewObject.savePreferences(os);
|
|
| 519 | 518 |
} |
| 520 | 519 |
} |
| 521 | 520 |
|
| 522 | 521 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 523 | 522 |
|
| 524 |
public void restorePreferences(SharedPreferences preferences)
|
|
| 523 |
public void restorePreferences(OperatingSystemInterface os)
|
|
| 525 | 524 |
{
|
| 526 |
mPreferences = preferences;
|
|
| 525 |
mOS = os;
|
|
| 527 | 526 |
} |
| 528 | 527 |
|
| 529 | 528 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 14 | 14 |
import java.io.InputStream; |
| 15 | 15 |
import java.util.Random; |
| 16 | 16 |
|
| 17 |
import android.content.SharedPreferences; |
|
| 18 | 17 |
import android.graphics.Bitmap; |
| 19 | 18 |
import android.graphics.Canvas; |
| 20 | 19 |
import android.graphics.Paint; |
| ... | ... | |
| 1385 | 1384 |
|
| 1386 | 1385 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1387 | 1386 |
|
| 1388 |
synchronized void restorePreferences(SharedPreferences preferences)
|
|
| 1387 |
synchronized void restorePreferences(OperatingSystemInterface os)
|
|
| 1389 | 1388 |
{
|
| 1390 | 1389 |
boolean error = false; |
| 1391 | 1390 |
String key = getShortName(); |
| 1392 | 1391 |
|
| 1393 | 1392 |
for(int i=0; i<mNumCubits; i++) |
| 1394 | 1393 |
{
|
| 1395 |
mQuatDebug[i] = mCubits[i].restorePreferences(key,preferences);
|
|
| 1394 |
mQuatDebug[i] = mCubits[i].restorePreferences(key,os);
|
|
| 1396 | 1395 |
|
| 1397 | 1396 |
if( mQuatDebug[i]>=0 && mQuatDebug[i]<mNumQuats ) |
| 1398 | 1397 |
{
|
| ... | ... | |
| 1429 | 1428 |
|
| 1430 | 1429 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1431 | 1430 |
|
| 1432 |
void savePreferences(SharedPreferences.Editor editor)
|
|
| 1431 |
void savePreferences(OperatingSystemInterface os)
|
|
| 1433 | 1432 |
{
|
| 1434 | 1433 |
String key = getShortName(); |
| 1435 |
for(int i=0; i<mNumCubits; i++) mCubits[i].savePreferences(key,editor);
|
|
| 1434 |
for(int i=0; i<mNumCubits; i++) mCubits[i].savePreferences(key,os);
|
|
| 1436 | 1435 |
} |
| 1437 | 1436 |
|
| 1438 | 1437 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1439 | 1438 |
|
| 1440 |
public void removePreferences(SharedPreferences.Editor editor)
|
|
| 1439 |
public void removePreferences(OperatingSystemInterface os)
|
|
| 1441 | 1440 |
{
|
| 1442 | 1441 |
String key = getShortName(); |
| 1443 |
for(int i=0; i<mNumCubits; i++) mCubits[i].removePreferences(key,editor);
|
|
| 1442 |
for(int i=0; i<mNumCubits; i++) mCubits[i].removePreferences(key,os);
|
|
| 1444 | 1443 |
} |
| 1445 | 1444 |
|
| 1446 | 1445 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/TwistyObjectCubit.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import android.content.SharedPreferences; |
|
| 13 |
|
|
| 14 | 12 |
import org.distorted.library.main.QuatHelper; |
| 15 | 13 |
import org.distorted.library.type.Static4D; |
| 14 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
|
| 16 | 15 |
|
| 17 | 16 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 18 | 17 |
|
| ... | ... | |
| 175 | 174 |
|
| 176 | 175 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 177 | 176 |
|
| 178 |
void savePreferences(String key, SharedPreferences.Editor editor)
|
|
| 177 |
void savePreferences(String key, OperatingSystemInterface os)
|
|
| 179 | 178 |
{
|
| 180 |
editor.putInt(createKey(key), mQuatIndex);
|
|
| 179 |
os.putInt(createKey(key), mQuatIndex);
|
|
| 181 | 180 |
} |
| 182 | 181 |
|
| 183 | 182 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 184 | 183 |
|
| 185 |
void removePreferences(String key, SharedPreferences.Editor editor)
|
|
| 184 |
void removePreferences(String key, OperatingSystemInterface os)
|
|
| 186 | 185 |
{
|
| 187 |
editor.remove(createKey(key));
|
|
| 186 |
os.remove(createKey(key));
|
|
| 188 | 187 |
} |
| 189 | 188 |
|
| 190 | 189 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 191 | 190 |
|
| 192 |
int restorePreferences(String key, SharedPreferences preferences)
|
|
| 191 |
int restorePreferences(String key, OperatingSystemInterface os)
|
|
| 193 | 192 |
{
|
| 194 |
mQuatIndex = preferences.getInt(createKey(key), 0);
|
|
| 193 |
mQuatIndex = os.getInt(createKey(key), 0);
|
|
| 195 | 194 |
return mQuatIndex; |
| 196 | 195 |
} |
| 197 | 196 |
|
Also available in: Unified diff
Move the SharedPreferences to the OSInterface