Project

General

Profile

« Previous | Next » 

Revision 4fb1fc0d

Added by Leszek Koltunski over 3 years ago

Progress with UI

View differences:

src/main/java/org/distorted/states/RubikStatePlay.java
126 126 
    LinearLayout layoutBot = act.findViewById(R.id.lowerBar);
127 127 
    layoutBot.removeAllViews();
128 128 

  		




  
  129
  
    
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1);


  		




  
  130
  
    

  		




  
  131
  
    
    LinearLayout layoutLeft = new LinearLayout(act);


  		




  
  132
  
    
    layoutLeft.setLayoutParams(params);


  		




  
  133
  
    
    LinearLayout layoutMid = new LinearLayout(act);


  		




  
  134
  
    
    layoutMid.setLayoutParams(params);


  		




  
  135
  
    
    LinearLayout layoutRight = new LinearLayout(act);


  		




  
  136
  
    
    layoutRight.setLayoutParams(params);


  		




  
  137
  
    

  		




  129
  138
  
    
    setupPrevButton(act,width);


  		




  130
  
  
    
    layoutBot.addView(mPrevButton);


  		




  
  139
  
    
    layoutLeft.addView(mPrevButton);


  		




  131
  140
  
    
    setupSolveButton(act,width);


  		




  132
  
  
    
    layoutBot.addView(mSolveButton);


  		




  
  141
  
    
    layoutRight.addView(mSolveButton);


  		




  
  142
  
    

  		




  
  143
  
    
    layoutBot.addView(layoutLeft);


  		




  
  144
  
    
    layoutBot.addView(layoutMid);


  		




  
  145
  
    
    layoutBot.addView(layoutRight);


  		




  133
  146
  
    
    }


  		




  134
  147
  
    

  		




  135
  148
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  ......




  261
  274
  
    
    {


  		




  262
  275
  
    
    int padding  = (int)(width*RubikActivity.PADDING);


  		




  263
  276
  
    
    int margin   = (int)(width*RubikActivity.MARGIN);


  		




  264
  
  
    
    int widthBut = (int)(width/6);


  		




  265
  277
  
    
    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);


  		




  266
  278
  
    

  		




  267
  
  
    
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT);


  		




  
  279
  
    
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);


  		




  268
  280
  
    
    params.topMargin    = margin;


  		




  269
  281
  
    
    params.bottomMargin = margin;


  		




  270
  282
  
    
    params.leftMargin   = margin;


  		




  ......




  292
  304
  
    
    {


  		




  293
  305
  
    
    int padding  = (int)(width*RubikActivity.PADDING);


  		




  294
  306
  
    
    int margin   = (int)(width*RubikActivity.MARGIN);


  		




  295
  
  
    
    int widthBut = (int)(width/6);


  		




  296
  307
  
    
    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);


  		




  297
  308
  
    

  		




  298
  
  
    
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(widthBut, LinearLayout.LayoutParams.MATCH_PARENT);


  		




  
  309
  
    
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);


  		




  299
  310
  
    
    params.topMargin    = margin;


  		




  300
  311
  
    
    params.bottomMargin = margin;


  		




  301
  312
  
    
    params.leftMargin   = margin;


  		












Also available in:  Unified diff