Project

General

Profile

« Previous | Next » 

Revision 22fdfc36

Added by Leszek Koltunski over 4 years ago

RubikCube: major progress with a separate RubikSettingsEnum enum - has been introduced into RubikSettings.

View differences:

src/main/res/layout/settings.xml
2 2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    android:layout_width="match_parent"
4 4
    android:layout_height="match_parent"
5
    android:id="@+id/main_settings_layout"
5 6
    android:gravity="center_horizontal"
6 7
    android:orientation="vertical">
7 8

  
8
    <TextView
9
        android:layout_width="fill_parent"
10
        android:layout_height="48dp"
11
        android:paddingStart="15dp"
12
        android:paddingEnd="15dp"
13
        android:gravity="start|center"
14
        android:text="@string/sizechange_effect"
15
        android:textAppearance="?android:attr/textAppearanceMedium" />
16

  
17
    <LinearLayout
18
        android:layout_width="fill_parent"
19
        android:layout_height="fill_parent"
20
        android:layout_weight="0.5"
21
        android:gravity="center|fill_horizontal"
22
        android:layout_marginLeft="10dp"
23
        android:layout_marginRight="10dp"
24
        android:layout_marginBottom="10dp"
25
        android:background="@color/grey"
26
        android:orientation="vertical">
27

  
28
        <LinearLayout
29
            android:layout_width="fill_parent"
30
            android:layout_height="36dp"
31
            android:gravity="center|fill_horizontal"
32
            android:orientation="horizontal">
33

  
34
            <TextView
35
                android:layout_weight="0.2"
36
                android:layout_width="0dp"
37
                android:layout_height="fill_parent"
38
                android:paddingStart="5dp"
39
                android:paddingEnd="5dp"
40
                android:gravity="start|center"
41
                android:text="@string/duration"
42
                android:textAppearance="?android:attr/textAppearanceSmall" />
43

  
44
            <TextView
45
                android:id="@+id/sizechangeDurationText"
46
                android:layout_weight="0.2"
47
                android:layout_width="0dp"
48
                android:layout_height="fill_parent"
49
                android:paddingStart="5dp"
50
                android:paddingEnd="5dp"
51
                android:gravity="end|center"
52
                android:textAppearance="?android:attr/textAppearanceSmall" />
53

  
54
            <SeekBar
55
                android:id="@+id/sizechangeDuration"
56
                android:layout_weight="0.6"
57
                android:layout_width="0dp"
58
                android:layout_height="fill_parent"
59
                android:paddingLeft="10dp"
60
                android:paddingRight="10dp" />
61

  
62
        </LinearLayout>
63

  
64
        <LinearLayout
65
            android:layout_width="fill_parent"
66
            android:layout_height="36dp"
67
            android:gravity="center|fill_horizontal"
68
            android:orientation="horizontal">
69

  
70
            <TextView
71
                android:layout_weight="0.4"
72
                android:layout_width="0dp"
73
                android:layout_height="fill_parent"
74
                android:paddingStart="5dp"
75
                android:paddingEnd="5dp"
76
                android:gravity="start|center"
77
                android:text="@string/type"
78
                android:textAppearance="?android:attr/textAppearanceSmall" />
79

  
80
            <Spinner
81
                android:id="@+id/sizechangeType"
82
                android:layout_weight="0.6"
83
                android:layout_width="0dp"
84
                android:layout_height="fill_parent"
85
                android:textAlignment="center"
86
                android:paddingLeft="10dp"
87
                android:paddingRight="10dp" />
88

  
89
        </LinearLayout>
90
    </LinearLayout>
91

  
92
    <TextView
93
        android:layout_width="fill_parent"
94
        android:layout_height="48dp"
95
        android:paddingStart="15dp"
96
        android:paddingEnd="15dp"
97
        android:gravity="start|center"
98
        android:text="@string/unscramble_effect"
99
        android:textAppearance="?android:attr/textAppearanceMedium" />
100

  
101
    <LinearLayout
102
        android:layout_width="fill_parent"
103
        android:layout_height="fill_parent"
104
        android:layout_weight="0.5"
105
        android:gravity="center|fill_horizontal"
106
        android:layout_marginLeft="10dp"
107
        android:layout_marginRight="10dp"
108
        android:layout_marginBottom="10dp"
109
        android:background="@color/grey"
110
        android:orientation="vertical">
111

  
112
        <LinearLayout
113
            android:layout_width="fill_parent"
114
            android:layout_height="36dp"
115
            android:gravity="center|fill_horizontal"
116
            android:orientation="horizontal">
117

  
118
            <TextView
119
                android:layout_weight="0.2"
120
                android:layout_width="0dp"
121
                android:layout_height="fill_parent"
122
                android:paddingStart="5dp"
123
                android:paddingEnd="5dp"
124
                android:gravity="start|center"
