Project

General

Profile

« Previous | Next » 

Revision 92843d3b

Added by Leszek Koltunski over 3 years ago

Rework the bottom pane

View differences:

src/main/java/org/distorted/states/RubikStateSolver.java
107 107
    for(ImageButton button: mColorButton) layoutTop.addView(button);
108 108

  
109 109
    // BOT ////////////////////////////
110
    setupSolveButton(act,width);
111

  
112
    LinearLayout layoutLeft = act.findViewById(R.id.mainBarLeft);
113
    layoutLeft.removeAllViews();
114
    layoutLeft.addView(mSolveButton);
110
    LinearLayout layoutBot = act.findViewById(R.id.lowerBar);
111
    layoutBot.removeAllViews();
115 112

  
113
    setupSolveButton(act,width);
116 114
    setupBackButton(act,width);
117 115

  
118
    LinearLayout layoutRight = act.findViewById(R.id.mainBarRight);
119
    layoutRight.removeAllViews();
120
    layoutRight.addView(mBackButton);
116
    layoutBot.addView(mSolveButton);
117
    layoutBot.addView(mBackButton);
121 118
    }
122 119

  
123 120
///////////////////////////////////////////////////////////////////////////////////////////////////
......
191 188
    {
192 189
    int padding = (int)(width*RubikActivity.PADDING);
193 190
    int margin   = (int)(width*RubikActivity.MARGIN);
194
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
191
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1);
195 192
    params.topMargin    = margin;
196 193
    params.bottomMargin = margin;
197 194
    params.leftMargin   = margin;
......
226 223
    {
227 224
    int padding = (int)(width*RubikActivity.PADDING);
228 225
    int margin  = (int)(width*RubikActivity.MARGIN);
229
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
226
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1);
230 227
    params.topMargin    = margin;
231 228
    params.bottomMargin = margin;
232 229
    params.leftMargin   = margin;

Also available in: Unified diff