Revision 31a9f38d
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/states/RubikStatePlay.java | ||
|---|---|---|
| 151 | 151 |
{
|
| 152 | 152 |
int padding = (int)(width*RubikActivity.PADDING); |
| 153 | 153 |
int margin = (int)(width*RubikActivity.MARGIN); |
| 154 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_menu,R.drawable.ui_medium_cube_menu, R.drawable.ui_big_cube_menu); |
|
| 154 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_menu,R.drawable.ui_medium_cube_menu, R.drawable.ui_big_cube_menu, R.drawable.ui_huge_cube_menu);
|
|
| 155 | 155 |
|
| 156 | 156 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 1.2f); |
| 157 | 157 |
params.topMargin = margin; |
| ... | ... | |
| 196 | 196 |
{
|
| 197 | 197 |
int padding = (int)(width*RubikActivity.PADDING); |
| 198 | 198 |
int margin = (int)(width*RubikActivity.MARGIN); |
| 199 |
int spin = RubikActivity.getDrawable(R.drawable.ui_small_spinner,R.drawable.ui_big_spinner, R.drawable.ui_big_spinner); |
|
| 199 |
int spin = RubikActivity.getDrawable(R.drawable.ui_small_spinner,R.drawable.ui_big_spinner, R.drawable.ui_big_spinner, R.drawable.ui_huge_spinner);
|
|
| 200 | 200 |
|
| 201 | 201 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 1.0f); |
| 202 | 202 |
params.topMargin = margin; |
| ... | ... | |
| 273 | 273 |
{
|
| 274 | 274 |
int padding = (int)(width*RubikActivity.PADDING); |
| 275 | 275 |
int margin = (int)(width*RubikActivity.MARGIN); |
| 276 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_menu,R.drawable.ui_medium_menu, R.drawable.ui_big_menu); |
|
| 276 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_menu,R.drawable.ui_medium_menu, R.drawable.ui_big_menu, R.drawable.ui_huge_menu);
|
|
| 277 | 277 |
|
| 278 | 278 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); |
| 279 | 279 |
params.topMargin = margin; |
| ... | ... | |
| 309 | 309 |
int padding = (int)(width*RubikActivity.PADDING); |
| 310 | 310 |
int margin = (int)(width*RubikActivity.MARGIN); |
| 311 | 311 |
int widthBut = (int)(width/6); |
| 312 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve,R.drawable.ui_medium_cube_solve, R.drawable.ui_big_cube_solve); |
|
| 312 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve,R.drawable.ui_medium_cube_solve, R.drawable.ui_big_cube_solve, R.drawable.ui_huge_cube_solve);
|
|
| 313 | 313 |
|
| 314 | 314 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT); |
| 315 | 315 |
params.topMargin = margin; |
| ... | ... | |
| 340 | 340 |
int padding = (int)(width*RubikActivity.PADDING); |
| 341 | 341 |
int margin = (int)(width*RubikActivity.MARGIN); |
| 342 | 342 |
int widthBut = (int)(width/6); |
| 343 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_back,R.drawable.ui_medium_cube_back, R.drawable.ui_big_cube_back); |
|
| 343 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_back,R.drawable.ui_medium_cube_back, R.drawable.ui_big_cube_back, R.drawable.ui_huge_cube_back);
|
|
| 344 | 344 |
|
| 345 | 345 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT); |
| 346 | 346 |
params.topMargin = margin; |
| ... | ... | |
| 376 | 376 |
mObjectPopup.setContentView(layout); |
| 377 | 377 |
mObjectPopup.setFocusable(true); |
| 378 | 378 |
int margin = (int)(width*RubikActivity.LARGE_MARGIN); |
| 379 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube2,R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2); |
|
| 379 |
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube2,R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2);
|
|
| 380 | 380 |
|
| 381 | 381 |
BitmapDrawable bd = (BitmapDrawable) act.getResources().getDrawable(icon); |
| 382 | 382 |
int cubeWidth = bd.getIntrinsicWidth(); |
Also available in: Unified diff
Introduce HUGE ui version.