Skip to content

Commit 336a127

Browse files
esmeetewinkelesmeetewinkel
authored
Merge pull request #125 from ParentingForLifelongHealth/content/1.2.9
content: 1.2.9
2 parents b42afb8 + dceb23f commit 336a127

File tree

7 files changed

+123
-82
lines changed

7 files changed

+123
-82
lines changed

‎app_data/sheets/template/activity.json

+7-50
Original file line numberDiff line numberDiff line change
@@ -82,49 +82,6 @@
8282
]
8383
}
8484
},
85-
{
86-
"type": "text",
87-
"name": "spacer",
88-
"_nested_name": "spacer"
89-
},
90-
{
91-
"type": "display_group",
92-
"rows": [
93-
{
94-
"type": "text",
95-
"name": "empty",
96-
"style_list": [
97-
"flex: 1"
98-
],
99-
"_nested_name": "display_group_7.empty"
100-
},
101-
{
102-
"type": "round_button",
103-
"name": "close_all",
104-
"action_list": [
105-
{
106-
"trigger": "click",
107-
"action_id": "nav_stack",
108-
"args": [
109-
"close_all"
110-
],
111-
"_raw": "nav_stack: close_all",
112-
"_cleaned": "click | nav_stack: close_all"
113-
}
114-
],
115-
"parameter_list": {
116-
"variant": "no-background",
117-
"icon_src": "images/icons/cancel.svg"
118-
},
119-
"style_list": [
120-
"width: 96px"
121-
],
122-
"_nested_name": "display_group_7.close_all"
123-
}
124-
],
125-
"name": "display_group_7",
126-
"_nested_name": "display_group_7"
127-
},
12885
{
12986
"type": "display_group",
13087
"exclude_from_translation": true,
@@ -137,7 +94,7 @@
13794
"value": {}
13895
},
13996
"exclude_from_translation": true,
140-
"_nested_name": "display_group_9[email protected]",
97+
"_nested_name": "display_group_6[email protected]",
14198
"_dynamicFields": {
14299
"name": [
143100
{
@@ -157,7 +114,7 @@
157114
],
158115
"_nested_name": [
159116
{
160-
"fullExpression": "display_group_9[email protected]",
117+
"fullExpression": "display_group_6[email protected]",
161118
"matchedExpression": "@item.id",
162119
"type": "item",
163120
"fieldName": "id"
@@ -209,7 +166,7 @@
209166
"icon_false_asset": "images/icons/heart.png"
210167
},
211168
"exclude_from_translation": true,
212-
"_nested_name": "display_group_9[email protected]",
169+
"_nested_name": "display_group_6[email protected]",
213170
"_dynamicFields": {
214171
"name": [
215172
{
@@ -259,7 +216,7 @@
259216
},
260217
"_nested_name": [
261218
{
262-
"fullExpression": "display_group_9[email protected]",
219+
"fullExpression": "display_group_6[email protected]",
263220
"matchedExpression": "@item.id",
264221
"type": "item",
265222
"fieldName": "id"
@@ -282,7 +239,7 @@
282239
}
283240
}
284241
],
285-
"_nested_name": "display_group_9.loop_activities",
242+
"_nested_name": "display_group_6.loop_activities",
286243
"_dynamicFields": {
287244
"value": [
288245
{
@@ -322,8 +279,8 @@
322279
}
323280
}
324281
],
325-
"name": "display_group_9",
326-
"_nested_name": "display_group_9"
282+
"name": "display_group_6",
283+
"_nested_name": "display_group_6"
327284
},
328285
{
329286
"type": "video",

‎app_data/sheets/template/activity_library.json

+15-6
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,20 @@
857857
"args": [
858858
"open"
859859
],
860-
"_raw": "click | nav_stack: open | template: [email protected] , header: false",
861-
"_cleaned": "click | nav_stack: open | template: [email protected] , header: false",
860+
"_raw": "click | nav_stack: open | template: [email protected]",
861+
"_cleaned": "click | nav_stack: open | template: [email protected]",
862862
"params": {
863-
"template": "[email protected]",
864-
"header": false
863+
"template": "[email protected]"
864+
}
865+
},
866+
{
867+
"trigger": "click",
868+
"action_id": "set_item",
869+
"args": [],
870+
"_raw": "click | set_item | accessed: true",
871+
"_cleaned": "click | set_item | accessed: true",
872+
"params": {
873+
"accessed": true
865874
}
866875
}
867876
],
@@ -1069,15 +1078,15 @@
10691078
"0": {
10701079
"_raw": [
10711080
{
1072-
"fullExpression": "click | nav_stack: open | template: [email protected] , header: false",
1081+
"fullExpression": "click | nav_stack: open | template: [email protected]",
10731082
"matchedExpression": "@item.id",
10741083
"type": "item",
10751084
"fieldName": "id"
10761085
}
10771086
],
10781087
"_cleaned": [
10791088
{
1080-
"fullExpression": "click | nav_stack: open | template: [email protected] , header: false",
1089+
"fullExpression": "click | nav_stack: open | template: [email protected]",
10811090
"matchedExpression": "@item.id",
10821091
"type": "item",
10831092
"fieldName": "id"

‎app_data/sheets/template/hp_challenges.json

+33
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,39 @@
186186
"type": "set_variable",
187187
"_nested_name": "hp_challenge"
188188
},
189+
{
190+
"name": "row_id_hp_challenge",
191+
"value": "@[email protected]_challenge",
192+
"_translations": {
193+
"value": {}
194+
},
195+
"type": "set_variable",
196+
"_nested_name": "row_id_hp_challenge",
197+
"_dynamicFields": {
198+
"value": [
199+
{
200+
"fullExpression": "@[email protected]_challenge",
201+
"matchedExpression": "@local.row_id",
202+
"type": "local",
203+
"fieldName": "row_id"
204+
},
205+
{
206+
"fullExpression": "@[email protected]_challenge",
207+
"matchedExpression": "@local.hp_challenge",
208+
"type": "local",
209+
"fieldName": "hp_challenge"
210+
}
211+
]
212+
},
213+
"_dynamicDependencies": {
214+
"@local.row_id": [
215+
"value"
216+
],
217+
"@local.hp_challenge": [
218+
"value"
219+
]
220+
}
221+
},
189222
{
190223
"name": "top_text",
191224
"value": "@local.row_data.top_text",

‎app_data/sheets/template/unlock_play.json

+44-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,18 @@
192192
"params": {
193193
"template": "[email protected]_id"
194194
}
195+
},
196+
{
197+
"trigger": "click",
198+
"action_id": "set_data",
199+
"args": [],
200+
"_raw": "click | set_data | \n_list_id: activity_tasks,\n_id: @local.activity_id,\naccessed: true",
201+
"_cleaned": "click | set_data | \n_list_id: activity_tasks,\n_id: @local.activity_id,\naccessed: true",
202+
"params": {
203+
"_list_id": "activity_tasks",
204+
"_id": "@local.activity_id",
205+
"accessed": true
206+
}
195207
}
196208
],
197209
"exclude_from_translation": true,
@@ -233,6 +245,34 @@
233245
}
234246
]
235247
}
248+
},
249+
"2": {
250+
"_raw": [
251+
{
252+
"fullExpression": "click | set_data | \n_list_id: activity_tasks,\n_id: @local.activity_id,\naccessed: true",
253+
"matchedExpression": "@local.activity_id",
254+
"type": "local",
255+
"fieldName": "activity_id"
256+
}
257+
],
258+
"_cleaned": [
259+
{
260+
"fullExpression": "click | set_data | \n_list_id: activity_tasks,\n_id: @local.activity_id,\naccessed: true",
261+
"matchedExpression": "@local.activity_id",
262+
"type": "local",
263+
"fieldName": "activity_id"
264+
}
265+
],
266+
"params": {
267+
"_id": [
268+
{
269+
"fullExpression": "@local.activity_id",
270+
"matchedExpression": "@local.activity_id",
271+
"type": "local",
272+
"fieldName": "activity_id"
273+
}
274+
]
275+
}
236276
}
237277
}
238278
},
@@ -243,7 +283,10 @@
243283
"@local.activity_id": [
244284
"action_list.1._raw",
245285
"action_list.1._cleaned",
246-
"action_list.1.params.template"
286+
"action_list.1.params.template",
287+
"action_list.2._raw",
288+
"action_list.2._cleaned",
289+
"action_list.2.params._id"
247290
]
248291
}
249292
}