125
                android:text="@string/duration"
126
                android:textAppearance="?android:attr/textAppearanceSmall" />
127

  
128
            <TextView
129
                android:id="@+id/solveDurationText"
130
                android:layout_weight="0.2"
131
                android:layout_width="0dp"
132
                android:layout_height="fill_parent"
133
                android:paddingStart="5dp"
134
                android:paddingEnd="5dp"
135
                android:gravity="end|center"
136
                android:textAppearance="?android:attr/textAppearanceSmall" />
137

  
138
            <SeekBar
139
                android:id="@+id/solveDuration"
140
                android:layout_weight="0.6"
141
                android:layout_width="0dp"
142
                android:layout_height="fill_parent"
143
                android:paddingLeft="10dp"
144
                android:paddingRight="10dp" />
145

  
146
        </LinearLayout>
147

  
148
        <LinearLayout
149
            android:layout_width="fill_parent"
150
            android:layout_height="36dp"
151
            android:gravity="center|fill_horizontal"
152
            android:orientation="horizontal">
153

  
154
            <TextView
155
                android:layout_weight="0.4"
156
                android:layout_width="0dp"
157
                android:layout_height="fill_parent"
158
                android:paddingStart="5dp"
159
                android:paddingEnd="5dp"
160
                android:gravity="start|center"
161
                android:text="@string/type"
162
                android:textAppearance="?android:attr/textAppearanceSmall" />
163

  
164
            <Spinner
165
                android:id="@+id/solveType"
166
                android:layout_weight="0.6"
167
                android:layout_width="0dp"
168
                android:layout_height="fill_parent"
169
                android:textAlignment="center"
170
                android:paddingLeft="10dp"
171
                android:paddingRight="10dp" />
172

  
173
        </LinearLayout>
174
    </LinearLayout>
175

  
176
    <TextView
177
        android:layout_width="fill_parent"
178
        android:layout_height="48dp"
179
        android:paddingStart="15dp"
180
        android:paddingEnd="15dp"
181
        android:gravity="start|center"
182
        android:text="@string/scramble_effect"
183
        android:textAppearance="?android:attr/textAppearanceMedium" />
184

  
185
    <LinearLayout
186
        android:layout_width="fill_parent"
187
        android:layout_height="fill_parent"
188
        android:layout_weight="0.5"
189
        android:gravity="center|fill_horizontal"
190
        android:layout_marginLeft="10dp"
191
        android:layout_marginRight="10dp"
192
        android:background="@color/grey"
193
        android:orientation="vertical">
194

  
195
        <LinearLayout
196
            android:layout_width="fill_parent"
197
            android:layout_height="36dp"
198
            android:gravity="center|fill_horizontal"
199
            android:orientation="horizontal">
200

  
201
            <TextView
202
                android:layout_weight="0.2"
203
                android:layout_width="0dp"
204
                android:layout_height="fill_parent"
205
                android:paddingStart="5dp"
206
                android:paddingEnd="5dp"
207
                android:gravity="start|center"
208
                android:text="@string/duration"
209
                android:textAppearance="?android:attr/textAppearanceSmall" />
210

  
211
            <TextView
212
                android:id="@+id/scrambleDurationText"
213
                android:layout_weight="0.2"
214
                android:layout_width="0dp"
215
                android:layout_height="fill_parent"
216
                android:paddingStart="5dp"
217
                android:paddingEnd="5dp"
218
                android:gravity="end|center"
219
                android:textAppearance="?android:attr/textAppearanceSmall" />
220

  
221
            <SeekBar
222
                android:id="@+id/scrambleDuration"
223
                android:layout_weight="0.6"
224
                android:layout_width="0dp"
225
                android:layout_height="fill_parent"
226
                android:paddingLeft="10dp"
227
                android:paddingRight="10dp" />
228

  
229
        </LinearLayout>
230

  
231
        <LinearLayout
232
            android:layout_width="fill_parent"
233
            android:layout_height="36dp"
234
            android:gravity="center|fill_horizontal"
235
            android:orientation="horizontal">
236

  
237
            <TextView
238
                android:layout_weight="0.4"
239
                android:layout_width="0dp"
240
                android:layout_height="fill_parent"
241
                android:paddingStart="5dp"
242
                android:paddingEnd="5dp"
243
                android:gravity="start|center"
244
                android:text="@string/type"
245
                android:textAppearance="?android:attr/textAppearanceSmall" />
246

  
247
            <Spinner
248
                android:id="@+id/scrambleType"
249
                android:layout_weight="0.6"
250
                android:layout_width="0dp"
251
                android:layout_height="fill_parent"
252
                android:textAlignment="center"
253
                android:paddingLeft="10dp"
254
                android:paddingRight="10dp" />
255

  
256
        </LinearLayout>
257
    </LinearLayout>
258 9
</LinearLayout>

Also available in: Unified diff