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/multiblur/MultiblurActivity.java
86 86
      {
87 87
      MultiblurSurfaceView v = findViewById(R.id.multiblurSurfaceView);
88 88
      MultiblurRenderer renderer = v.getRenderer();
89
      int pid = parent.getId();
89 90

  
90
      switch(parent.getId())
91
      if( pid == R.id.multiblur_spinnerQuality )
91 92
        {
92
        case R.id.multiblur_spinnerQuality: EffectQuality quality;
93

  
94
                                            switch(pos)
95
                                              {
96
                                              case 0 : quality = EffectQuality.HIGHEST; break;
97
                                              case 1 : quality = EffectQuality.HIGH   ; break;
98
                                              case 2 : quality = EffectQuality.MEDIUM ; break;
99
                                              default: quality = EffectQuality.LOW    ;
100
                                              }
101
                                            renderer.setQuality(quality);
102
                                            mQuality = quality.ordinal();
103
                                            break;
104
        case R.id.multiblur_spinnerMode   : renderer.setRenderModeToOIT(pos==1);
105
                                            break;
93
        EffectQuality quality;
94

  
95
        switch(pos)
96
          {
97
          case 0 : quality = EffectQuality.HIGHEST; break;
98
          case 1 : quality = EffectQuality.HIGH   ; break;
99
          case 2 : quality = EffectQuality.MEDIUM ; break;
100
          default: quality = EffectQuality.LOW    ;
101
          }
102
        renderer.setQuality(quality);
103
        mQuality = quality.ordinal();
104
        }
105
      if( pid == R.id.multiblur_spinnerMode )
106
        {
107
        renderer.setRenderModeToOIT(pos==1);
106 108
        }
107 109
      }
108 110

  
......
192 194

  
193 195
    public void onProgressChanged(SeekBar bar, int progress, boolean fromUser)
194 196
      {
195
      switch (bar.getId())
196
        {
197
        case R.id.multiblurDistanceSeek: MultiblurSurfaceView view1 = findViewById(R.id.multiblurSurfaceView);
198
                                         view1.getRenderer().setDistance(progress);
199
                                         break;
200
        case R.id.multiblurRangeSeek   : MultiblurSurfaceView view2 = findViewById(R.id.multiblurSurfaceView);
201
                                         view2.getRenderer().setRange(progress);
202
                                         break;
197
      int id = bar.getId();
198
      MultiblurSurfaceView v = findViewById(R.id.multiblurSurfaceView);
199
      MultiblurRenderer r = v.getRenderer();
203 200

  
204
        }
201
      if( id == R.id.multiblurDistanceSeek ) r.setDistance(progress);
202
      if( id == R.id.multiblurRangeSeek    ) r.setRange(progress);
205 203
      }
206 204

  
207 205
///////////////////////////////////////////////////////////////////////////////////////////////////
......
219 217
    CheckBox box = (CheckBox)view;
220 218
    int id = box.getId();
221 219
    boolean checked = box.isChecked();
222
    MultiblurSurfaceView sView = findViewById(R.id.multiblurSurfaceView);
223

  
224
    switch(id)
225
      {
226
      case R.id.multiblurCheckBox0  : sView.getRenderer().setChecked(0,checked); break;
227
      case R.id.multiblurCheckBox1  : sView.getRenderer().setChecked(1,checked); break;
228
      case R.id.multiblurCheckBox2  : sView.getRenderer().setChecked(2,checked); break;
229
      case R.id.multiblurCheckBox3  : sView.getRenderer().setChecked(3,checked); break;
230
      case R.id.multiblurCheckBox4  : sView.getRenderer().setChecked(4,checked); break;
231
      case R.id.multiblurCheckBox5  : sView.getRenderer().setChecked(5,checked); break;
232
      case R.id.multiblurCheckBox6  : sView.getRenderer().setChecked(6,checked); break;
233
      case R.id.multiblurCheckBox7  : sView.getRenderer().setChecked(7,checked); break;
234
      }
220
    MultiblurSurfaceView v = findViewById(R.id.multiblurSurfaceView);
221
    MultiblurRenderer r = v.getRenderer();
222

  
223
    if( id == R.id.multiblurCheckBox0 ) r.setChecked(0,checked);
224
    if( id == R.id.multiblurCheckBox1 ) r.setChecked(1,checked);
225
    if( id == R.id.multiblurCheckBox2 ) r.setChecked(2,checked);
226
    if( id == R.id.multiblurCheckBox3 ) r.setChecked(3,checked);
227
    if( id == R.id.multiblurCheckBox4 ) r.setChecked(4,checked);
228
    if( id == R.id.multiblurCheckBox5 ) r.setChecked(5,checked);
229
    if( id == R.id.multiblurCheckBox6 ) r.setChecked(6,checked);
230
    if( id == R.id.multiblurCheckBox7 ) r.setChecked(7,checked);
235 231
    }
236 232

  
237 233
}

Also available in: Unified diff