Project

General

Profile

« Previous | Next » 

Revision 22fdfc36

Added by Leszek Koltunski over 4 years ago

RubikCube: major progress with a separate RubikSettingsEnum enum - has been introduced into RubikSettings.

View differences:

src/main/java/org/distorted/magic/RubikActivity.java
122 122 
      {
123 123 
      Bundle args = new Bundle();
124 124 

  		




  125
  
  
    
      args.putInt("sizechangePos" , mSizeChangePos );


  		




  126
  
  
    
      args.putInt("solvePos"      , mSolvePos      );


  		




  127
  
  
    
      args.putInt("scramblePos"   , mScramblePos   );


  		




  128
  
  
    
      args.putInt("sizechangeType", mSizeChangeType);


  		




  129
  
  
    
      args.putInt("solveType"     , mSolveType     );


  		




  130
  
  
    
      args.putInt("scrambleType"  , mScrambleType  );


  		




  
  125
  
    
      args.putInt("SIZECHANGE_Pos" , mSizeChangePos );


  		




  
  126
  
    
      args.putInt("SOLVE_Pos"      , mSolvePos      );


  		




  
  127
  
    
      args.putInt("SCRAMBLE_Pos"   , mScramblePos   );


  		




  
  128
  
    
      args.putInt("SIZECHANGE_Type", mSizeChangeType);


  		




  
  129
  
    
      args.putInt("SOLVE_Type"     , mSolveType     );


  		




  
  130
  
    
      args.putInt("SCRAMBLE_Type"  , mScrambleType  );


  		




  131
  131
  
    

  		




  132
  132
  
    
      RubikSettings settings = new RubikSettings();


  		




  133
  133
  
    
      settings.setArguments(args);


  		




  ......




  162
  162
  
    

  		




  163
  163
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  164
  164
  
    

  		




  165
  
  
    
    public void onComplete(int sizeP, int unscP, int scraP, int sizeT, int unscT, int scraT )


  		




  
  165
  
    
    public void onComplete(int sizeP, int solvP, int scraP, int sizeT, int solvT, int scraT )


  		




  166
  166
  
    
      {


  		




  167
  167
  
    
      mSizeChangePos = sizeP;


  		




  168
  
  
    
      mSolvePos      = unscP;


  		




  
  168
  
    
      mSolvePos      = solvP;


  		




  169
  169
  
    
      mScramblePos   = scraP;


  		




  170
  170
  
    
      mSizeChangeType= sizeT;


  		




  171
  
  
    
      mSolveType     = unscT;


  		




  
  171
  
    
      mSolveType     = solvT;


  		




  172
  172
  
    
      mScrambleType  = scraT;


  		




  173
  173
  
    

  		




  174
  174
  
    
      applyPreferences();


  		




  ......




  224
  224
  
    
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);


  		




  225
  225
  
    
     SharedPreferences.Editor editor = preferences.edit();


  		




  226
  226
  
    

  		




  227
  
  
    
     editor.putInt("sizechangePos" , mSizeChangePos );


  		




  228
  
  
    
     editor.putInt("solvePos"      , mSolvePos      );


  		




  229
  
  
    
     editor.putInt("scramblePos"   , mScramblePos   );


  		




  230
  
  
    
     editor.putInt("sizechangeType", mSizeChangeType);


  		




  231
  
  
    
     editor.putInt("solveType"     , mSolveType     );


  		




  232
  
  
    
     editor.putInt("scrambleType"  , mScrambleType  );


  		




  233
  
  
    
     editor.putInt("scramble"      , mPicker.getValue() );


  		




  
  227
  
    
     editor.putInt("SIZECHANGE_Pos" , mSizeChangePos );


  		




  
  228
  
    
     editor.putInt("SOLVE_Pos"      , mSolvePos      );


  		




  
  229
  
    
     editor.putInt("SCRAMBLE_Pos"   , mScramblePos   );


  		




  
  230
  
    
     editor.putInt("SIZECHANGE_Type", mSizeChangeType);


  		




  
  231
  
    
     editor.putInt("SOLVE_Type"     , mSolveType     );


  		




  
  232
  
    
     editor.putInt("SCRAMBLE_Type"  , mScrambleType  );


  		




  
  233
  
    
     editor.putInt("scramble"       , mPicker.getValue() );


  		




  234
  234
  
    

  		




  235
  235
  
    
     editor.apply();


  		




  236
  236
  
    
     }


  		




  ......




  241
  241
  
    
     {


  		




  242
  242
  
    
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);


  		




  243
  243
  
    

  		




  244
  
  
    
     mSizeChangePos = preferences.getInt("sizechangePos" , DEFAULT_SIZECHANGE_POS );


  		




  245
  
  
    
     mSolvePos      = preferences.getInt("solvePos"      , DEFAULT_SOLVE_POS      );


  		




  246
  
  
    
     mScramblePos   = preferences.getInt("scramblePos"   , DEFAULT_SCRAMBLE_POS   );


  		




  247
  
  
    
     mSizeChangeType= preferences.getInt("sizechangeType", DEFAULT_SIZECHANGE_TYPE);


  		




  248
  
  
    
     mSolveType     = preferences.getInt("solveType"     , DEFAULT_SOLVE_TYPE     );


  		




  249
  
  
    
     mScrambleType  = preferences.getInt("scrambleType"  , DEFAULT_SCRAMBLE_TYPE  );


  		




  250
  
  
    
     int scramble   = preferences.getInt("scramble"      , MIN_SCRAMBLE           );


  		




  
  244
  
    
     mSizeChangePos = preferences.getInt("SIZECHANGE_Pos" , DEFAULT_SIZECHANGE_POS );


  		




  
  245
  
    
     mSolvePos      = preferences.getInt("SOLVE_Pos"      , DEFAULT_SOLVE_POS      );


  		




  
  246
  
    
     mScramblePos   = preferences.getInt("SCRAMBLE_Pos"   , DEFAULT_SCRAMBLE_POS   );


  		




  
  247
  
    
     mSizeChangeType= preferences.getInt("SIZECHANGE_Type", DEFAULT_SIZECHANGE_TYPE);


  		




  
  248
  
    
     mSolveType     = preferences.getInt("SOLVE_Type"     , DEFAULT_SOLVE_TYPE     );


  		




  
  249
  
    
     mScrambleType  = preferences.getInt("SCRAMBLE_Type"  , DEFAULT_SCRAMBLE_TYPE  );


  		




  
  250
  
    
     int scramble   = preferences.getInt("scramble"       , MIN_SCRAMBLE           );


  		




  251
  251
  
    

  		




  252
  252
  
    
     mPicker.setValue(scramble);


  		




  253
  253
  
    
     }


  		












Also available in:  Unified diff