Project

General

Profile

« Previous | Next » 

Revision c651024f

Added by Leszek Koltunski over 2 years ago

Downloading updates: dialog progress.

View differences:

src/main/java/org/distorted/screens/RubikScreenPlay.java
131 131

  
132 132
  private void setupObjectButton(final RubikActivity act, final float width)
133 133
    {
134
    final int margin  = (int)(width*RubikActivity.MARGIN);
134
    final int margin  = (int)(width*RubikActivity.SMALL_MARGIN);
135 135
    final int lMargin = (int)(width*RubikActivity.LARGE_MARGIN);
136 136
    final 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);
137 137
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
......
164 164

  
165 165
  private void setupPlayButton(final RubikActivity act, final float width)
166 166
    {
167
    final int margin = (int)(width*RubikActivity.MARGIN);
167
    final int margin = (int)(width*RubikActivity.SMALL_MARGIN);
168 168

  
169 169
    mPlayButton = new TransparentButton(act, R.string.play, mButtonSize);
170 170

  
......
201 201

  
202 202
  private void setupMenuButton(final RubikActivity act, final float width)
203 203
    {
204
    final int margin = (int)(width*RubikActivity.MARGIN);
204
    final int margin = (int)(width*RubikActivity.SMALL_MARGIN);
205 205
    final int icon = RubikActivity.getDrawable(R.drawable.ui_small_menu,R.drawable.ui_medium_menu, R.drawable.ui_big_menu, R.drawable.ui_huge_menu);
206 206
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
207 207
    mMenuButton = new TransparentImageButton(act, icon, TransparentImageButton.GRAVITY_MIDDLE, params);
......
384 384
    mMenuPopup = new PopupWindow(act);
385 385
    mMenuPopup.setContentView(layout);
386 386
    mMenuPopup.setFocusable(true);
387
    int margin  = (int)(width*RubikActivity.MARGIN);
387
    int margin  = (int)(width*RubikActivity.SMALL_MARGIN);
388 388
    int padding = (int)(width*RubikActivity.PADDING);
389 389

  
390 390
    mMenuLayoutWidth = (int)(width/2);
......
637 637
      }
638 638

  
639 639
    float width  = act.getScreenWidthInPixels();
640
    int margin   = (int)(width*RubikActivity.MARGIN);
640
    int margin   = (int)(width*RubikActivity.SMALL_MARGIN);
641 641
    int padding  = (int)(width*RubikActivity.PADDING);
642 642
    int butWidth = mPlayLayoutWidth - 2*padding;
643 643
    int butHeight= (int)mMenuItemSize;

Also available in: Unified diff