Project

General

Profile

« Previous | Next » 

Revision 70688a23

Added by Leszek Koltunski 9 months ago

LTR UI elements; rename some of them.

View differences:

src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
67 67
  private void setupBackButton(final BandagedCreatorActivity act)
68 68
    {
69 69
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
70
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
70
    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
71 71

  
72 72
    mBackButton.setOnClickListener( new View.OnClickListener()
73 73
      {
......
84 84
  private void setupDoneButton(final BandagedCreatorActivity act)
85 85
    {
86 86
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
87
    mDoneButton = new TransparentImageButton(act,R.drawable.ui_huge_done,params);
87
    mDoneButton = new TransparentImageButton(act,R.drawable.ui_done,params);
88 88

  
89 89
    mDoneButton.setOnClickListener( new View.OnClickListener()
90 90
      {
......
102 102
  private void setupResetButton(final BandagedCreatorActivity act)
103 103
    {
104 104
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
105
    mResetButton = new TransparentImageButton(act,R.drawable.ui_huge_reset,params);
105
    mResetButton = new TransparentImageButton(act,R.drawable.ui_reset,params);
106 106

  
107 107
    mResetButton.setOnClickListener( new View.OnClickListener()
108 108
      {
src/main/java/org/distorted/bandaged/BandagedPlayScreen.java
46 46
  private void setupBackButton(final BandagedPlayActivity act)
47 47
    {
48 48
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
49
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
49
    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
50 50

  
51 51
    mBackButton.setOnClickListener( new View.OnClickListener()
52 52
      {
......
63 63
  private void setupSolveButton(final BandagedPlayActivity act)
64 64
    {
65 65
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
66
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_solve,params);
66
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_cube_solve,params);
67 67

  
68 68
    mSolveButton.setOnClickListener( new View.OnClickListener()
69 69
      {
......
82 82
  private void setupScrambleButton(final BandagedPlayActivity act)
83 83
    {
84 84
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
85
    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_scramble,params);
85
    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_cube_scramble,params);
86 86

  
87 87
    mScrambleButton.setOnClickListener( new View.OnClickListener()
88 88
      {
src/main/java/org/distorted/config/ConfigScreen.java
104 104
  private void setupBackButton(final ConfigActivity act)
105 105
    {
106 106
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
107
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
107
    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
108 108

  
109 109
    mBackButton.setOnClickListener( new View.OnClickListener()
110 110
      {
......
122 122
    {
123 123
    final int margin= (int)(height*MARGIN);
124 124
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
125
    mObjectButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_menu,params);
125
    mObjectButton = new TransparentImageButton(act,R.drawable.ui_cube_menu,params);
126 126

  
127 127
    mObjectButton.setOnClickListener( new View.OnClickListener()
128 128
      {
......
214 214
  private void setupPrevButton(final ConfigActivity act)
215 215
    {
216 216
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
217
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
217
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
218 218

  
219 219
    mPrevButton.setOnClickListener( new View.OnClickListener()
220 220
      {
......
233 233
  private void setupNextButton(final ConfigActivity act)
234 234
    {
235 235
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
236
    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
236
    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
237 237

  
238 238
    mNextButton.setOnClickListener( new View.OnClickListener()
239 239
      {
src/main/java/org/distorted/helpers/LockController.java
52 52

  
53 53
  private int getLockIcon(boolean locked, boolean red)
54 54
    {
55
    return locked ? (red? R.drawable.ui_huge_locked_red : R.drawable.ui_huge_locked) : R.drawable.ui_huge_unlocked;
55
    return locked ? (red? R.drawable.ui_locked_red : R.drawable.ui_locked) : R.drawable.ui_unlocked;
56 56
    }
57 57

  
58 58
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/helpers/MovesController.java
58 58

  
59 59
  private int getPrevIcon(boolean on)
60 60
    {
61
    return on ? R.drawable.ui_huge_cube_back : R.drawable.ui_huge_cube_grey;
61
    return on ? R.drawable.ui_cube_back : R.drawable.ui_cube_grey;
62 62
    }
63 63

  
64 64
//////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/purchase/PurchaseScreen.java
34 34
  private void setupBackButton(final PurchaseActivity act)
35 35
    {
36 36
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
37
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
37
    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
38 38

  
39 39
    mBackButton.setOnClickListener( new View.OnClickListener()
40 40
      {
src/main/java/org/distorted/screens/RubikScreenDone.java
77 77
  private void setupBackButton(final RubikActivity act)
78 78
    {
79 79
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
80
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
80
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
81 81

  
82 82
    mBackButton.setOnClickListener( new View.OnClickListener()
83 83
      {
src/main/java/org/distorted/screens/RubikScreenPattern.java
133 133
  private void setupBackButton(final RubikActivity act)
134 134
    {
135 135
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
136
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
136
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
137 137

  
138 138
    mBackButton.setOnClickListener( new View.OnClickListener()
139 139
      {
......
152 152
  private void setupPrevButton(final RubikActivity act)
153 153
    {
154 154
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
155
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
155
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
156 156

  
157 157
    mPrevButton.setOnClickListener( new View.OnClickListener()
158 158
      {
......
173 173
  private void setupNextButton(final RubikActivity act)
174 174
    {
175 175
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
176
    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
176
    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
177 177

  
178 178
    mNextButton.setOnClickListener( new View.OnClickListener()
179 179
      {
src/main/java/org/distorted/screens/RubikScreenPlay.java
128 128
    {
129 129
    final int margin  = (int)(width*RubikActivity.SMALL_MARGIN);
130 130
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
131
    mObjButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_menu,params);
131
    mObjButton = new TransparentImageButton(act, R.drawable.ui_cube_menu,params);
132 132

  
133 133
    mObjButton.setOnClickListener( new View.OnClickListener()
134 134
      {
......
158 158
  private void setupMenuButton(final RubikActivity act, final float width, final float height)
159 159
    {
160 160
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
161
    mMenuButton = new TransparentImageButton(act, R.drawable.ui_huge_menu,params);
161
    mMenuButton = new TransparentImageButton(act, R.drawable.ui_menu,params);
162 162

  
163 163
    mMenuButton.setOnClickListener( new View.OnClickListener()
164 164
      {
......
253 253
    ImageButton buttonDow = layout.findViewById(R.id.buttonDow);
254 254
    ImageButton buttonInf = layout.findViewById(R.id.buttonInf);
255 255

  
256
    buttonTut.setImageResource(R.drawable.ui_huge_tutorial);
257
    buttonDow.setImageResource(R.drawable.ui_huge_download);
258
    buttonInf.setImageResource(R.drawable.ui_huge_info);
256
    buttonTut.setImageResource(R.drawable.ui_tutorial);
257
    buttonDow.setImageResource(R.drawable.ui_download);
258
    buttonInf.setImageResource(R.drawable.ui_info);
259 259

  
260 260
    TypedValue outValue = new TypedValue();
261 261
    act.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true);
......
308 308
  void setupSolveButton(final RubikActivity act)
309 309
    {
310 310
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
311
    mSolveButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_solve,params);
311
    mSolveButton = new TransparentImageButton(act, R.drawable.ui_cube_solve,params);
312 312

  
313 313
    mSolveButton.setOnClickListener( new View.OnClickListener()
314 314
      {
......
326 326
  private void setupScrambleButton(final RubikActivity act)
327 327
    {
328 328
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MP,MP,1.0f);
329
    mScrambleButton = new TransparentImageButton(act, R.drawable.ui_huge_cube_scramble,params);
329
    mScrambleButton = new TransparentImageButton(act, R.drawable.ui_cube_scramble,params);
330 330

  
331 331
    mScrambleButton.setOnClickListener( new View.OnClickListener()
332 332
      {
src/main/java/org/distorted/screens/RubikScreenReady.java
58 58
  private void setupBackButton(final RubikActivity act)
59 59
    {
60 60
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
61
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
61
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
62 62

  
63 63
    mBackButton.setOnClickListener( new View.OnClickListener()
64 64
      {
src/main/java/org/distorted/screens/RubikScreenSolution.java
102 102
  private void setupPrevButton(final RubikActivity act)
103 103
    {
104 104
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
105
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_huge_left,params);
105
    mPrevButton = new TransparentImageButton(act,R.drawable.ui_left,params);
106 106

  
107 107
    mPrevButton.setOnClickListener( new View.OnClickListener()
108 108
      {
......
121 121
  private void setupNextButton(final RubikActivity act)
122 122
    {
123 123
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
124
    mNextButton = new TransparentImageButton(act,R.drawable.ui_huge_right,params);
124
    mNextButton = new TransparentImageButton(act,R.drawable.ui_right,params);
125 125

  
126 126
    mNextButton.setOnClickListener( new View.OnClickListener()
127 127
      {
......
161 161
  private void setupBackButton(final RubikActivity act)
162 162
    {
163 163
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
164
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
164
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
165 165

  
166 166
    mBackButton.setOnClickListener( new View.OnClickListener()
167 167
      {
src/main/java/org/distorted/screens/RubikScreenSolver.java
288 288
  private void setupResetButton(final RubikActivity act)
289 289
    {
290 290
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT);
291
    mResetButton = new TransparentImageButton(act, R.drawable.ui_huge_reset, params);
291
    mResetButton = new TransparentImageButton(act, R.drawable.ui_reset, params);
292 292

  
293 293
    mResetButton.setOnClickListener( new View.OnClickListener()
294 294
      {
......
306 306
  private void setupSolveButton(final RubikActivity act)
307 307
    {
308 308
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
309
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_solve,params);
309
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_solve,params);
310 310

  
311 311
    mSolveButton.setOnClickListener( new View.OnClickListener()
312 312
      {
......
329 329
  private void setupBackButton(final RubikActivity act)
330 330
    {
331 331
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
332
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
332
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
333 333

  
334 334
    mBackButton.setOnClickListener( new View.OnClickListener()
335 335
      {
src/main/java/org/distorted/screens/RubikScreenSolving.java
83 83
  private void setupBackButton(final RubikActivity act)
84 84
    {
85 85
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
86
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_back,params);
86
    mBackButton = new TransparentImageButton(act,R.drawable.ui_back,params);
87 87

  
88 88
    mBackButton.setOnClickListener( new View.OnClickListener()
89 89
      {
src/main/java/org/distorted/tutorials/TutorialScreen.java
35 35
  private void setupLockButton(final TutorialActivity act)
36 36
    {
37 37
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
38
    mLockButton = new TransparentImageButton(act,R.drawable.ui_huge_locked,params);
38
    mLockButton = new TransparentImageButton(act,R.drawable.ui_locked,params);
39 39

  
40 40
    mLockButton.setOnClickListener( new View.OnClickListener()
41 41
      {
......
79 79
  private void setupSolveButton(final TutorialActivity act)
80 80
    {
81 81
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
82
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_solve,params);
82
    mSolveButton = new TransparentImageButton(act,R.drawable.ui_cube_solve,params);
83 83

  
84 84
    mSolveButton.setOnClickListener( new View.OnClickListener()
85 85
      {
......
97 97
  private void setupScrambleButton(final TutorialActivity act)
98 98
    {
99 99
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
100
    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_huge_cube_scramble,params);
100
    mScrambleButton = new TransparentImageButton(act,R.drawable.ui_cube_scramble,params);
101 101

  
102 102
    mScrambleButton.setOnClickListener( new View.OnClickListener()
103 103
      {
......
115 115
  private void setupBackButton(final TutorialActivity act)
116 116
    {
117 117
    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
118
    mBackButton = new TransparentImageButton(act,R.drawable.ui_huge_smallback,params);
118
    mBackButton = new TransparentImageButton(act,R.drawable.ui_smallback,params);
119 119

  
120 120
    mBackButton.setOnClickListener( new View.OnClickListener()
121 121
      {
src/main/res/drawable/ui_huge_spinner.xml
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item>
4
        <layer-list>
5
            <item>
6
                <shape android:shape="rectangle">
7
                    <solid android:color="@color/light_grey" />
8
                    <corners android:radius="6dip" />
9
                    <stroke
10
                        android:color="@color/grey"
11
                        android:width="2dp"/>
12
                </shape>
13
            </item>
14
            <item >
15
                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ui_huge_down"/>
16
            </item>
17
        </layer-list>
18
    </item>
19
</selector>
src/main/res/drawable/ui_spinner.xml
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item>
4
        <layer-list>
5
            <item>
6
                <shape android:shape="rectangle">
7
                    <solid android:color="@color/light_grey" />
8
                    <corners android:radius="6dip" />
9
                    <stroke
10
                        android:color="@color/grey"
11
                        android:width="2dp"/>
12
                </shape>
13
            </item>
14
            <item >
15
                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ui_down"/>
16
            </item>
17
        </layer-list>
18
    </item>
19
</selector>
src/main/res/layout/non_free_object.xml
18 18
            android:adjustViewBounds="true"
19 19
            android:paddingTop="-10dp"
20 20
            android:scaleType="fitStart"
21
            android:src="@drawable/ui_huge_locked"/>
21
            android:src="@drawable/ui_locked"/>
22 22

  
23 23
    </FrameLayout>

Also available in: Unified diff