Project

General

Profile

« Previous | Next » 

Revision 0b5e585c

Added by Leszek Koltunski almost 2 years ago

  • ID 0b5e585cb8c00a1dd32b0f9da5a2c056eba34550
  • Parent fad10885

Sort the objects in the object popup by difficulty level.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java
194 194
        try
195 195
          {
196 196
          JsonReader reader = JsonReader.getInstance();
197
          mInfo.mNumScrambles = reader.readNumScrambles(act,objectName);
198
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles);
197
          reader.readNumScramblesAndComplexity(act,objectName);
198
          mInfo.mNumScrambles = reader.getNumScrambles();
199
          mInfo.mDifficulty   = reader.getComplexity();
200

  
201
          if( SHOW_DOWNLOADED_DEBUG )
202
            {
203
            android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles);
204
            android.util.Log.e("D", "Read from JSON difficulty="+mInfo.mDifficulty);
205
            }
199 206

  
200 207
          if( mInfo.mExtrasStream!=null )
201 208
            {
......
211 218

  
212 219
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "1");
213 220

  
214
            boolean success = RubikObjectList.addDownloadedObject(act, mInfo.mObjectShortName,mInfo.mNumScrambles, mInfo.mObjectMinorVersion,
215
                                                                  mInfo.mExtrasMinorVersion, mIconSaved, oSuccess, eSuccess);
221
            boolean success = RubikObjectList.addDownloadedObject(act, mInfo.mObjectShortName,mInfo.mNumScrambles, mInfo.mDifficulty,
222
                                                                  mInfo.mObjectMinorVersion, mInfo.mExtrasMinorVersion, mIconSaved, oSuccess, eSuccess);
216 223
            if( success )
217 224
              {
218 225
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2");

Also available in: Unified diff