Skip to content

Commit 2746ac5

Browse files
adamjakabadamjakab
committed
non-grouped settings
1 parent 5c71bf1 commit 2746ac5

File tree

2 files changed

+68
-20
lines changed

2 files changed

+68
-20
lines changed

Diff for: ‎resources/properties/properties.xml

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<resources>
2-
2+
33
<properties>
4-
<!-- Application properties -->
4+
<!-- Application -->
55
<property id="app_use_sound" type="boolean">true</property>
66
<property id="app_use_vibration" type="boolean">true</property>
77

88
<!-- WORKOUT #1 -->
9+
<property id="w1_divider" type="string">|=============: WORKOUT #1 :=============|</property>
910
<property id="w1_title" type="string">Workout 1</property>
1011
<property id="w1_enabled" type="boolean">true</property>
1112
<property id="w1_exercise_duration" type="number">40</property>
@@ -32,8 +33,9 @@
3233
<property id="w1_e18" type="string"></property>
3334
<property id="w1_e19" type="string"></property>
3435
<property id="w1_e20" type="string"></property>
35-
36+
3637
<!-- WORKOUT #2 -->
38+
<property id="w2_divider" type="string">|=============: WORKOUT #2 :=============|</property>
3739
<property id="w2_title" type="string">Workout 2</property>
3840
<property id="w2_enabled" type="boolean">false</property>
3941
<property id="w2_exercise_duration" type="number">40</property>
@@ -60,8 +62,9 @@
6062
<property id="w2_e18" type="string"></property>
6163
<property id="w2_e19" type="string"></property>
6264
<property id="w2_e20" type="string"></property>
63-
64-
<!-- WORKOUT #3 -->
65+
66+
<!-- WORKOUT #3 -->
67+
<property id="w3_divider" type="string">|=============: WORKOUT #3 :=============|</property>
6568
<property id="w3_title" type="string">Workout 3</property>
6669
<property id="w3_enabled" type="boolean">false</property>
6770
<property id="w3_exercise_duration" type="number">40</property>
@@ -88,8 +91,9 @@
8891
<property id="w3_e18" type="string"></property>
8992
<property id="w3_e19" type="string"></property>
9093
<property id="w3_e20" type="string"></property>
91-
94+
9295
<!-- WORKOUT #4 -->
96+
<property id="w4_divider" type="string">|=============: WORKOUT #4 :=============|</property>
9397
<property id="w4_title" type="string">Workout 4</property>
9498
<property id="w4_enabled" type="boolean">false</property>
9599
<property id="w4_exercise_duration" type="number">40</property>
@@ -116,8 +120,9 @@
116120
<property id="w4_e18" type="string"></property>
117121
<property id="w4_e19" type="string"></property>
118122
<property id="w4_e20" type="string"></property>
119-
123+
120124
<!-- WORKOUT #5 -->
125+
<property id="w5_divider" type="string">|=============: WORKOUT #5 :=============|</property>
121126
<property id="w5_title" type="string">Workout 5</property>
122127
<property id="w5_enabled" type="boolean">false</property>
123128
<property id="w5_exercise_duration" type="number">40</property>

Diff for: ‎resources/settings/settings.xml

+56-13
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
<setting propertyKey="@Properties.app_use_vibration" title="@Strings.use_vibration">
88
<settingConfig type="boolean"/>
99
</setting>
10-
10+
1111

1212
<!-- WORKOUT #1 -->
13-
<!-- Note that persisting settings inside groups does not work! There is a bug! -->
14-
<!-- <group id="workout_1" title="@Strings.group_title_w1"></group> -->
13+
<setting propertyKey="@Properties.w1_divider" title="@Strings.empty">
14+
<settingConfig type="alphaNumeric" readonly="true" />
15+
</setting>
1516
<setting propertyKey="@Properties.w1_title" title="@Strings.workout_title">
1617
<settingConfig type="alphaNumeric" maxLength="32" />
17-
</setting>
18+
</setting>
1819
<setting propertyKey="@Properties.w1_enabled" title="@Strings.workout_enabled">
1920
<settingConfig type="boolean" />
20-
</setting>
21+
</setting>
2122
<setting propertyKey="@Properties.w1_exercise_duration" title="@Strings.exercise_duration">
2223
<settingConfig type="numeric" min="1" max="600" />
2324
</setting>
@@ -60,15 +61,24 @@
6061
<setting propertyKey="@Properties.w1_e10" title="@Strings.exercise_title_10">
6162
<settingConfig type="alphaNumeric" maxLength="32" />
6263
</setting>
63-
64-
64+
<setting propertyKey="@Properties.w1_e11" title="@Strings.exercise_title_11">
65+
<settingConfig type="alphaNumeric" maxLength="32" />
66+
</setting>
67+
<setting propertyKey="@Properties.w1_e12" title="@Strings.exercise_title_12">
68+
<settingConfig type="alphaNumeric" maxLength="32" />
69+
</setting>
70+
71+
6572
<!-- WORKOUT #2 -->
73+
<setting propertyKey="@Properties.w2_divider" title="@Strings.empty">
74+
<settingConfig type="alphaNumeric" readonly="true" />
75+
</setting>
6676
<setting propertyKey="@Properties.w2_title" title="@Strings.workout_title">
6777
<settingConfig type="alphaNumeric" maxLength="32" />
6878
</setting>
6979
<setting propertyKey="@Properties.w2_enabled" title="@Strings.workout_enabled">
7080
<settingConfig type="boolean" />
71-
</setting>
81+
</setting>
7282
<setting propertyKey="@Properties.w2_exercise_duration" title="@Strings.exercise_duration">
7383
<settingConfig type="numeric" min="1" max="600" />
7484
</setting>
@@ -111,15 +121,24 @@
111121
<setting propertyKey="@Properties.w2_e10" title="@Strings.exercise_title_10">
112122
<settingConfig type="alphaNumeric" maxLength="32" />
113123
</setting>
124+
<setting propertyKey="@Properties.w2_e11" title="@Strings.exercise_title_11">
125+
<settingConfig type="alphaNumeric" maxLength="32" />
126+
</setting>
127+
<setting propertyKey="@Properties.w2_e12" title="@Strings.exercise_title_12">
128+
<settingConfig type="alphaNumeric" maxLength="32" />
129+
</setting>
130+
114131

