Project

General

Profile

« Previous | Next » 

Revision 1cbcc6bf

Added by Leszek Koltunski about 5 years ago

Progress with Credits and Settings.

View differences:

src/main/java/org/distorted/magic/RubikSettings.java
34 34
import android.widget.ArrayAdapter;
35 35
import android.widget.SeekBar;
36 36
import android.widget.Spinner;
37
import android.widget.TextView;
37 38

  
38 39
import org.distorted.effect.AppearEffect;
39 40
import org.distorted.effect.DisappearEffect;
......
52 53
  private int mAppearPos, mDisappearPos;
53 54
  private int mAppearType, mDisappearType;
54 55

  
56
  private TextView mAppearDuration, mDisappearDuration;
57

  
55 58
///////////////////////////////////////////////////////////////////////////////////////////////////
56 59

  
57 60
  @Override
......
87 90
      }
88 91
    catch(NullPointerException ex)
89 92
      {
90
      mAppearPos     = 10;
91
      mDisappearPos  = 10;
92
      mAppearType    =  1;
93
      mDisappearType =  1;
93
      mAppearPos     = RubikActivity.DEFAULT_APPEAR_POS;
94
      mDisappearPos  = RubikActivity.DEFAULT_DISAPPEAR_POS;
95
      mAppearType    = RubikActivity.DEFAULT_APPEAR_TYPE;
96
      mDisappearType = RubikActivity.DEFAULT_DISAPPEAR_TYPE;
94 97
      }
95 98
    }
96 99

  
......
117 120
    final View view = inflater.inflate(R.layout.settings, null);
118 121
    builder.setView(view);
119 122

  
123
    mAppearDuration    = view.findViewById(R.id.appearDurationText);
124
    mDisappearDuration = view.findViewById(R.id.disappearDurationText);
125

  
120 126
    Spinner appearTypeSpinner  = view.findViewById(R.id.appearType);
121 127

  
122 128
    if( appearTypeSpinner!=null )
......
224 230
      {
225 231
      switch (bar.getId())
226 232
        {
227
        case R.id.appearDuration   : mAppearPos   = progress; break;
228
        case R.id.disappearDuration: mDisappearPos= progress; break;
233
        case R.id.appearDuration   : mAppearPos   = progress;
234
                                     mAppearDuration.setText(RubikActivity.translateDuration(mAppearPos)+" ms");
235
                                     break;
236
        case R.id.disappearDuration: mDisappearPos= progress;
237
                                     mDisappearDuration.setText(RubikActivity.translateDuration(mDisappearPos)+" ms");
238
                                     break;
229 239
        }
230 240
      }
231 241

  

Also available in: Unified diff