Revision 4bd09fe2
Added by Leszek Koltunski 10 months ago
| src/main/java/org/distorted/config/ConfigActivity.java | ||
|---|---|---|
| 169 | 169 |
{
|
| 170 | 170 |
if( mPane!=null ) |
| 171 | 171 |
{
|
| 172 |
int color = mPane.getCurrentColor(); |
|
| 172 |
int color = mPane.getCurrentColor(); |
|
| 173 |
int borders= mPane.getCurrentBorders(); |
|
| 174 |
int corners= mPane.getCurrentCorners(); |
|
| 175 |
float border_step = ConfigScreenPane.BORDER_STEPS[borders]; |
|
| 176 |
float corner_step = ConfigScreenPane.CORNER_STEPS[corners]; |
|
| 177 |
|
|
| 173 | 178 |
ConfigSurfaceView view = findViewById(R.id.configSurfaceView); |
| 174 | 179 |
ObjectControl control = view.getObjectControl(); |
| 175 |
control.repaintPuzzleFace(cubit,face,color); |
|
| 180 |
control.repaintPuzzleFace(cubit,face,color,border_step,corner_step);
|
|
| 176 | 181 |
} |
| 177 | 182 |
} |
| 178 | 183 |
|
| ... | ... | |
| 234 | 239 |
|
| 235 | 240 |
public void resetUI() |
| 236 | 241 |
{
|
| 237 |
mPane.resetUI(); |
|
| 242 |
mPane.resetUI(this);
|
|
| 238 | 243 |
} |
| 239 | 244 |
|
| 240 | 245 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/config/ConfigScreenPane.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 81 | 81 |
|
| 82 |
void resetUI() |
|
| 82 |
void resetUI(ConfigActivity act)
|
|
| 83 | 83 |
{
|
| 84 | 84 |
mSeekBarBorders.setProgress(DEFAULT_BORDERS); |
| 85 | 85 |
mSeekBarCorners.setProgress(DEFAULT_CORNERS); |
| 86 | 86 |
|
| 87 |
markButton(0,0); |
|
| 87 |
act.runOnUiThread(new Runnable() |
|
| 88 |
{
|
|
| 89 |
@Override |
|
| 90 |
public void run() |
|
| 91 |
{
|
|
| 92 |
markButton(0,0); |
|
| 93 |
} |
|
| 94 |
}); |
|
| 88 | 95 |
} |
| 89 | 96 |
|
| 90 | 97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 178 | 185 |
return COLORS[mRow][mCol]; |
| 179 | 186 |
} |
| 180 | 187 |
|
| 188 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 189 |
|
|
| 190 |
int getCurrentBorders() |
|
| 191 |
{
|
|
| 192 |
return mCurrentBorders; |
|
| 193 |
} |
|
| 194 |
|
|
| 195 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 196 |
|
|
| 197 |
int getCurrentCorners() |
|
| 198 |
{
|
|
| 199 |
return mCurrentCorners; |
|
| 200 |
} |
|
| 201 |
|
|
| 181 | 202 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 182 | 203 |
|
| 183 | 204 |
ConfigScreenPane(final ConfigActivity act, int objectOrdinal) |
Also available in: Unified diff
progress with configurable stickers