Project

General

Profile

« Previous | Next » 

Revision 31a9f38d

Added by Leszek Koltunski almost 4 years ago

Introduce HUGE ui version.

View differences:

src/main/java/org/distorted/objects/RubikObjectList.java
36 36
  {
37 37
  CUBE (
38 38
         new int[][] {
39
                       {2 , 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2} ,
40
                       {3 , 16, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3} ,
41
                       {4 , 20, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4} ,
42
                       {5 , 24, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5}
39
                       {2 , 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ,
40
                       {3 , 16, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ,
41
                       {4 , 20, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ,
42
                       {5 , 24, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}
43 43
                     },
44 44
         RubikCube.class,
45 45
         new RubikCubeMovement()
......
47 47

  
48 48
  PYRA (
49 49
         new int[][] {
50
                       {3 , 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3} ,
51
                       {4 , 15, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4} ,
52
                       {5 , 20, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5}
50
                       {3 , 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,
51
                       {4 , 15, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,
52
                       {5 , 20, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
53 53
                     },
54 54
         RubikPyraminx.class,
55 55
         new RubikPyraminxMovement()
......
61 61
  public static final int MAX_LEVEL;
62 62
  public static final int MAX_OBJECT_SIZE;
63 63

  
64
  private final int[] mObjectSizes, mMaxLevels, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mResourceIDs;
64
  private final int[] mObjectSizes, mMaxLevels, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;
65 65
  private final Class<? extends RubikObject> mObjectClass;
66 66
  private final RubikObjectMovement mObjectMovementClass;
67 67
  private static final RubikObjectList[] objects;
......
282 282
    mSmallIconIDs = new int[length];
283 283
    mMediumIconIDs= new int[length];
284 284
    mBigIconIDs   = new int[length];
285
    mHugeIconIDs  = new int[length];
285 286

  
286 287
    for(int i=0; i<length; i++)
287 288
      {
......
291 292
      mSmallIconIDs[i] = info[i][3];
292 293
      mMediumIconIDs[i]= info[i][4];
293 294
      mBigIconIDs[i]   = info[i][5];
295
      mHugeIconIDs[i]  = info[i][6];
294 296
      }
295 297

  
296 298
    mObjectClass         = object;
......
321 323
      {
322 324
      case 0 : return mSmallIconIDs;
323 325
      case 1 : return mMediumIconIDs;
324
      default: return mBigIconIDs;
326
      case 2 : return mBigIconIDs;
327
      default: return mHugeIconIDs;
325 328
      }
326 329
    }
327 330

  

Also available in: Unified diff