‎config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const config = extendDeploymentConfig({ name: "plh_kids_kw", parent: "plh_kids"
44

55
config.git = {
66
content_repo: "https://github.com/IDEMSInternational/plh-kids-app-kw-content.git",
7-
content_tag_latest: "1.2.8",
7+
content_tag_latest: "1.2.9",
88
};
99

1010
config.android = {

‎reports/summary.json

+13-14
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
{
3737
"type": "display_group",
38-
"count": 51
38+
"count": 50
3939
},
4040
{
4141
"type": "image",
@@ -91,7 +91,7 @@
9191
},
9292
{
9393
"type": "round_button",
94-
"count": 5
94+
"count": 4
9595
},
9696
{
9797
"type": "select_text",
@@ -103,7 +103,7 @@
103103
},
104104
{
105105
"type": "set_variable",
106-
"count": 1052
106+
"count": 1053
107107
},
108108
{
109109
"type": "simple_checkbox",
@@ -123,7 +123,7 @@
123123
},
124124
{
125125
"type": "text",
126-
"count": 74
126+
"count": 72
127127
},
128128
{
129129
"type": "text_area",
@@ -203,7 +203,7 @@
203203
},
204204
{
205205
"type": "nav_stack",
206-
"count": 80
206+
"count": 79
207207
},
208208
{
209209
"type": "pop_up",
@@ -215,15 +215,15 @@
215215
},
216216
{
217217
"type": "set_data",
218-
"count": 24
218+
"count": 25
219219
},
220220
{
221221
"type": "set_field",
222222
"count": 36
223223
},
224224
{
225225
"type": "set_item",
226-
"count": 24
226+
"count": 25
227227
},
228228
{
229229
"type": "set_local",
@@ -243,12 +243,12 @@
243243
"data": [
244244
{
245245
"assets": "total",
246-
"KB": "37271 KB",
246+
"KB": "37269 KB",
247247
"MB": "37.3 MB"
248248
},
249249
{
250250
"assets": "unused",
251-
"KB": "9583 KB",
251+
"KB": "9585 KB",
252252
"MB": "9.6 MB"
253253
}
254254
]
@@ -299,6 +299,10 @@
299299
"path": "images/icons/book_outline_white.svg",
300300
"size_kb": 0.7
301301
},
302+
{
303+
"path": "images/icons/cancel.svg",
304+
"size_kb": 1.7
305+
},
302306
{
303307
"path": "images/icons/diamond_blue.png",
304308
"size_kb": 4.7
@@ -870,11 +874,6 @@
870874
"count": 2,
871875
"size_kb": 5.2
872876
},
873-
{
874-
"path": "images/icons/cancel.svg",
875-
"count": 1,
876-
"size_kb": 1.7
877-
},
878877
{
879878
"path": "images/icons/clock_blue.png",
880879
"count": 6,

0 commit comments

Comments
 (0)