diff --git a/app_data/assets/android/icon-background.png b/app_data/assets/android/icon-background.png new file mode 100644 index 0000000..c06ae9c Binary files /dev/null and b/app_data/assets/android/icon-background.png differ diff --git a/app_data/assets/android/icon-foreground.png b/app_data/assets/android/icon-foreground.png new file mode 100644 index 0000000..acf7bce Binary files /dev/null and b/app_data/assets/android/icon-foreground.png differ diff --git a/app_data/assets/android/icon.png b/app_data/assets/android/icon.png new file mode 100644 index 0000000..0b59ba7 Binary files /dev/null and b/app_data/assets/android/icon.png differ diff --git a/app_data/assets/contents.json b/app_data/assets/contents.json index 1f9e14c..90356b6 100644 --- a/app_data/assets/contents.json +++ b/app_data/assets/contents.json @@ -1,4 +1,16 @@ { + "android/icon-background.png": { + "md5Checksum": "8711f369969c25216e0013c4010e0907", + "size_kb": 21.4 + }, + "android/icon-foreground.png": { + "md5Checksum": "8fa0416dee7554964c6c543c87c800c3", + "size_kb": 58.3 + }, + "android/icon.png": { + "md5Checksum": "8b06ee4d3e19163f9fc78e7d076611ef", + "size_kb": 67.4 + }, "audio/test_audio.mp3": { "md5Checksum": "5ddddf934d2187d084c75b7e27797fae", "size_kb": 43.4 diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index ffc51ed..8f545e4 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -215,7 +215,7 @@ "flow_type": "data_list", "flow_name": "debug_answer_list_partial_data", "data_list_name": "debug_answer_list_partial", - "_xlsxPath": "debug_sheets/debug_answer_list_partial.xlsx" + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" }, "debug_data_items_rendering_data": { "flow_type": "data_list", @@ -428,6 +428,11 @@ } }, "global": { + "app_globals": { + "flow_type": "global", + "flow_name": "app_globals", + "_xlsxPath": "feature_sheets/to_be_sorted/feature_dev_mode.xlsx" + }, "debug_full_stop_globals": { "flow_type": "global", "flow_name": "debug_full_stop_globals", @@ -485,6 +490,12 @@ "flow_name": "example_lang_global", "flow_subtype": "debug", "_xlsxPath": "example_sheets/to_be_sorted/example_languages.xlsx" + }, + "doc_global": { + "flow_type": "global", + "flow_name": "doc_global", + "override_target": "debug", + "_xlsxPath": "doc_sheets/doc_global.xlsx" } }, "template": { @@ -2537,7 +2548,7 @@ "debug_answer_list_partial": { "flow_type": "template", "flow_name": "debug_answer_list_partial", - "_xlsxPath": "debug_sheets/debug_answer_list_partial.xlsx" + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" }, "debug_app_update": { "flow_type": "template", @@ -2589,6 +2600,11 @@ "flow_name": "debug_hyperlinks", "_xlsxPath": "debug_sheets/debug_hyperlinks.xlsx" }, + "debug_list_parsing": { + "flow_type": "template", + "flow_name": "debug_list_parsing", + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" + }, "debug_long_link_dashed_box": { "flow_type": "template", "flow_name": "debug_long_link_dashed_box", @@ -2624,6 +2640,11 @@ "flow_name": "debug_sync_id", "_xlsxPath": "debug_sheets/debug_sync.xlsx" }, + "doc_field": { + "flow_type": "template", + "flow_name": "doc_field", + "_xlsxPath": "doc_sheets/doc_field.xlsx" + }, "doc_override_default": { "flow_type": "template", "flow_name": "doc_override_default", @@ -2639,6 +2660,11 @@ "override_condition": "@fields.doc_override_condition", "_xlsxPath": "doc_sheets/doc_override.xlsx" }, + "enter_dev_mode": { + "flow_type": "template", + "flow_name": "enter_dev_mode", + "_xlsxPath": "feature_sheets/to_be_sorted/feature_dev_mode.xlsx" + }, "example_generator_output_w_1": { "flow_name": "example_generator_output_w_1", "flow_subtype": "example_generator", @@ -2730,11 +2756,6 @@ "flow_type": "template", "flow_name": "nav_buttons", "_xlsxPath": "navigation.xlsx" - }, - "temp_data_items": { - "flow_type": "template", - "flow_name": "temp_data_items", - "_xlsxPath": "component_sheets/component_data_items.xlsx" } }, "tour": { diff --git a/app_data/sheets/data_list/debug_answer_list_partial_data.json b/app_data/sheets/data_list/debug_answer_list_partial_data.json index db69d27..ca5d3a1 100644 --- a/app_data/sheets/data_list/debug_answer_list_partial_data.json +++ b/app_data/sheets/data_list/debug_answer_list_partial_data.json @@ -21,5 +21,5 @@ "text": "Option 4 text" } ], - "_xlsxPath": "debug_sheets/debug_answer_list_partial.xlsx" + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" } \ No newline at end of file diff --git a/app_data/sheets/global/app_globals.json b/app_data/sheets/global/app_globals.json new file mode 100644 index 0000000..2f1ad30 --- /dev/null +++ b/app_data/sheets/global/app_globals.json @@ -0,0 +1,17 @@ +{ + "flow_type": "global", + "flow_name": "app_globals", + "status": "released", + "rows": [ + { + "type": "declare_global_constant", + "name": "dev_mode_code", + "value": "app_dev", + "_translations": { + "value": {} + }, + "exclude_from_translation": true + } + ], + "_xlsxPath": "feature_sheets/to_be_sorted/feature_dev_mode.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/global/doc_global.json b/app_data/sheets/global/doc_global.json new file mode 100644 index 0000000..50945bf --- /dev/null +++ b/app_data/sheets/global/doc_global.json @@ -0,0 +1,22 @@ +{ + "flow_type": "global", + "flow_name": "doc_global", + "status": "released", + "override_target": "debug", + "rows": [ + { + "type": "declare_global_constant", + "name": "doc_example_global", + "value": "Example global value", + "_translations": { + "value": {} + } + }, + { + "type": "declare_field_default", + "name": "doc_example_field", + "value": false + } + ], + "_xlsxPath": "doc_sheets/doc_global.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/component_demo/comp_data_items.json b/app_data/sheets/template/component_demo/comp_data_items.json index c608325..35987b4 100644 --- a/app_data/sheets/template/component_demo/comp_data_items.json +++ b/app_data/sheets/template/component_demo/comp_data_items.json @@ -33,7 +33,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.id_@item.id", + "_nested_name": "data_items_4.id_@item.id", "_dynamicFields": { "name": [ { @@ -53,7 +53,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_@item.id", + "fullExpression": "data_items_4.id_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -75,7 +75,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.text_completed_@item.id", + "_nested_name": "data_items_4.text_completed_@item.id", "_dynamicFields": { "name": [ { @@ -95,7 +95,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.text_completed_@item.id", + "fullExpression": "data_items_4.text_completed_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -131,7 +131,7 @@ } } ], - "_nested_name": "data_items.toggle_button_@item.id", + "_nested_name": "data_items_4.toggle_button_@item.id", "_dynamicFields": { "name": [ { @@ -173,7 +173,7 @@ }, "_nested_name": [ { - "fullExpression": "data_items.toggle_button_@item.id", + "fullExpression": "data_items_4.toggle_button_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -193,8 +193,8 @@ } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_4", + "_nested_name": "data_items_4", "_dynamicFields": { "value": [ { @@ -234,7 +234,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.id_@item.id", + "_nested_name": "data_items_7.id_@item.id", "_dynamicFields": { "name": [ { @@ -254,7 +254,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_@item.id", + "fullExpression": "data_items_7.id_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -276,7 +276,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.text_completed_@item.id", + "_nested_name": "data_items_7.text_completed_@item.id", "_dynamicFields": { "name": [ { @@ -296,7 +296,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.text_completed_@item.id", + "fullExpression": "data_items_7.text_completed_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -314,8 +314,8 @@ } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_7", + "_nested_name": "data_items_7", "_dynamicFields": { "parameter_list": { "filter": [ @@ -351,9 +351,10 @@ { "type": "button", "name": "data_list_set", - "value": [ - "Set data list" - ], + "value": "Set data list", + "_translations": { + "value": {} + }, "action_list": [ { "trigger": "click", @@ -387,9 +388,10 @@ { "type": "button", "name": "data_list_unset", - "value": [ - "Unset data list" - ], + "value": "Unset data list", + "_translations": { + "value": {} + }, "action_list": [ { "trigger": "click", @@ -434,7 +436,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.id_@item.id", + "_nested_name": "data_items_13.id_@item.id", "_dynamicFields": { "name": [ { @@ -454,7 +456,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_@item.id", + "fullExpression": "data_items_13.id_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -476,7 +478,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.text_completed_@item.id", + "_nested_name": "data_items_13.text_completed_@item.id", "_dynamicFields": { "name": [ { @@ -496,7 +498,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.text_completed_@item.id", + "fullExpression": "data_items_13.text_completed_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -514,8 +516,8 @@ } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_13", + "_nested_name": "data_items_13", "_dynamicFields": { "value": [ { @@ -580,7 +582,7 @@ } } ], - "_nested_name": "data_items.mark_uncompleted_button" + "_nested_name": "data_items_16.mark_uncompleted_button" }, { "type": "button", @@ -601,7 +603,7 @@ } } ], - "_nested_name": "data_items.toggle_all_button", + "_nested_name": "data_items_16.toggle_all_button", "_dynamicFields": { "action_list": { "0": { @@ -643,8 +645,8 @@ } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_16", + "_nested_name": "data_items_16", "_dynamicFields": { "value": [ { @@ -681,7 +683,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.id_@item.id", + "_nested_name": "data_items_19.id_@item.id", "_dynamicFields": { "name": [ { @@ -701,7 +703,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_@item.id", + "fullExpression": "data_items_19.id_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -723,7 +725,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.index_@item._index", + "_nested_name": "data_items_19.index_@item._index", "_dynamicFields": { "name": [ { @@ -743,7 +745,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.index_@item._index", + "fullExpression": "data_items_19.index_@item._index", "matchedExpression": "@item._index", "type": "item", "fieldName": "_index" @@ -765,7 +767,7 @@ "_translations": { "value": {} }, - "_nested_name": "data_items.text_completed_@item.id", + "_nested_name": "data_items_19.text_completed_@item.id", "_dynamicFields": { "name": [ { @@ -785,7 +787,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.text_completed_@item.id", + "fullExpression": "data_items_19.text_completed_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -822,7 +824,7 @@ } } ], - "_nested_name": "data_items.index_1_button_@item.id", + "_nested_name": "data_items_19.index_1_button_@item.id", "_dynamicFields": { "name": [ { @@ -834,7 +836,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.index_1_button_@item.id", + "fullExpression": "data_items_19.index_1_button_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -868,7 +870,7 @@ } } ], - "_nested_name": "data_items.index_plus_1_button_@item.id", + "_nested_name": "data_items_19.index_plus_1_button_@item.id", "_dynamicFields": { "name": [ { @@ -910,7 +912,7 @@ }, "_nested_name": [ { - "fullExpression": "data_items.index_plus_1_button_@item.id", + "fullExpression": "data_items_19.index_plus_1_button_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -949,7 +951,7 @@ } } ], - "_nested_name": "data_items.id_button_@item.id", + "_nested_name": "data_items_19.id_button_@item.id", "_dynamicFields": { "name": [ { @@ -961,7 +963,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_button_@item.id", + "fullExpression": "data_items_19.id_button_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -995,7 +997,7 @@ } } ], - "_nested_name": "data_items.id_button_@item.id", + "_nested_name": "data_items_19.id_button_@item.id", "_dynamicFields": { "name": [ { @@ -1007,7 +1009,7 @@ ], "_nested_name": [ { - "fullExpression": "data_items.id_button_@item.id", + "fullExpression": "data_items_19.id_button_@item.id", "matchedExpression": "@item.id", "type": "item", "fieldName": "id" @@ -1022,8 +1024,8 @@ } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_19", + "_nested_name": "data_items_19", "_dynamicFields": { "value": [ { @@ -1049,6 +1051,15 @@ }, "_nested_name": "example_5" }, + { + "type": "title", + "value": "Completed", + "_translations": { + "value": {} + }, + "name": "title_22", + "_nested_name": "title_22" + }, { "type": "data_items", "value": "@data.comp_data_items_list", @@ -1065,8 +1076,8 @@ "_translations": { "value": {} }, - "name": "text", - "_nested_name": "data_items.display_group.text", + "name": "text_1", + "_nested_name": "data_items_23.display_group_1.text_1", "_dynamicFields": { "value": [ { @@ -1089,8 +1100,8 @@ "_translations": { "value": {} }, - "name": "text", - "_nested_name": "data_items.display_group.text", + "name": "text_2", + "_nested_name": "data_items_23.display_group_1.text_2", "_dynamicFields": { "value": [ { @@ -1113,8 +1124,8 @@ "_translations": { "value": {} }, - "name": "text", - "_nested_name": "data_items.display_group.text", + "name": "text_3", + "_nested_name": "data_items_23.display_group_1.text_3", "_dynamicFields": { "value": [ { @@ -1137,8 +1148,8 @@ "_translations": { "value": {} }, - "name": "text", - "_nested_name": "data_items.display_group.text", + "name": "text_4", + "_nested_name": "data_items_23.display_group_1.text_4", "_dynamicFields": { "value": [ { @@ -1154,23 +1165,98 @@ "value" ] } + }, + { + "type": "text", + "value": "completed: @item.completed", + "_translations": { + "value": {} + }, + "name": "text_5", + "_nested_name": "data_items_23.display_group_1.text_5", + "_dynamicFields": { + "value": [ + { + "fullExpression": "completed: @item.completed", + "matchedExpression": "@item.completed", + "type": "item", + "fieldName": "completed" + } + ] + }, + "_dynamicDependencies": { + "@item.completed": [ + "value" + ] + } } ], - "name": "display_group", - "_nested_name": "data_items.display_group" + "name": "display_group_1", + "_nested_name": "data_items_23.display_group_1" }, { - "type": "text", - "value": "Static row", + "type": "button", + "value": "Toggle Item Completed", "_translations": { "value": {} }, - "name": "text", - "_nested_name": "data_items.text" + "action_list": [ + { + "trigger": "click", + "action_id": "set_item", + "args": [], + "_raw": "click | set_item | completed: !@item.completed", + "_cleaned": "click | set_item | completed: !@item.completed", + "params": { + "completed": "!@item.completed" + } + } + ], + "name": "button_2", + "_nested_name": "data_items_23.button_2", + "_dynamicFields": { + "action_list": { + "0": { + "_raw": [ + { + "fullExpression": "click | set_item | completed: !@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_item | completed: !@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ], + "params": { + "completed": [ + { + "fullExpression": "!@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ] + } + } + } + }, + "_dynamicDependencies": { + "!@item.completed": [ + "action_list.0._raw", + "action_list.0._cleaned", + "action_list.0.params.completed" + ] + } } ], - "name": "data_items", - "_nested_name": "data_items", + "name": "data_items_23", + "_nested_name": "data_items_23", "_dynamicFields": { "value": [ { @@ -1199,6 +1285,226 @@ "parameter_list.filter" ] } + }, + { + "type": "title", + "value": "Not Completed", + "_translations": { + "value": {} + }, + "name": "title_25", + "_nested_name": "title_25" + }, + { + "type": "data_items", + "value": "@data.comp_data_items_list", + "parameter_list": {}, + "rows": [ + { + "type": "display_group", + "rows": [ + { + "type": "text", + "value": "_index: @item._index", + "_translations": { + "value": {} + }, + "name": "text_1", + "_nested_name": "data_items_26.display_group_1.text_1", + "_dynamicFields": { + "value": [ + { + "fullExpression": "_index: @item._index", + "matchedExpression": "@item._index", + "type": "item", + "fieldName": "_index" + } + ] + }, + "_dynamicDependencies": { + "@item._index": [ + "value" + ] + } + }, + { + "type": "text", + "value": "_id: @item._id", + "_translations": { + "value": {} + }, + "name": "text_2", + "_nested_name": "data_items_26.display_group_1.text_2", + "_dynamicFields": { + "value": [ + { + "fullExpression": "_id: @item._id", + "matchedExpression": "@item._id", + "type": "item", + "fieldName": "_id" + } + ] + }, + "_dynamicDependencies": { + "@item._id": [ + "value" + ] + } + }, + { + "type": "text", + "value": "_first: @item._first", + "_translations": { + "value": {} + }, + "name": "text_3", + "_nested_name": "data_items_26.display_group_1.text_3", + "_dynamicFields": { + "value": [ + { + "fullExpression": "_first: @item._first", + "matchedExpression": "@item._first", + "type": "item", + "fieldName": "_first" + } + ] + }, + "_dynamicDependencies": { + "@item._first": [ + "value" + ] + } + }, + { + "type": "text", + "value": "_last: @item._last", + "_translations": { + "value": {} + }, + "name": "text_4", + "_nested_name": "data_items_26.display_group_1.text_4", + "_dynamicFields": { + "value": [ + { + "fullExpression": "_last: @item._last", + "matchedExpression": "@item._last", + "type": "item", + "fieldName": "_last" + } + ] + }, + "_dynamicDependencies": { + "@item._last": [ + "value" + ] + } + }, + { + "type": "text", + "value": "completed: @item.completed", + "_translations": { + "value": {} + }, + "name": "text_5", + "_nested_name": "data_items_26.display_group_1.text_5", + "_dynamicFields": { + "value": [ + { + "fullExpression": "completed: @item.completed", + "matchedExpression": "@item.completed", + "type": "item", + "fieldName": "completed" + } + ] + }, + "_dynamicDependencies": { + "@item.completed": [ + "value" + ] + } + } + ], + "name": "display_group_1", + "_nested_name": "data_items_26.display_group_1" + }, + { + "type": "button", + "value": "Toggle Item Completed", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_item", + "args": [], + "_raw": "click | set_item | completed: !@item.completed", + "_cleaned": "click | set_item | completed: !@item.completed", + "params": { + "completed": "!@item.completed" + } + } + ], + "name": "button_2", + "_nested_name": "data_items_26.button_2", + "_dynamicFields": { + "action_list": { + "0": { + "_raw": [ + { + "fullExpression": "click | set_item | completed: !@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_item | completed: !@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ], + "params": { + "completed": [ + { + "fullExpression": "!@item.completed", + "matchedExpression": "!@item.completed", + "type": "item", + "fieldName": "completed" + } + ] + } + } + } + }, + "_dynamicDependencies": { + "!@item.completed": [ + "action_list.0._raw", + "action_list.0._cleaned", + "action_list.0.params.completed" + ] + } + } + ], + "name": "data_items_26", + "_nested_name": "data_items_26", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@data.comp_data_items_list", + "matchedExpression": "@data.comp_data_items_list", + "type": "data", + "fieldName": "comp_data_items_list" + } + ] + }, + "_dynamicDependencies": { + "@data.comp_data_items_list": [ + "value" + ] + } } ], "_xlsxPath": "component_sheets/component_data_items.xlsx" diff --git a/app_data/sheets/template/debug/example_google_auth.json b/app_data/sheets/template/debug/example_google_auth.json index ebb979f..de6eb9b 100644 --- a/app_data/sheets/template/debug/example_google_auth.json +++ b/app_data/sheets/template/debug/example_google_auth.json @@ -32,13 +32,35 @@ "action_list": [ { "trigger": "click", - "action_id": "google_auth", - "args": [], - "_raw": "click | google_auth", - "_cleaned": "click | google_auth" + "action_id": "auth", + "args": [ + "sign_in_google" + ], + "_raw": "click | auth: sign_in_google", + "_cleaned": "click | auth: sign_in_google" } ], "_nested_name": "sign_in" + }, + { + "type": "button", + "name": "sign_out", + "value": "Sign out", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "auth", + "args": [ + "sign_out" + ], + "_raw": "click | auth: sign_out", + "_cleaned": "click | auth: sign_out" + } + ], + "_nested_name": "sign_out" } ], "_xlsxPath": "example_sheets/example_google_auth.xlsx" diff --git a/app_data/sheets/template/debug/feature_display_group.json b/app_data/sheets/template/debug/feature_display_group.json index 7fa8fb3..0b5d945 100644 --- a/app_data/sheets/template/debug/feature_display_group.json +++ b/app_data/sheets/template/debug/feature_display_group.json @@ -19,8 +19,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "dg_variant_gray.title" + "name": "title_1", + "_nested_name": "dg_variant_gray.title_1" } ], "_nested_name": "dg_variant_gray" @@ -40,8 +40,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "dg_variant_primary.title" + "name": "title_1", + "_nested_name": "dg_variant_primary.title_1" } ], "_nested_name": "dg_variant_primary" @@ -61,8 +61,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "dg_variant_secondary.title" + "name": "title_1", + "_nested_name": "dg_variant_secondary.title_1" } ], "_nested_name": "dg_variant_secondary" @@ -570,8 +570,8 @@ "parameter_list": { "style": "right" }, - "name": "subtitle", - "_nested_name": "dg_example_dashed_box.subtitle" + "name": "subtitle_1", + "_nested_name": "dg_example_dashed_box.subtitle_1" }, { "type": "parent_point_box", @@ -604,8 +604,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "title" + "name": "title_36", + "_nested_name": "title_36" }, { "type": "display_group", @@ -705,8 +705,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "dg_example_form.title" + "name": "title_5", + "_nested_name": "dg_example_form.title_5" }, { "type": "text_area", @@ -727,8 +727,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "title" + "name": "title_39", + "_nested_name": "title_39" }, { "type": "display_group", @@ -828,8 +828,8 @@ "value": {} }, "exclude_from_translation": true, - "name": "title", - "_nested_name": "dg_example_form.title" + "name": "title_5", + "_nested_name": "dg_example_form.title_5" }, { "type": "text_area", diff --git a/app_data/sheets/template/debug_answer_list_partial.json b/app_data/sheets/template/debug_answer_list_partial.json index e5168cd..434e125 100644 --- a/app_data/sheets/template/debug_answer_list_partial.json +++ b/app_data/sheets/template/debug_answer_list_partial.json @@ -229,5 +229,5 @@ } } ], - "_xlsxPath": "debug_sheets/debug_answer_list_partial.xlsx" + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" } \ No newline at end of file diff --git a/app_data/sheets/template/debug_list_parsing.json b/app_data/sheets/template/debug_list_parsing.json new file mode 100644 index 0000000..b7af4a8 --- /dev/null +++ b/app_data/sheets/template/debug_list_parsing.json @@ -0,0 +1,68 @@ +{ + "flow_type": "template", + "flow_name": "debug_list_parsing", + "status": "released", + "rows": [ + { + "text": "answer_list_1", + "image_asset": "name:option_1 | text: option_1_text; \nname:option_2 | text: option_2_text;\nname:option_3 | text: option_3_text;\nname:option_4 | text: option_4_text;\nname:option_5 | text: option_5_text;\nname:option_6 | text: option_6_text", + "type": "set_variable", + "name": "set_variable", + "_nested_name": "set_variable" + }, + { + "text": "answer_1_list", + "image_asset": "name:option_1 | text: option_1_text; \nname:option_2 | text: option_2_text;\nname:option_3 | text: option_3_text;\nname:option_4 | text: option_4_text;\nname:option_5 | text: option_5_text;\nname:option_6 | text: option_6_text", + "type": "set_variable", + "name": "set_variable", + "_nested_name": "set_variable" + }, + { + "id": "text", + "text": "show_answer_list_1", + "image_asset": "answer_list_1: @local.answer_list_1", + "type": "set_variable", + "name": "set_variable", + "_nested_name": "set_variable", + "_dynamicFields": { + "image_asset": [ + { + "fullExpression": "answer_list_1: @local.answer_list_1", + "matchedExpression": "@local.answer_list_1", + "type": "local", + "fieldName": "answer_list_1" + } + ] + }, + "_dynamicDependencies": { + "@local.answer_list_1": [ + "image_asset" + ] + } + }, + { + "id": "text", + "text": "show_answer_1_list", + "image_asset": "answer_1_list: @local.answer_1_list", + "type": "set_variable", + "name": "set_variable", + "_nested_name": "set_variable", + "_dynamicFields": { + "image_asset": [ + { + "fullExpression": "answer_1_list: @local.answer_1_list", + "matchedExpression": "@local.answer_1_list", + "type": "local", + "fieldName": "answer_1_list" + } + ] + }, + "_dynamicDependencies": { + "@local.answer_1_list": [ + "image_asset" + ] + } + } + ], + "_xlsxPath": "debug_sheets/debug_answer_list.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/doc_field.json b/app_data/sheets/template/doc_field.json new file mode 100644 index 0000000..e6d638c --- /dev/null +++ b/app_data/sheets/template/doc_field.json @@ -0,0 +1,83 @@ +{ + "flow_type": "template", + "flow_name": "doc_field", + "status": "released", + "rows": [ + { + "type": "title", + "value": "Setting a field", + "_translations": { + "value": {} + }, + "name": "title", + "_nested_name": "title" + }, + { + "type": "text", + "value": "Value of doc_example_field: @field.doc_example_field", + "_translations": { + "value": {} + }, + "name": "text", + "_nested_name": "text", + "_dynamicFields": { + "value": [ + { + "fullExpression": "Value of doc_example_field: @field.doc_example_field", + "matchedExpression": "@field.doc_example_field", + "type": "field", + "fieldName": "doc_example_field" + } + ] + }, + "_dynamicDependencies": { + "@field.doc_example_field": [ + "value" + ] + } + }, + { + "type": "button", + "value": "Set field to true", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "doc_example_field", + true + ], + "_raw": "click | set_field: doc_example_field: true", + "_cleaned": "click | set_field: doc_example_field: true" + } + ], + "name": "button", + "_nested_name": "button" + }, + { + "type": "button", + "value": "Set field to false", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "doc_example_field", + false + ], + "_raw": "click | set_field: doc_example_field: false", + "_cleaned": "click | set_field: doc_example_field: false" + } + ], + "name": "button", + "_nested_name": "button" + } + ], + "_xlsxPath": "doc_sheets/doc_field.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/enter_dev_mode.json b/app_data/sheets/template/enter_dev_mode.json new file mode 100644 index 0000000..1cc6307 --- /dev/null +++ b/app_data/sheets/template/enter_dev_mode.json @@ -0,0 +1,335 @@ +{ + "flow_type": "template", + "flow_name": "enter_dev_mode", + "status": "released", + "rows": [ + { + "name": "submit", + "value": "Submit", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "submit" + }, + { + "name": "text_box_placeholder", + "value": "Tap and type", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "type": "set_variable", + "_nested_name": "text_box_placeholder" + }, + { + "name": "reply_entered", + "value": false, + "type": "set_variable", + "_nested_name": "reply_entered" + }, + { + "type": "title", + "name": "title", + "value": "Enter developer mode", + "_translations": { + "value": {} + }, + "_nested_name": "title" + }, + { + "type": "text", + "name": "text_1", + "value": "To launch the app in developer mode, enter your developer code in the box below and press @local.submit.", + "_translations": { + "value": {} + }, + "_nested_name": "text_1", + "_dynamicFields": { + "value": [ + { + "fullExpression": "To launch the app in developer mode, enter your developer code in the box below and press @local.submit.", + "matchedExpression": "@local.submit", + "type": "local", + "fieldName": "submit" + } + ] + }, + "_dynamicDependencies": { + "@local.submit": [ + "value" + ] + } + }, + { + "type": "text_box", + "name": "text_box", + "exclude_from_translation": true, + "parameter_list": { + "placeholder": "@local.text_box_placeholder" + }, + "_nested_name": "text_box", + "_dynamicFields": { + "parameter_list": { + "placeholder": [ + { + "fullExpression": "@local.text_box_placeholder", + "matchedExpression": "@local.text_box_placeholder", + "type": "local", + "fieldName": "text_box_placeholder" + } + ] + } + }, + "_dynamicDependencies": { + "@local.text_box_placeholder": [ + "parameter_list.placeholder" + ] + } + }, + { + "type": "button", + "name": "button_incorrect_code", + "value": "@local.submit", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_local", + "args": [ + "reply_entered", + true + ], + "_raw": "click | set_local:reply_entered:true", + "_cleaned": "click | set_local:reply_entered:true" + } + ], + "hidden": "@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code", + "exclude_from_translation": true, + "_nested_name": "button_incorrect_code", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.submit", + "matchedExpression": "@local.submit", + "type": "local", + "fieldName": "submit" + } + ], + "hidden": [ + { + "fullExpression": "@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code", + "matchedExpression": "@local.text_box", + "type": "local", + "fieldName": "text_box" + }, + { + "fullExpression": "@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code", + "matchedExpression": "@global.dev_mode_code", + "type": "global", + "fieldName": "dev_mode_code" + }, + { + "fullExpression": "@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code", + "matchedExpression": "@local.text_box", + "type": "local", + "fieldName": "text_box" + }, + { + "fullExpression": "@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code", + "matchedExpression": "@global.test_mode_code", + "type": "global", + "fieldName": "test_mode_code" + } + ] + }, + "_dynamicDependencies": { + "@local.submit": [ + "value" + ], + "@local.text_box": [ + "hidden", + "hidden" + ], + "@global.dev_mode_code": [ + "hidden" + ], + "@global.test_mode_code": [ + "hidden" + ] + } + }, + { + "type": "button", + "name": "button_correct_code", + "value": "@local.submit", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_local", + "args": [ + "reply_entered", + true + ], + "_raw": "click | set_local:reply_entered:true", + "_cleaned": "click | set_local:reply_entered:true" + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "user_mode", + false + ], + "_raw": "click | set_field:user_mode:false", + "_cleaned": "click | set_field:user_mode:false" + }, + { + "trigger": "click", + "action_id": "emit", + "args": [ + "force_restart" + ], + "_raw": "click | emit:force_restart", + "_cleaned": "click | emit:force_restart" + } + ], + "hidden": "!(@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code)", + "exclude_from_translation": true, + "_nested_name": "button_correct_code", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.submit", + "matchedExpression": "@local.submit", + "type": "local", + "fieldName": "submit" + } + ], + "hidden": [ + { + "fullExpression": "!(@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code)", + "matchedExpression": "@local.text_box", + "type": "local", + "fieldName": "text_box" + }, + { + "fullExpression": "!(@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code)", + "matchedExpression": "@global.dev_mode_code", + "type": "global", + "fieldName": "dev_mode_code" + }, + { + "fullExpression": "!(@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code)", + "matchedExpression": "@local.text_box", + "type": "local", + "fieldName": "text_box" + }, + { + "fullExpression": "!(@local.text_box == @global.dev_mode_code || @local.text_box == @global.test_mode_code)", + "matchedExpression": "@global.test_mode_code", + "type": "global", + "fieldName": "test_mode_code" + } + ] + }, + "_dynamicDependencies": { + "@local.submit": [ + "value" + ], + "@local.text_box": [ + "hidden", + "hidden" + ], + "@global.dev_mode_code": [ + "hidden" + ], + "@global.test_mode_code": [ + "hidden" + ] + } + }, + { + "type": "display_group", + "name": "enter_replies", + "hidden": "!@local.reply_entered", + "parameter_list": { + "style": "column" + }, + "rows": [ + { + "type": "text", + "name": "text_2", + "value": "You have successfully entered developer mode.", + "_translations": { + "value": {} + }, + "hidden": "@fields.user_mode", + "_nested_name": "enter_replies.text_2", + "_dynamicFields": { + "hidden": [ + { + "fullExpression": "@fields.user_mode", + "matchedExpression": "@fields.user_mode", + "type": "fields", + "fieldName": "user_mode" + } + ] + }, + "_dynamicDependencies": { + "@fields.user_mode": [ + "hidden" + ] + } + }, + { + "type": "text", + "name": "text_3", + "value": "You have entered an incorrect code.", + "_translations": { + "value": {} + }, + "hidden": "!@fields.user_mode", + "_nested_name": "enter_replies.text_3", + "_dynamicFields": { + "hidden": [ + { + "fullExpression": "!@fields.user_mode", + "matchedExpression": "!@fields.user_mode", + "type": "fields", + "fieldName": "user_mode" + } + ] + }, + "_dynamicDependencies": { + "!@fields.user_mode": [ + "hidden" + ] + } + } + ], + "_nested_name": "enter_replies", + "_dynamicFields": { + "hidden": [ + { + "fullExpression": "!@local.reply_entered", + "matchedExpression": "!@local.reply_entered", + "type": "local", + "fieldName": "reply_entered" + } + ] + }, + "_dynamicDependencies": { + "!@local.reply_entered": [ + "hidden" + ] + } + } + ], + "_xlsxPath": "feature_sheets/to_be_sorted/feature_dev_mode.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/temp_data_items.json b/app_data/sheets/template/temp_data_items.json deleted file mode 100644 index e04dad8..0000000 --- a/app_data/sheets/template/temp_data_items.json +++ /dev/null @@ -1,487 +0,0 @@ -{ - "flow_type": "template", - "flow_name": "temp_data_items", - "status": "released", - "rows": [ - { - "type": "title", - "name": "example_5", - "value": "Example 5: Item readonly data", - "_translations": { - "value": {} - }, - "_nested_name": "example_5" - }, - { - "type": "title", - "value": "Completed", - "_translations": { - "value": {} - }, - "name": "title", - "_nested_name": "title" - }, - { - "type": "data_items", - "value": "@data.comp_data_items_list", - "parameter_list": { - "filter": "@item.completed" - }, - "rows": [ - { - "type": "display_group", - "rows": [ - { - "type": "text", - "value": "_index: @item._index", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_index: @item._index", - "matchedExpression": "@item._index", - "type": "item", - "fieldName": "_index" - } - ] - }, - "_dynamicDependencies": { - "@item._index": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_id: @item._id", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_id: @item._id", - "matchedExpression": "@item._id", - "type": "item", - "fieldName": "_id" - } - ] - }, - "_dynamicDependencies": { - "@item._id": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_first: @item._first", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_first: @item._first", - "matchedExpression": "@item._first", - "type": "item", - "fieldName": "_first" - } - ] - }, - "_dynamicDependencies": { - "@item._first": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_last: @item._last", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_last: @item._last", - "matchedExpression": "@item._last", - "type": "item", - "fieldName": "_last" - } - ] - }, - "_dynamicDependencies": { - "@item._last": [ - "value" - ] - } - }, - { - "type": "text", - "value": "completed: @item.completed", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "completed: @item.completed", - "matchedExpression": "@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - }, - "_dynamicDependencies": { - "@item.completed": [ - "value" - ] - } - } - ], - "name": "display_group", - "_nested_name": "data_items.display_group" - }, - { - "type": "button", - "value": "Toggle Item Completed", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_item", - "args": [], - "_raw": "click | set_item | completed: !@item.completed", - "_cleaned": "click | set_item | completed: !@item.completed", - "params": { - "completed": "!@item.completed" - } - } - ], - "name": "button", - "_nested_name": "data_items.button", - "_dynamicFields": { - "action_list": { - "0": { - "_raw": [ - { - "fullExpression": "click | set_item | completed: !@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ], - "_cleaned": [ - { - "fullExpression": "click | set_item | completed: !@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ], - "params": { - "completed": [ - { - "fullExpression": "!@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - } - } - } - }, - "_dynamicDependencies": { - "!@item.completed": [ - "action_list.0._raw", - "action_list.0._cleaned", - "action_list.0.params.completed" - ] - } - } - ], - "name": "data_items", - "_nested_name": "data_items", - "_dynamicFields": { - "value": [ - { - "fullExpression": "@data.comp_data_items_list", - "matchedExpression": "@data.comp_data_items_list", - "type": "data", - "fieldName": "comp_data_items_list" - } - ], - "parameter_list": { - "filter": [ - { - "fullExpression": "@item.completed", - "matchedExpression": "@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - } - }, - "_dynamicDependencies": { - "@data.comp_data_items_list": [ - "value" - ], - "@item.completed": [ - "parameter_list.filter" - ] - } - }, - { - "type": "title", - "value": "Not Completed", - "_translations": { - "value": {} - }, - "name": "title", - "_nested_name": "title" - }, - { - "type": "data_items", - "value": "@data.comp_data_items_list", - "parameter_list": { - "filter": "!@item.completed" - }, - "rows": [ - { - "type": "display_group", - "rows": [ - { - "type": "text", - "value": "_index: @item._index", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_index: @item._index", - "matchedExpression": "@item._index", - "type": "item", - "fieldName": "_index" - } - ] - }, - "_dynamicDependencies": { - "@item._index": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_id: @item._id", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_id: @item._id", - "matchedExpression": "@item._id", - "type": "item", - "fieldName": "_id" - } - ] - }, - "_dynamicDependencies": { - "@item._id": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_first: @item._first", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_first: @item._first", - "matchedExpression": "@item._first", - "type": "item", - "fieldName": "_first" - } - ] - }, - "_dynamicDependencies": { - "@item._first": [ - "value" - ] - } - }, - { - "type": "text", - "value": "_last: @item._last", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "_last: @item._last", - "matchedExpression": "@item._last", - "type": "item", - "fieldName": "_last" - } - ] - }, - "_dynamicDependencies": { - "@item._last": [ - "value" - ] - } - }, - { - "type": "text", - "value": "completed: @item.completed", - "_translations": { - "value": {} - }, - "name": "text", - "_nested_name": "data_items.display_group.text", - "_dynamicFields": { - "value": [ - { - "fullExpression": "completed: @item.completed", - "matchedExpression": "@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - }, - "_dynamicDependencies": { - "@item.completed": [ - "value" - ] - } - } - ], - "name": "display_group", - "_nested_name": "data_items.display_group" - }, - { - "type": "button", - "value": "Toggle Item Completed", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_item", - "args": [], - "_raw": "click | set_item | completed: !@item.completed", - "_cleaned": "click | set_item | completed: !@item.completed", - "params": { - "completed": "!@item.completed" - } - } - ], - "name": "button", - "_nested_name": "data_items.button", - "_dynamicFields": { - "action_list": { - "0": { - "_raw": [ - { - "fullExpression": "click | set_item | completed: !@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ], - "_cleaned": [ - { - "fullExpression": "click | set_item | completed: !@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ], - "params": { - "completed": [ - { - "fullExpression": "!@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - } - } - } - }, - "_dynamicDependencies": { - "!@item.completed": [ - "action_list.0._raw", - "action_list.0._cleaned", - "action_list.0.params.completed" - ] - } - } - ], - "name": "data_items", - "_nested_name": "data_items", - "_dynamicFields": { - "value": [ - { - "fullExpression": "@data.comp_data_items_list", - "matchedExpression": "@data.comp_data_items_list", - "type": "data", - "fieldName": "comp_data_items_list" - } - ], - "parameter_list": { - "filter": [ - { - "fullExpression": "!@item.completed", - "matchedExpression": "!@item.completed", - "type": "item", - "fieldName": "completed" - } - ] - } - }, - "_dynamicDependencies": { - "@data.comp_data_items_list": [ - "value" - ], - "!@item.completed": [ - "parameter_list.filter" - ] - } - } - ], - "_xlsxPath": "component_sheets/component_data_items.xlsx" -} \ No newline at end of file diff --git a/config.ts b/config.ts index 967272d..8e450b7 100644 --- a/config.ts +++ b/config.ts @@ -15,7 +15,7 @@ config.web.favicon_asset = "images/icons/favicon.svg"; config.git = { content_repo: "https://github.com/IDEMSInternational/app-debug-content.git", - content_tag_latest: "1.2.11", + content_tag_latest: "1.2.12", }; config.app_data.output_path = "./app_data";