Project

General

Profile

« Previous | Next » 

Revision 7ee8337b

Added by Leszek Koltunski 6 months ago

Progress with PlayActivity

View differences:

src/main/java/org/distorted/main/MainObjectPopup.java
11 11

  
12 12
import static android.view.View.GONE;
13 13

  
14
import android.app.Activity;
15 14
import android.content.Context;
16 15
import android.util.TypedValue;
17 16
import android.view.Gravity;
......
154 153

  
155 154
///////////////////////////////////////////////////////////////////////////////////////////////////
156 155

  
157
  private void setupLevelButtons(Activity act, RubikObject object, View layout, int width,int padding, int margin)
156
  private void setupLevelButtons(MainActivity act, RubikObject object, View layout, int width,int padding, int margin)
158 157
    {
159 158
    int layoutWidth = (int)(width*MENU_WIDTH);
160 159
    int levelHeight = (int)(width*BUTTON_HEIGHT);
......
175 174
    level[7] = layout.findViewById(R.id.level7);
176 175
    level[8] = layout.findViewById(R.id.levelM);
177 176

  
178
    int numScramble = object==null ? 1 : object.getNumScramble();
177
    int numScramble  = object==null ? 1 : object.getNumScramble();
179 178
    int min = Math.min(numScramble,LEVELS_SHOWN);
180 179

  
181 180
    if( numScramble>=1 && numScramble<=7 )
......
186 185

  
187 186
    for(int i=0; i<=min; i++)
188 187
      {
189
      final int ii = i;
190 188
      level[i].setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
191 189
      level[i].setLayoutParams(params);
192 190
      level[i].setPadding(0,0,0,0);
193 191

  
192
      boolean free = i==0;
193
      int scrambles = (i>0 && i<min) ? i : numScramble;
194

  
194 195
      level[i].setOnClickListener( new View.OnClickListener()
195 196
        {
196 197
        @Override
197 198
        public void onClick(View v)
198 199
          {
199

  
200
          mPopup.dismiss();
201
          act.switchToPlay(object,scrambles,free);
200 202
          }
201 203
        });
202 204
      }

Also available in: Unified diff