Project

General

Profile

« Previous | Next » 

Revision f3e12931

Added by Leszek Koltunski over 4 years ago

Improvements

View differences:

src/main/java/org/distorted/magic/RubikSize.java
23 23

  
24 24
public enum RubikSize
25 25
  {
26
  SIZE2 ( R.id.rubikSize2, R.drawable.button2, R.layout.scores_tab2 ),
27
  SIZE3 ( R.id.rubikSize3, R.drawable.button3, R.layout.scores_tab3 ),
28
  SIZE4 ( R.id.rubikSize4, R.drawable.button4, R.layout.scores_tab4 ),
29
  SIZE5 ( R.id.rubikSize5, R.drawable.button5, R.layout.scores_tab5 ),
26
  SIZE2 ( 2, R.drawable.button2 ),
27
  SIZE3 ( 3, R.drawable.button3 ),
28
  SIZE4 ( 4, R.drawable.button4 ),
29
  SIZE5 ( 5, R.drawable.button5 ),
30 30
  ;
31 31

  
32
  static final int DEFAULT_SIZE  = 3;
32 33
  static final int LENGTH = values().length;
33
  private final int mImageButtonID, mIconID, mLayoutID;
34
  private final int mCubeSize, mIconID;
34 35
  private static final RubikSize[] sizes;
35 36

  
36 37
  static
......
54 55

  
55 56
///////////////////////////////////////////////////////////////////////////////////////////////////
56 57

  
57
  RubikSize(int imageID, int iconID, int layoutID)
58
  RubikSize(int size, int iconID)
58 59
    {
59
    mImageButtonID= imageID;
60
    mIconID       = iconID;
61
    mLayoutID     = layoutID;
60
    mCubeSize = size;
61
    mIconID   = iconID;
62 62
    }
63 63

  
64 64
///////////////////////////////////////////////////////////////////////////////////////////////////
65 65

  
66
  int getImageButton()
67
    {
68
    return mImageButtonID;
69
    }
70

  
71
///////////////////////////////////////////////////////////////////////////////////////////////////
72

  
73
  int getIcon()
66
  int getIconID()
74 67
    {
75 68
    return mIconID;
76 69
    }
77 70

  
78 71
///////////////////////////////////////////////////////////////////////////////////////////////////
79 72

  
80
  int getLayout()
73
  int getCubeSize()
81 74
    {
82
    return mLayoutID;
75
    return mCubeSize;
83 76
    }
84 77
  }

Also available in: Unified diff