Revision 53f23b64
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/uistate/RubikStatePlay.java | ||
|---|---|---|
| 43 | 43 |
private static final int MIN_SCRAMBLE = 1; |
| 44 | 44 |
private static final int DEF_SCRAMBLE = 1; |
| 45 | 45 |
public static final int MAX_SCRAMBLE = 18; |
| 46 |
private static final int DEF_OBJECT = RubikObjectList.CUBE.ordinal();
|
|
| 47 |
private static final int DEF_SIZE = 1; // i.e. the second from the list of CUBE's sizes
|
|
| 46 |
public static final int DEF_OBJECT = RubikObjectList.CUBE.ordinal();
|
|
| 47 |
public static final int DEF_SIZE = 3;
|
|
| 48 | 48 |
|
| 49 | 49 |
private ImageButton mObjButton; |
| 50 | 50 |
private Button mBackButton; |
| ... | ... | |
| 174 | 174 |
|
| 175 | 175 |
for(int object=0; object<RubikObjectList.NUM_OBJECTS; object++) |
| 176 | 176 |
{
|
| 177 |
RubikObjectList list = RubikObjectList.getObject(object); |
|
| 178 |
int[] sizes = list.getSizes(); |
|
| 177 |
final RubikObjectList list = RubikObjectList.getObject(object);
|
|
| 178 |
final int[] sizes = list.getSizes();
|
|
| 179 | 179 |
int[] icons = list.getIconIDs(); |
| 180 | 180 |
int len = sizes.length; |
| 181 | 181 |
final int obj = object; |
| ... | ... | |
| 197 | 197 |
public void onClick(View v) |
| 198 | 198 |
{
|
| 199 | 199 |
mObject = obj; |
| 200 |
mSize = size; |
|
| 201 |
act.changeObject(obj,size);
|
|
| 200 |
mSize = sizes[size];
|
|
| 201 |
act.changeObject(list,sizes[size]);
|
|
| 202 | 202 |
mPopup.dismiss(); |
| 203 | 203 |
} |
| 204 | 204 |
}); |
| ... | ... | |
| 226 | 226 |
if( mPopup!=null ) |
| 227 | 227 |
{
|
| 228 | 228 |
mPopup.dismiss(); |
| 229 |
mPopup = null;
|
|
| 229 |
mPopup = null; |
|
| 230 | 230 |
} |
| 231 | 231 |
} |
| 232 | 232 |
|
| ... | ... | |
| 239 | 239 |
mSize = preferences.getInt("statePlay_size" , DEF_SIZE );
|
| 240 | 240 |
} |
| 241 | 241 |
|
| 242 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 243 |
|
|
| 244 |
public boolean setObjectAndSize(RubikObjectList obj, int size) |
|
| 245 |
{
|
|
| 246 |
boolean success = false; |
|
| 247 |
|
|
| 248 |
for( int s: obj.getSizes() ) |
|
| 249 |
if( s==size ) |
|
| 250 |
{
|
|
| 251 |
success = true; |
|
| 252 |
break; |
|
| 253 |
} |
|
| 254 |
|
|
| 255 |
if( success ) |
|
| 256 |
{
|
|
| 257 |
mObject = obj.ordinal(); |
|
| 258 |
mSize = size; |
|
| 259 |
} |
|
| 260 |
|
|
| 261 |
return success; |
|
| 262 |
} |
|
| 263 |
|
|
| 242 | 264 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 243 | 265 |
|
| 244 | 266 |
public int getPicker() |
Also available in: Unified diff
Progress with Pretty Patterns - do away with the tabbed dialog!