Project

General

Profile

« Previous | Next » 

Revision 39176a1f

Added by Leszek Koltunski almost 2 years ago

Make the size of the text in the spinners in the bandaged activity look right on all screen sizes.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogBandagedSettings.java
48 48
public class RubikDialogBandagedSettings extends AppCompatDialogFragment implements AdapterView.OnItemSelectedListener
49 49
  {
50 50
  private int mAnimPos, mScraPos;
51
  private float mTextSize;
51 52

  
52 53
///////////////////////////////////////////////////////////////////////////////////////////////////
53 54

  
......
80 81
    scramble.setOnItemSelectedListener(this);
81 82
    String[] scrambleModes = createScrambleModes();
82 83

  
83
    ArrayAdapter<String> scrambleAdapter = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, scrambleModes );
84
    ArrayAdapter<String> scrambleAdapter = new ArrayAdapter<>(act, R.layout.spinner_item, scrambleModes );
84 85
    scrambleAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
85 86
    scramble.setAdapter(scrambleAdapter);
86 87
    scramble.setSelection(mScraPos);
......
89 90
    animation.setOnItemSelectedListener(this);
90 91
    String[] animationModes = { "ON" , "OFF" };
91 92

  
92
    ArrayAdapter<String> animationAdapter = new ArrayAdapter<>(act, android.R.layout.simple_spinner_item, animationModes );
93
    ArrayAdapter<String> animationAdapter = new ArrayAdapter<>(act, R.layout.spinner_item, animationModes );
93 94
    animationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
94 95
    animation.setAdapter(animationAdapter);
95 96
    animation.setSelection(mAnimPos);
......
102 103
    {
103 104
    int spinnerID = parent.getId();
104 105

  
106
    ((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX,mTextSize);
107

  
105 108
    if( spinnerID == R.id.bandaged_spinner_scramble )
106 109
      {
107 110
      mScraPos = pos;
......
131 134
    act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
132 135
    final float titleSize= displaymetrics.widthPixels * RubikActivity.MENU_BIG_TEXT_SIZE;
133 136
    final float okSize   = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE;
134
    final float textSize = displaymetrics.widthPixels * RubikActivity.MENU_BIG_TEXT_SIZE;
137
    mTextSize = displaymetrics.widthPixels * RubikActivity.MENU_BIG_TEXT_SIZE;
135 138

  
136 139
    TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null);
137 140
    tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleSize);
......
171 174
      });
172 175

  
173 176
    final View view = inflater.inflate(R.layout.dialog_settings, null);
174
    configureView(act,view,textSize,scraPos,animPos);
177
    configureView(act,view,mTextSize,scraPos,animPos);
175 178
    builder.setView(view);
176 179

  
177 180
    Dialog dialog = builder.create();

Also available in: Unified diff