Project

General

Profile

« Previous | Next » 

Revision 4235de9b

Added by Leszek Koltunski over 4 years ago

Major rearrangement of the UI.

View differences:

src/main/java/org/distorted/magic/RubikDialogSettings.java
31 31
import android.view.Gravity;
32 32
import android.view.LayoutInflater;
33 33
import android.view.View;
34
import android.view.Window;
35
import android.view.WindowManager;
34 36
import android.widget.AdapterView;
35 37
import android.widget.ArrayAdapter;
36 38
import android.widget.LinearLayout;
......
57 59
    int textH=32;
58 60
    int layoH=36;
59 61
    int margH=10;
60
/*
61
    if( metrics.widthPixels > metrics.heightPixels )
62
      {
63
      textH = 18;
64
      layoH = 25;
65
      margH =  5;
66
      }
67
    else
68
      {
69
      textH = 32;
70
      layoH = 36;
71
      margH = 10;
72
      }
73
*/
62

  
74 63
    ///// OUTER LAYOUT ///////////////////////////////////////////////////////////////////
75 64

  
76 65
    int margin = (int)(scale*margH + 0.5f);
......
201 190
    mDurationText = new TextView[BaseEffect.Type.LENGTH];
202 191
    }
203 192

  
193
///////////////////////////////////////////////////////////////////////////////////////////////////
194

  
195
  @Override
196
  public void onStart()
197
    {
198
    super.onStart();
199

  
200
    Window window = getDialog().getWindow();
201
    window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
202
                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
203
    window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
204
    }
205

  
204 206
///////////////////////////////////////////////////////////////////////////////////////////////////
205 207

  
206 208
  @NonNull
......
211 213
    LayoutInflater inflater = act.getLayoutInflater();
212 214
    AlertDialog.Builder builder = new AlertDialog.Builder(act);
213 215
    TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null);
214
    tv.setText(R.string.settings_title);
216
    tv.setText(R.string.settings);
215 217
    builder.setCustomTitle(tv);
216 218

  
217 219
    builder.setCancelable(true);

Also available in: Unified diff