joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modify MainActivity so that the last GameType and GameDifficulty chosen are saved even if the user chose to create a custom sudoku instead of starting a new sudoku.

Browse source
This commit is contained in:
uykek 2020-08-29 11:21:09 +02:00
parent e32cb3a4df
commit 86f8e3df01
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
View file

@ -191,8 +191,16 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
createGameBar.setChecked(isChecked); createGameBar.setChecked(isChecked);
}}); }});
GameDifficulty lastChosenDifficulty = GameDifficulty.valueOf(settings.getString("lastChosenDifficulty", "Moderate")); String retrievedDifficulty = settings.getString("lastChosenDifficulty", "Moderate");
//difficultyBar.setRating(GameDifficulty.getValidDifficultyList().indexOf(lastChosenDifficulty) + 1); GameDifficulty lastChosenDifficulty = GameDifficulty.valueOf(
retrievedDifficulty.equals("Custom")? GameDifficulty.Unspecified.toString() : retrievedDifficulty);
if (lastChosenDifficulty == GameDifficulty.Unspecified) {
difficultyBar.setRating(0);
createGameBar.setChecked(true);
} else {
difficultyBar.setRating(GameDifficulty.getValidDifficultyList().indexOf(lastChosenDifficulty) + 1);
}
/*LayerDrawable stars = (LayerDrawable)difficultyBar.getProgressDrawable(); /*LayerDrawable stars = (LayerDrawable)difficultyBar.getProgressDrawable();
stars.getDrawable(2).setColorFilter(getResources().getColor(R.color.colorPrimary), PorterDuff.Mode.SRC_ATOP);//Color for Stars fully selected stars.getDrawable(2).setColorFilter(getResources().getColor(R.color.colorPrimary), PorterDuff.Mode.SRC_ATOP);//Color for Stars fully selected
stars.getDrawable(1).setColorFilter(getResources().getColor(R.color.middleblue), PorterDuff.Mode.SRC_ATOP);//Color for Stars partially selected stars.getDrawable(1).setColorFilter(getResources().getColor(R.color.middleblue), PorterDuff.Mode.SRC_ATOP);//Color for Stars partially selected
@ -244,9 +252,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
case R.id.playButton: case R.id.playButton:
GameType gameType = GameType.getValidGameTypes().get(mViewPager.getCurrentItem()); GameType gameType = GameType.getValidGameTypes().get(mViewPager.getCurrentItem());
if (((CheckBox)findViewById(R.id.circleButton)).isChecked()) { if (((CheckBox)findViewById(R.id.circleButton)).isChecked()) {
// send everything to game activity // start CreateSudokuActivity
i = new Intent(this, CreateSudokuActivity.class); i = new Intent(this, CreateSudokuActivity.class);
i.putExtra("gameType", gameType.name()); i.putExtra("gameType", gameType.name());
SharedPreferences.Editor editor = settings.edit();
editor.putString("lastChosenGameType", gameType.name());
editor.putString("lastChosenDifficulty", "Custom");
editor.apply();
//i.putExtra("gameDifficulty", GameDifficulty.Easy); //i.putExtra("gameDifficulty", GameDifficulty.Easy);
break; break;
} }