115-
116132
<!-- WORKOUT #3 -->
133+
<setting propertyKey="@Properties.w3_divider" title="@Strings.empty">
134+
<settingConfig type="alphaNumeric" readonly="true" />
135+
</setting>
117136
<setting propertyKey="@Properties.w3_title" title="@Strings.workout_title">
118137
<settingConfig type="alphaNumeric" maxLength="32" />
119138
</setting>
120139
<setting propertyKey="@Properties.w3_enabled" title="@Strings.workout_enabled">
121140
<settingConfig type="boolean" />
122-
</setting>
141+
</setting>
123142
<setting propertyKey="@Properties.w3_exercise_duration" title="@Strings.exercise_duration">
124143
<settingConfig type="numeric" min="1" max="600" />
125144
</setting>
@@ -162,15 +181,24 @@
162181
<setting propertyKey="@Properties.w3_e10" title="@Strings.exercise_title_10">
163182
<settingConfig type="alphaNumeric" maxLength="32" />
164183
</setting>
184+
<setting propertyKey="@Properties.w3_e11" title="@Strings.exercise_title_11">
185+
<settingConfig type="alphaNumeric" maxLength="32" />
186+
</setting>
187+
<setting propertyKey="@Properties.w3_e12" title="@Strings.exercise_title_12">
188+
<settingConfig type="alphaNumeric" maxLength="32" />
189+
</setting>
190+
165191

166-
167192
<!-- WORKOUT #4 -->
193+
<setting propertyKey="@Properties.w4_divider" title="@Strings.empty">
194+
<settingConfig type="alphaNumeric" readonly="true" />
195+
</setting>
168196
<setting propertyKey="@Properties.w4_title" title="@Strings.workout_title">
169197
<settingConfig type="alphaNumeric" maxLength="32" />
170198
</setting>
171199
<setting propertyKey="@Properties.w4_enabled" title="@Strings.workout_enabled">
172200
<settingConfig type="boolean" />
173-
</setting>
201+
</setting>
174202
<setting propertyKey="@Properties.w4_exercise_duration" title="@Strings.exercise_duration">
175203
<settingConfig type="numeric" min="1" max="600" />
176204
</setting>
@@ -213,9 +241,18 @@
213241
<setting propertyKey="@Properties.w4_e10" title="@Strings.exercise_title_10">
214242
<settingConfig type="alphaNumeric" maxLength="32" />
215243
</setting>
244+
<setting propertyKey="@Properties.w4_e11" title="@Strings.exercise_title_11">
245+
<settingConfig type="alphaNumeric" maxLength="32" />
246+
</setting>
247+
<setting propertyKey="@Properties.w4_e12" title="@Strings.exercise_title_12">
248+
<settingConfig type="alphaNumeric" maxLength="32" />
249+
</setting>
250+
216251

217-
218252
<!-- WORKOUT #5 -->
253+
<setting propertyKey="@Properties.w5_divider" title="@Strings.empty">
254+
<settingConfig type="alphaNumeric" readonly="true" />
255+
</setting>
219256
<setting propertyKey="@Properties.w5_title" title="@Strings.workout_title">
220257
<settingConfig type="alphaNumeric" maxLength="32" />
221258
</setting>
@@ -264,6 +301,12 @@
264301
<setting propertyKey="@Properties.w5_e10" title="@Strings.exercise_title_10">
265302
<settingConfig type="alphaNumeric" maxLength="32" />
266303
</setting>
304+
<setting propertyKey="@Properties.w5_e11" title="@Strings.exercise_title_11">
305+
<settingConfig type="alphaNumeric" maxLength="32" />
306+
</setting>
307+
<setting propertyKey="@Properties.w5_e12" title="@Strings.exercise_title_12">
308+
<settingConfig type="alphaNumeric" maxLength="32" />
309+
</setting>
267310

268311
</settings>
269312
</resources>

0 commit comments

Comments
 (0)