Revision 9881dc03
Added by Leszek Koltunski about 1 month ago
| src/main/java/org/distorted/playui/PlayActivity.java | ||
|---|---|---|
| 18 | 18 |
import android.view.ViewGroup; |
| 19 | 19 |
import android.widget.LinearLayout; |
| 20 | 20 |
|
| 21 |
import androidx.preference.PreferenceManager; |
|
| 22 |
|
|
| 23 | 21 |
import com.google.firebase.analytics.FirebaseAnalytics; |
| 24 | 22 |
|
| 25 | 23 |
import org.distorted.dialogs.RubikDialogScores; |
| ... | ... | |
| 138 | 136 |
ObjectControl control = view.getObjectControl(); |
| 139 | 137 |
view.onResume(); |
| 140 | 138 |
|
| 141 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 142 |
restorePreferences(preferences); |
|
| 139 |
restorePreferences(); |
|
| 143 | 140 |
|
| 144 | 141 |
ScreenList sl = mJustStarted ? |
| 145 | 142 |
(mModeFree ? ScreenList.FREE : ScreenList.SCRA) : |
| ... | ... | |
| 147 | 144 |
|
| 148 | 145 |
ScreenList.switchScreen(this,sl); |
| 149 | 146 |
|
| 150 |
if( !mJustStarted ) restoreMoves(preferences);
|
|
| 147 |
if( !mJustStarted ) restoreMoves(); |
|
| 151 | 148 |
|
| 152 | 149 |
if( mObjectName.length()>0 ) |
| 153 | 150 |
{
|
| ... | ... | |
| 175 | 172 |
|
| 176 | 173 |
private void savePreferences() |
| 177 | 174 |
{
|
| 178 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 179 |
SharedPreferences.Editor editor = preferences.edit(); |
|
| 175 |
SharedPreferences.Editor editor = mPreferences.edit(); |
|
| 180 | 176 |
|
| 181 | 177 |
for( int i=0; i<ScreenList.LENGTH; i++ ) |
| 182 | 178 |
{
|
| ... | ... | |
| 211 | 207 |
|
| 212 | 208 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 213 | 209 |
|
| 214 |
private void restorePreferences(SharedPreferences preferences)
|
|
| 210 |
private void restorePreferences() |
|
| 215 | 211 |
{
|
| 216 | 212 |
for( int i=0; i<ScreenList.LENGTH; i++) |
| 217 | 213 |
{
|
| 218 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences);
|
|
| 214 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(mPreferences);
|
|
| 219 | 215 |
} |
| 220 | 216 |
|
| 221 |
if( !mJustStarted ) ScreenList.restorePreferences(preferences);
|
|
| 217 |
if( !mJustStarted ) ScreenList.restorePreferences(mPreferences);
|
|
| 222 | 218 |
|
| 223 | 219 |
PlayView view = findViewById(R.id.playView); |
| 224 | 220 |
OSInterface os = view.getInterface(); |
| 225 |
os.setPreferences(preferences);
|
|
| 221 |
os.setPreferences(mPreferences);
|
|
| 226 | 222 |
view.getObjectControl().restorePreferences(); |
| 227 | 223 |
} |
| 228 | 224 |
|
| 229 | 225 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 230 | 226 |
|
| 231 |
private void restoreMoves(SharedPreferences preferences)
|
|
| 227 |
private void restoreMoves() |
|
| 232 | 228 |
{
|
| 233 | 229 |
ScreenList curr = ScreenList.getCurrentScreen(); |
| 234 | 230 |
|
| 235 | 231 |
if( curr==ScreenList.FREE ) |
| 236 | 232 |
{
|
| 237 | 233 |
ScreenFree free = (ScreenFree) ScreenList.FREE.getScreenClass(); |
| 238 |
free.restoreMovePreferences(this,KEY_FREE,preferences);
|
|
| 234 |
free.restoreMovePreferences(this,KEY_FREE,mPreferences);
|
|
| 239 | 235 |
} |
| 240 | 236 |
if( curr==ScreenList.SOLV ) |
| 241 | 237 |
{
|
| 242 | 238 |
ScreenSolving solv = (ScreenSolving) ScreenList.SOLV.getScreenClass(); |
| 243 |
solv.restoreMovePreferences(this,KEY_SOLV,preferences);
|
|
| 239 |
solv.restoreMovePreferences(this,KEY_SOLV,mPreferences);
|
|
| 244 | 240 |
} |
| 245 | 241 |
} |
| 246 | 242 |
|
Also available in: Unified diff
common code from all activities to one BaseActivity