Project

General

Profile

« Previous | Next » 

Revision 77e66c58

Added by Leszek Koltunski 11 months ago

in API 34 R.id. things are no loger constants and cannot be used in switches.

View differences:

src/main/java/org/distorted/examples/predeform/PredeformActivity.java
335 335
  @Override
336 336
  public void onClick(View v)
337 337
    {
338
    switch (v.getId())
339
      {
340
      case R.id.predeformAddEffect   : newEffect(); break;
341
      case R.id.predeformRemoveEffect: removeAll(); break;
342
      case R.id.predeformCreate      : create();    break;
343
      case R.id.button1dRemove       :
344
      case R.id.button2dRemove       :
345
      case R.id.button3dRemove       :
346
      case R.id.button4dRemove       :
347
      case R.id.button5dRemove       : remove(v)  ; break;
348
      }
338
    int id = v.getId();
339

  
340
    if( id == R.id.predeformAddEffect   ) newEffect();
341
    if( id == R.id.predeformRemoveEffect) removeAll();
342
    if( id == R.id.predeformCreate      ) create();
343
    if( id == R.id.button1dRemove      ||
344
        id == R.id.button2dRemove      ||
345
        id == R.id.button3dRemove      ||
346
        id == R.id.button4dRemove      ||
347
        id == R.id.button5dRemove       ) remove(v);
349 348
    }
350 349

  
351 350
///////////////////////////////////////////////////////////////////////////////////////////////////
......
365 364
  @Override
366 365
  public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
367 366
    {
368
    switch(parent.getId())
367
    int pid = parent.getId();
368

  
369
    if( pid == R.id.predeformSpinnerType )
370
      {
371
      if( mObjectType!=pos )
372
        {
373
        mObjectType = pos;
374
        int dim = PredeformMeshList.getDimension(mObjectType);
375
        mRowsPicker.setEnabled(dim>=1);
376
        mColsPicker.setEnabled(dim>=2);
377
        mSlicPicker.setEnabled(dim>=3);
378
        }
379
      }
380
    if( pid == R.id.predeformSpinnerBitmap )
381
      {
382
      switch(pos)
383
        {
384
        case 0: mBitmapID = -1            ; break;
385
        case 1: mBitmapID = R.raw.face    ; break;
386
        case 2: mBitmapID = R.raw.dog     ; break;
387
        case 3: mBitmapID = R.raw.cat     ; break;
388
        case 4: mBitmapID = R.raw.grid    ; break;
389
        case 5: mBitmapID = R.raw.bean    ; break;
390
        case 6: mBitmapID = R.raw.monalisa; break;
391
        case 7: mBitmapID = R.raw.world   ; break;
392
        }
393
      }
394
    if( pid == R.id.predeformSpinnerEffect )
369 395
      {
370
      case R.id.predeformSpinnerType  : if( mObjectType!=pos )
371
                                          {
372
                                          mObjectType = pos;
373

  
374
                                          int dim = PredeformMeshList.getDimension(mObjectType);
375

  
376
                                          mRowsPicker.setEnabled(dim>=1);
377
                                          mColsPicker.setEnabled(dim>=2);
378
                                          mSlicPicker.setEnabled(dim>=3);
379
                                          }
380
                                        break;
381
      case R.id.predeformSpinnerBitmap: switch(pos)
382
                                          {
383
                                          case 0: mBitmapID = -1            ; break;
384
                                          case 1: mBitmapID = R.raw.face    ; break;
385
                                          case 2: mBitmapID = R.raw.dog     ; break;
386
                                          case 3: mBitmapID = R.raw.cat     ; break;
387
                                          case 4: mBitmapID = R.raw.grid    ; break;
388
                                          case 5: mBitmapID = R.raw.bean    ; break;
389
                                          case 6: mBitmapID = R.raw.monalisa; break;
390
                                          case 7: mBitmapID = R.raw.world   ; break;
391
                                          }
392
                                        break;
393
      case R.id.predeformSpinnerEffect: mEffectAdd = pos;
394
                                        break;
396
      mEffectAdd = pos;
395 397
      }
396 398
    }
397 399

  

Also available in: Unified diff