Revision 36bf9f0b
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/bandaged/BandagedPlayScreen.java | ||
|---|---|---|
| 40 | 40 |
|
| 41 | 41 |
public class BandagedPlayScreen |
| 42 | 42 |
{
|
| 43 |
public static final int[] DEPTHS = new int[] {20,50,100,200,500,1000};
|
|
| 43 | 44 |
public static final int ANIMATION_ON = 0; |
| 44 | 45 |
public static final int ANIMATION_OFF = 1; |
| 45 | 46 |
|
| ... | ... | |
| 143 | 144 |
TwistyObject object = control.getObject(); |
| 144 | 145 |
ObjectScrambler.setSignature(object.getSignature()); |
| 145 | 146 |
|
| 146 |
int depth = RubikDialogBandagedSettings.DEPTHS[mScrambleDepth];
|
|
| 147 |
int depth = DEPTHS[mScrambleDepth]; |
|
| 147 | 148 |
|
| 148 | 149 |
if( mAnimationMode==ANIMATION_OFF ) |
| 149 | 150 |
{
|
| ... | ... | |
| 206 | 207 |
layoutLower.addView(layoutRight); |
| 207 | 208 |
|
| 208 | 209 |
setupSolveButton(act); |
| 209 |
setupSettingsButton(act); |
|
| 210 |
//setupSettingsButton(act);
|
|
| 210 | 211 |
setupScrambleButton(act); |
| 211 | 212 |
|
| 212 | 213 |
LinearLayout layoutUpper = act.findViewById(R.id.upperBar); |
| ... | ... | |
| 219 | 220 |
layoutRightU.setLayoutParams(paramsR); |
| 220 | 221 |
|
| 221 | 222 |
layoutLeftU.addView(mSolveButton); |
| 222 |
layoutMidU.addView(mSettingsButton); |
|
| 223 |
//layoutMidU.addView(mSettingsButton);
|
|
| 223 | 224 |
layoutRightU.addView(mScrambleButton); |
| 224 | 225 |
|
| 225 | 226 |
layoutUpper.removeAllViews(); |
| src/main/java/org/distorted/dialogs/RubikDialogBandagedSettings.java | ||
|---|---|---|
| 47 | 47 |
|
| 48 | 48 |
public class RubikDialogBandagedSettings extends AppCompatDialogFragment implements AdapterView.OnItemSelectedListener |
| 49 | 49 |
{
|
| 50 |
public static final int[] DEPTHS = new int[] {20,50,100,200,500,1000};
|
|
| 51 | 50 |
private int mAnimPos, mScraPos; |
| 52 | 51 |
|
| 53 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 53 |
|
| 55 | 54 |
private String[] createScrambleModes() |
| 56 | 55 |
{
|
| 57 |
int len = DEPTHS.length; |
|
| 56 |
int len = BandagedPlayScreen.DEPTHS.length;
|
|
| 58 | 57 |
String[] ret = new String[len]; |
| 59 | 58 |
|
| 60 | 59 |
for(int i=0; i<len; i++) |
| 61 | 60 |
{
|
| 62 |
ret[i] = String.valueOf(DEPTHS[i]); |
|
| 61 |
ret[i] = String.valueOf(BandagedPlayScreen.DEPTHS[i]);
|
|
| 63 | 62 |
} |
| 64 | 63 |
|
| 65 | 64 |
return ret; |
Also available in: Unified diff
BandagedPlay: remove the conf dialog