Revision b6606976
Added by Leszek Koltunski 21 days ago
| src/main/java/org/distorted/bandaged/BandagedActivity.java | ||
|---|---|---|
| 21 | 21 |
import android.view.ViewGroup; |
| 22 | 22 |
import android.widget.LinearLayout; |
| 23 | 23 |
|
| 24 |
import androidx.preference.PreferenceManager; |
|
| 25 |
|
|
| 24 | 26 |
import org.distorted.dialogs.DialogError; |
| 25 | 27 |
import org.distorted.dialogs.DialogMessage; |
| 26 | 28 |
import org.distorted.helpers.RubikFiles; |
| ... | ... | |
| 164 | 166 |
|
| 165 | 167 |
private void savePreferences() |
| 166 | 168 |
{
|
| 167 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 169 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 170 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 168 | 171 |
mScreen.savePreferences(editor); |
| 169 | 172 |
|
| 170 | 173 |
editor.putBoolean("bandageDisplayDialog", mDisplayMessageDialog );
|
| ... | ... | |
| 176 | 179 |
|
| 177 | 180 |
private void restorePreferences() |
| 178 | 181 |
{
|
| 179 |
mScreen.restorePreferences(this,mPreferences); |
|
| 182 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 183 |
mScreen.restorePreferences(this,preferences); |
|
| 180 | 184 |
|
| 181 |
mDisplayMessageDialog = mPreferences.getBoolean("bandageDisplayDialog",true);
|
|
| 185 |
mDisplayMessageDialog = preferences.getBoolean("bandageDisplayDialog",true);
|
|
| 182 | 186 |
|
| 183 | 187 |
if( mDisplayMessageDialog ) |
| 184 | 188 |
{
|
| ... | ... | |
| 250 | 254 |
|
| 251 | 255 |
if( !object.getError() ) |
| 252 | 256 |
{
|
| 253 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 257 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 258 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 254 | 259 |
OSInterface os = new OSInterface(this,null); |
| 255 | 260 |
os.setEditor(editor); |
| 256 | 261 |
object.removePreferences(os); |
| src/main/java/org/distorted/config/ConfigActivity.java | ||
|---|---|---|
| 12 | 12 |
import android.os.Bundle; |
| 13 | 13 |
import android.content.SharedPreferences; |
| 14 | 14 |
|
| 15 |
import androidx.preference.PreferenceManager; |
|
| 16 |
|
|
| 15 | 17 |
import org.distorted.dialogs.DialogError; |
| 16 | 18 |
import org.distorted.dialogs.DialogMessage; |
| 17 | 19 |
import org.distorted.helpers.BaseActivity; |
| ... | ... | |
| 93 | 95 |
} |
| 94 | 96 |
} |
| 95 | 97 |
|
| 98 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 96 | 99 |
OSInterface os = view.getInterface(); |
| 97 |
os.setPreferences(mPreferences);
|
|
| 98 |
restorePreferences(); |
|
| 100 |
os.setPreferences(preferences);
|
|
| 101 |
restorePreferences(preferences);
|
|
| 99 | 102 |
|
| 100 | 103 |
if( mScreen==null ) mScreen = new ConfigScreen(); |
| 101 | 104 |
mScreen.onAttachedToWindow(this,mObjectOrdinal); |
| ... | ... | |
| 153 | 156 |
|
| 154 | 157 |
private void savePreferences() |
| 155 | 158 |
{
|
| 156 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 159 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 160 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 157 | 161 |
|
| 158 | 162 |
ConfigSurfaceView view = findViewById(R.id.configSurfaceView); |
| 159 | 163 |
OSInterface os = view.getInterface(); |
| ... | ... | |
| 167 | 171 |
|
| 168 | 172 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 169 | 173 |
|
| 170 |
private void restorePreferences() |
|
| 174 |
private void restorePreferences(SharedPreferences preferences)
|
|
| 171 | 175 |
{
|
| 172 | 176 |
ConfigSurfaceView view = findViewById(R.id.configSurfaceView); |
| 173 | 177 |
view.getObjectControl().restoreStickers(); |
| 174 | 178 |
|
| 175 |
mDisplayMessageDialog = mPreferences.getBoolean("configDisplayDialog",true);
|
|
| 179 |
mDisplayMessageDialog = preferences.getBoolean("configDisplayDialog",true);
|
|
| 176 | 180 |
|
| 177 | 181 |
if( mDisplayMessageDialog ) |
| 178 | 182 |
{
|
| src/main/java/org/distorted/helpers/BaseActivity.java | ||
|---|---|---|
| 49 | 49 |
protected float mDensity; |
| 50 | 50 |
protected int mVeryDarkC, mDarkC, mNormalC, mMediumC, mLightC, mPassedC; |
| 51 | 51 |
protected int mDarkT, mLightT, mSelectC; |
| 52 |
protected SharedPreferences mPreferences; |
|
| 53 | 52 |
|
| 54 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 55 | 54 |
|
| 56 | 55 |
@Override |
| 57 | 56 |
protected void onCreate(Bundle savedState) |
| 58 | 57 |
{
|
| 59 |
mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
|
| 60 |
mCurrentTheme = mPreferences.getInt("theme",THEME_GREEN);
|
|
| 58 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
|
|
| 59 |
mCurrentTheme = preferences.getInt("theme",THEME_GREEN);
|
|
| 61 | 60 |
|
| 62 | 61 |
mDensity = getResources().getDisplayMetrics().density; |
| 63 | 62 |
|
| ... | ... | |
| 156 | 155 |
public void changeThemeTo(int theme) |
| 157 | 156 |
{
|
| 158 | 157 |
mCurrentTheme = theme; |
| 159 |
|
|
| 160 |
SharedPreferences.Editor editor = mPreferences.edit();
|
|
| 158 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 159 |
SharedPreferences.Editor editor = preferences.edit();
|
|
| 161 | 160 |
editor.putInt("theme", mCurrentTheme );
|
| 162 | 161 |
editor.apply(); |
| 163 | 162 |
|
| src/main/java/org/distorted/helpers/RubikNetwork.java | ||
|---|---|---|
| 112 | 112 |
|
| 113 | 113 |
private static RubikNetwork mThis; |
| 114 | 114 |
private static String mScores = ""; |
| 115 |
private static boolean mRunning = false; |
|
| 115 |
private static boolean mDowRunning = false; |
|
| 116 |
private static boolean mSubRunning = false; |
|
| 116 | 117 |
private static ArrayList<Updatee> mUpdateeList; |
| 117 | 118 |
private static String mVersion; |
| 118 | 119 |
private static int mNumObjects; |
| ... | ... | |
| 451 | 452 |
return url1 + "?" + url2 + "&h=" + hash; |
| 452 | 453 |
} |
| 453 | 454 |
|
| 454 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 455 |
|
|
| 456 |
private boolean gottaDownload() |
|
| 457 |
{
|
|
| 458 |
return ( mScores.isEmpty() && !mRunning); |
|
| 459 |
} |
|
| 460 |
|
|
| 461 | 455 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 462 | 456 |
|
| 463 | 457 |
private void figureOutVersion(Activity act) |
| ... | ... | |
| 480 | 474 |
|
| 481 | 475 |
private void downloadThread(ScoresReceiver receiver) |
| 482 | 476 |
{
|
| 483 |
boolean receiveValues=true;
|
|
| 477 |
boolean receiveValues = true;
|
|
| 484 | 478 |
|
| 485 | 479 |
try |
| 486 | 480 |
{
|
| 487 |
if( gottaDownload() )
|
|
| 481 |
if( mScores.isEmpty() && !mDowRunning )
|
|
| 488 | 482 |
{
|
| 489 |
mRunning = true; |
|
| 483 |
mDowRunning = true;
|
|
| 490 | 484 |
receiveValues = network(constructDownloadURL(),receiver); |
| 491 | 485 |
|
| 492 |
if( mRunning ) |
|
| 486 |
if( mDowRunning )
|
|
| 493 | 487 |
{
|
| 494 | 488 |
receiveValues = fillValuesNormal(receiver); |
| 495 |
mRunning = false; |
|
| 489 |
mDowRunning = false;
|
|
| 496 | 490 |
} |
| 497 | 491 |
} |
| 498 | 492 |
if( receiveValues ) receiver.receive(mCountry, mName, mTime); |
| ... | ... | |
| 509 | 503 |
{
|
| 510 | 504 |
try |
| 511 | 505 |
{
|
| 512 |
mRunning = true; |
|
| 513 | 506 |
RubikScores scores = RubikScores.getInstance(); |
| 514 | 507 |
|
| 515 |
if( scores.thereAreUnsubmittedRecords() ) |
|
| 508 |
if( scores.thereAreUnsubmittedRecords() && !mSubRunning )
|
|
| 516 | 509 |
{
|
| 510 |
mSubRunning = true; |
|
| 517 | 511 |
boolean receiveValues = network(constructSubmitURL(),receiver); |
| 518 | 512 |
|
| 519 |
if( mRunning ) |
|
| 513 |
if( mSubRunning )
|
|
| 520 | 514 |
{
|
| 521 | 515 |
receiveValues = fillValuesNormal(receiver); |
| 522 |
mRunning = false; |
|
| 516 |
mSubRunning = false;
|
|
| 523 | 517 |
} |
| 524 | 518 |
|
| 525 | 519 |
if( receiveValues ) |
| ... | ... | |
| 794 | 788 |
|
| 795 | 789 |
public static void onPause() |
| 796 | 790 |
{
|
| 797 |
mRunning = false; |
|
| 791 |
mDowRunning = false; |
|
| 792 |
mSubRunning = false; |
|
| 793 |
|
|
| 798 | 794 |
mUpdateeList.clear(); |
| 799 | 795 |
} |
| 800 | 796 |
|
| src/main/java/org/distorted/main/MainActivity.java | ||
|---|---|---|
| 23 | 23 |
import android.widget.TextView; |
| 24 | 24 |
|
| 25 | 25 |
import androidx.annotation.NonNull; |
| 26 |
import androidx.preference.PreferenceManager; |
|
| 26 | 27 |
|
| 27 | 28 |
import com.google.firebase.analytics.FirebaseAnalytics; |
| 28 | 29 |
import com.google.firebase.inappmessaging.FirebaseInAppMessaging; |
| ... | ... | |
| 200 | 201 |
|
| 201 | 202 |
private void savePreferences() |
| 202 | 203 |
{
|
| 203 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 204 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 205 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 204 | 206 |
|
| 205 | 207 |
editor.putString("appVersion", mCurrVersion );
|
| 206 | 208 |
editor.putInt("sortMode", mSortMode);
|
| ... | ... | |
| 215 | 217 |
|
| 216 | 218 |
private void restorePreferences(boolean justStarted) |
| 217 | 219 |
{
|
| 218 |
mOldVersion = mPreferences.getString("appVersion","");
|
|
| 219 |
mSortMode = mPreferences.getInt("sortMode", MainSettingsPopup.SORT_DEFAULT);
|
|
| 220 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 221 |
mOldVersion = preferences.getString("appVersion","");
|
|
| 222 |
mSortMode = preferences.getInt("sortMode", MainSettingsPopup.SORT_DEFAULT);
|
|
| 220 | 223 |
|
| 221 |
RubikObjectList.restorePreferences(this,mPreferences,justStarted);
|
|
| 224 |
RubikObjectList.restorePreferences(this,preferences,justStarted);
|
|
| 222 | 225 |
RubikScores scores = RubikScores.getInstance(); |
| 223 |
scores.restorePreferences(mPreferences);
|
|
| 226 |
scores.restorePreferences(preferences);
|
|
| 224 | 227 |
|
| 225 | 228 |
if( scores.isVerified() ) |
| 226 | 229 |
{
|
| src/main/java/org/distorted/patterns/PatternActivity.java | ||
|---|---|---|
| 16 | 16 |
import android.view.ViewGroup; |
| 17 | 17 |
import android.widget.LinearLayout; |
| 18 | 18 |
|
| 19 |
import androidx.preference.PreferenceManager; |
|
| 20 |
|
|
| 19 | 21 |
import org.distorted.dialogs.DialogError; |
| 20 | 22 |
import org.distorted.helpers.BaseActivity; |
| 21 | 23 |
import org.distorted.library.main.DistortedLibrary; |
| ... | ... | |
| 123 | 125 |
|
| 124 | 126 |
private void savePreferences() |
| 125 | 127 |
{
|
| 126 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 128 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 129 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 127 | 130 |
|
| 128 | 131 |
for(int i=0; i< ScreenList.LENGTH; i++ ) |
| 129 | 132 |
ScreenList.getScreen(i).getScreenClass().savePreferences(editor); |
| ... | ... | |
| 138 | 141 |
|
| 139 | 142 |
private void restorePreferences() |
| 140 | 143 |
{
|
| 144 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 145 |
|
|
| 141 | 146 |
for (int i=0; i<ScreenList.LENGTH; i++) |
| 142 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(mPreferences);
|
|
| 147 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences);
|
|
| 143 | 148 |
|
| 144 |
ScreenList.restorePreferences(mPreferences);
|
|
| 149 |
ScreenList.restorePreferences(preferences);
|
|
| 145 | 150 |
} |
| 146 | 151 |
|
| 147 | 152 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/play/PlayActivity.java | ||
|---|---|---|
| 18 | 18 |
import android.view.ViewGroup; |
| 19 | 19 |
import android.widget.LinearLayout; |
| 20 | 20 |
|
| 21 |
import androidx.preference.PreferenceManager; |
|
| 22 |
|
|
| 21 | 23 |
import com.google.firebase.analytics.FirebaseAnalytics; |
| 22 | 24 |
|
| 23 | 25 |
import org.distorted.dialogs.DialogScores; |
| ... | ... | |
| 136 | 138 |
ObjectControl control = view.getObjectControl(); |
| 137 | 139 |
view.onResume(); |
| 138 | 140 |
|
| 139 |
restorePreferences(); |
|
| 141 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 142 |
restorePreferences(preferences); |
|
| 140 | 143 |
|
| 141 | 144 |
ScreenList sl = mJustStarted ? |
| 142 | 145 |
(mModeFree ? ScreenList.FREE : ScreenList.SCRA) : |
| ... | ... | |
| 144 | 147 |
|
| 145 | 148 |
ScreenList.switchScreen(this,sl); |
| 146 | 149 |
|
| 147 |
if( !mJustStarted ) restoreMoves(); |
|
| 150 |
if( !mJustStarted ) restoreMoves(preferences);
|
|
| 148 | 151 |
|
| 149 |
if( mObjectName.length()>0 )
|
|
| 152 |
if( !mObjectName.isEmpty() )
|
|
| 150 | 153 |
{
|
| 151 | 154 |
changeIfDifferent(mObjectName,mObjectLocal,mObjectOrdinal,control); |
| 152 | 155 |
} |
| ... | ... | |
| 172 | 175 |
|
| 173 | 176 |
private void savePreferences() |
| 174 | 177 |
{
|
| 175 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 178 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 179 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 176 | 180 |
|
| 177 | 181 |
for( int i=0; i<ScreenList.LENGTH; i++ ) |
| 178 | 182 |
{
|
| ... | ... | |
| 207 | 211 |
|
| 208 | 212 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 209 | 213 |
|
| 210 |
private void restorePreferences() |
|
| 214 |
private void restorePreferences(SharedPreferences preferences)
|
|
| 211 | 215 |
{
|
| 212 | 216 |
for( int i=0; i<ScreenList.LENGTH; i++) |
| 213 | 217 |
{
|
| 214 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(mPreferences);
|
|
| 218 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences);
|
|
| 215 | 219 |
} |
| 216 | 220 |
|
| 217 |
if( !mJustStarted ) ScreenList.restorePreferences(mPreferences);
|
|
| 221 |
if( !mJustStarted ) ScreenList.restorePreferences(preferences);
|
|
| 218 | 222 |
|
| 219 | 223 |
PlayView view = findViewById(R.id.playView); |
| 220 | 224 |
OSInterface os = view.getInterface(); |
| 221 |
os.setPreferences(mPreferences);
|
|
| 225 |
os.setPreferences(preferences);
|
|
| 222 | 226 |
view.getObjectControl().restorePreferences(); |
| 223 | 227 |
} |
| 224 | 228 |
|
| 225 | 229 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 226 | 230 |
|
| 227 |
private void restoreMoves() |
|
| 231 |
private void restoreMoves(SharedPreferences preferences)
|
|
| 228 | 232 |
{
|
| 229 | 233 |
ScreenList curr = ScreenList.getCurrentScreen(); |
| 230 | 234 |
|
| 231 | 235 |
if( curr==ScreenList.FREE ) |
| 232 | 236 |
{
|
| 233 | 237 |
ScreenFree free = (ScreenFree) ScreenList.FREE.getScreenClass(); |
| 234 |
free.restoreMovePreferences(this,KEY_FREE,mPreferences);
|
|
| 238 |
free.restoreMovePreferences(this,KEY_FREE,preferences);
|
|
| 235 | 239 |
} |
| 236 | 240 |
if( curr==ScreenList.SOLV ) |
| 237 | 241 |
{
|
| 238 | 242 |
ScreenSolving solv = (ScreenSolving) ScreenList.SOLV.getScreenClass(); |
| 239 |
solv.restoreMovePreferences(this,KEY_SOLV,mPreferences);
|
|
| 243 |
solv.restoreMovePreferences(this,KEY_SOLV,preferences);
|
|
| 240 | 244 |
} |
| 241 | 245 |
} |
| 242 | 246 |
|
| src/main/java/org/distorted/solvers/SolverActivity.java | ||
|---|---|---|
| 16 | 16 |
import android.view.ViewGroup; |
| 17 | 17 |
import android.widget.LinearLayout; |
| 18 | 18 |
|
| 19 |
import androidx.preference.PreferenceManager; |
|
| 20 |
|
|
| 19 | 21 |
import org.distorted.dialogs.DialogError; |
| 20 | 22 |
import org.distorted.dialogs.DialogMessage; |
| 21 | 23 |
import org.distorted.helpers.BaseActivity; |
| ... | ... | |
| 129 | 131 |
|
| 130 | 132 |
private void savePreferences() |
| 131 | 133 |
{
|
| 132 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 134 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 135 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 133 | 136 |
|
| 134 | 137 |
for( int i=0; i< ScreenList.LENGTH; i++ ) |
| 135 | 138 |
{
|
| ... | ... | |
| 148 | 151 |
|
| 149 | 152 |
private void restorePreferences() |
| 150 | 153 |
{
|
| 154 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 155 |
|
|
| 151 | 156 |
for( int i=0; i<ScreenList.LENGTH; i++ ) |
| 152 | 157 |
{
|
| 153 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(mPreferences);
|
|
| 158 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences);
|
|
| 154 | 159 |
} |
| 155 | 160 |
|
| 156 |
ScreenList.restorePreferences(mPreferences);
|
|
| 161 |
ScreenList.restorePreferences(preferences);
|
|
| 157 | 162 |
|
| 158 |
mDisplayMessageDialog = mPreferences.getBoolean("solverDisplayDialog",true);
|
|
| 163 |
mDisplayMessageDialog = preferences.getBoolean("solverDisplayDialog",true);
|
|
| 159 | 164 |
|
| 160 | 165 |
if( mDisplayMessageDialog ) |
| 161 | 166 |
{
|
Also available in: Unified diff
Move preferences to JIT model.