diff --git a/app_data/sheets/data_list/comp_map_layer_data.json b/app_data/sheets/data_list/comp_map_layer_data.json index 001f737..929e2ba 100644 --- a/app_data/sheets/data_list/comp_map_layer_data.json +++ b/app_data/sheets/data_list/comp_map_layer_data.json @@ -12,10 +12,10 @@ "property": "sum_Z", "scale_max": 2000000, "scale_min": 0, - "scale_fill": "#e7e1ef, #c994c7, #dd1c77", + "gradient_palette": "#e7e1ef, #c994c7, #dd1c77", "scale_title": "Total Population", "opacity": 0.8, - "visible_default": true + "visible_default": false }, { "id": "layer_2", @@ -26,7 +26,7 @@ "property": "mean_Z", "scale_max": 400, "scale_min": 0, - "scale_fill": "#380645, #298680, yellow", + "gradient_palette": "#380645, #298680, yellow", "scale_title": "Population Density (units)", "visible_default": true }, @@ -48,6 +48,9 @@ "type": "vector", "fill": "red", "stroke": "none", + "point_radius_max": 6, + "point_radius_property_max": 50, + "point_radius_property": "centroid_size_sum", "scale_title": "County Centroids", "opacity": 1, "visible_default": true @@ -59,15 +62,26 @@ "type": "vector", "fill": "blue", "stroke": "none", - "opacity": 1 + "point_radius_max": 10, + "point_radius_property_max": 1, + "point_radius_property": "any_riot_4w", + "opacity": 0.5, + "visible_default": false }, { "id": "layer_6", "name": "Conflict – Forecast", + "description": "Probability of conflict occuring in the next 4 weeks", "source_asset": "map_data/forecast_data_geojson.json", - "type": "vector", - "fill": "orange", - "stroke": "none", + "type": "heatmap", + "property": "pred_prob_any_riot_4w", + "point_radius_max": 14, + "blur": 8, + "scale_max": 1, + "scale_min": 0, + "scale_bins": "0, 0.15, 0.3, 0.4, 0.6, 0.7, 0.8, 1", + "gradient_palette": "#c4c4c4, #f0e0cc, #e5c9a9, #d29780, #c4665c, #bc3630, #9d222e, #740035", + "scale_title": "Conflict probability (next 4 weeks)", "opacity": 1 } ], diff --git a/app_data/sheets/template/component_demo/comp_audio.json b/app_data/sheets/template/component_demo/comp_audio.json index 84874df..0f24719 100644 --- a/app_data/sheets/template/component_demo/comp_audio.json +++ b/app_data/sheets/template/component_demo/comp_audio.json @@ -4,14 +4,25 @@ "status": "released", "flow_subtype": "component_demo", "rows": [ + { + "name": "audio_transcript", + "value": "This is an audio message in English.", + "_translations": { + "value": { + "es_sp": true + } + }, + "type": "set_variable", + "_nested_name": "audio_transcript" + }, { "type": "title", "value": "Audio component demo", "_translations": { "value": {} }, - "name": "title_2", - "_nested_name": "title_2" + "name": "title_3", + "_nested_name": "title_3" }, { "type": "title", @@ -19,8 +30,8 @@ "_translations": { "value": {} }, - "name": "title_3", - "_nested_name": "title_3" + "name": "title_4", + "_nested_name": "title_4" }, { "type": "text", @@ -28,8 +39,8 @@ "_translations": { "value": {} }, - "name": "text_4", - "_nested_name": "text_4" + "name": "text_5", + "_nested_name": "text_5" }, { "type": "audio", @@ -47,12 +58,51 @@ "_translations": { "value": {} }, - "name": "text_6", - "_nested_name": "text_6" + "name": "text_7", + "_nested_name": "text_7" }, { "type": "audio", "name": "audio_2", + "exclude_from_translation": true, + "parameter_list": { + "variant": "compact", + "title": "Audio player compact 2", + "src": "audio/test_audio.mp3", + "transcript_text": "@local.audio_transcript", + "play_icon_asset": "images/icons/audio/play-sharp.svg" + }, + "_nested_name": "audio_2", + "_dynamicFields": { + "parameter_list": { + "transcript_text": [ + { + "fullExpression": "@local.audio_transcript", + "matchedExpression": "@local.audio_transcript", + "type": "local", + "fieldName": "audio_transcript" + } + ] + } + }, + "_dynamicDependencies": { + "@local.audio_transcript": [ + "parameter_list.transcript_text" + ] + } + }, + { + "type": "text", + "value": "Transcript pop-up (alt implementation):", + "_translations": { + "value": {} + }, + "name": "text_9", + "_nested_name": "text_9" + }, + { + "type": "audio", + "name": "audio_3", "action_list": [ { "trigger": "info_click", @@ -72,7 +122,7 @@ "show_info_button": "true", "play_icon_asset": "images/icons/audio/play-sharp.svg" }, - "_nested_name": "audio_2" + "_nested_name": "audio_3" }, { "type": "text", @@ -80,14 +130,17 @@ "_translations": { "value": {} }, - "name": "text_8", - "_nested_name": "text_8" + "name": "text_11", + "_nested_name": "text_11" }, { "type": "audio", - "name": "audio_3", + "name": "audio_4", "exclude_from_translation": true, - "_nested_name": "audio_3" + "style_list": [ + "audio_3" + ], + "_nested_name": "audio_4" }, { "type": "title", @@ -95,8 +148,8 @@ "_translations": { "value": {} }, - "name": "title_10", - "_nested_name": "title_10" + "name": "title_13", + "_nested_name": "title_13" }, { "type": "text", @@ -104,12 +157,12 @@ "_translations": { "value": {} }, - "name": "text_11", - "_nested_name": "text_11" + "name": "text_14", + "_nested_name": "text_14" }, { "type": "audio", - "name": "audio_4", + "name": "audio_5", "value": "audio/test_audio.mp3", "_translations": { "value": {} @@ -120,11 +173,11 @@ "range_bar_disabled": "true", "time_to_skip": "0.5" }, - "_nested_name": "audio_4" + "_nested_name": "audio_5" }, { "type": "audio", - "name": "audio_5", + "name": "audio_6", "action_list": [ { "trigger": "info_click", @@ -148,7 +201,7 @@ "pause_icon_asset": "images/icons/audio/pause-sharp.svg", "forward_icon_asset": "images/icons/audio/play-forward-sharp.svg" }, - "_nested_name": "audio_5" + "_nested_name": "audio_6" } ], "_xlsxPath": "component_sheets/component_audio.xlsx" diff --git a/app_data/sheets/template/component_demo/comp_button.json b/app_data/sheets/template/component_demo/comp_button.json index 05a7668..84082b2 100644 --- a/app_data/sheets/template/component_demo/comp_button.json +++ b/app_data/sheets/template/component_demo/comp_button.json @@ -40,7 +40,7 @@ "value": {} }, "parameter_list": { - "style": "card" + "variant": "card" }, "name": "button_4", "_nested_name": "button_4" @@ -52,7 +52,7 @@ "value": {} }, "parameter_list": { - "style": "card", + "variant": "card", "icon": "images/icons/leaf_blue.svg" }, "name": "button_5", @@ -62,7 +62,7 @@ "type": "button", "value": "Icon and toggle", "parameter_list": { - "style": "card", + "variant": "card", "icon": "images/icons/school_blue.svg" }, "rows": [ diff --git a/app_data/sheets/template/component_demo/example_transcript.json b/app_data/sheets/template/component_demo/example_transcript.json index 5e80fff..c7bb51c 100644 --- a/app_data/sheets/template/component_demo/example_transcript.json +++ b/app_data/sheets/template/component_demo/example_transcript.json @@ -8,7 +8,9 @@ "type": "text", "value": "This is an audio message in English.", "_translations": { - "value": {} + "value": { + "es_sp": true + } }, "name": "text_2", "_nested_name": "text_2" diff --git a/app_data/translations/es_sp/strings.json b/app_data/translations/es_sp/strings.json index 7170ba0..b865e50 100644 --- a/app_data/translations/es_sp/strings.json +++ b/app_data/translations/es_sp/strings.json @@ -49,5 +49,6 @@ "@global.language_global_2: text": "@global.language_global_2: texto", "Text and @global.language_global_1": "Texto y @global.language_global_1", "activities": "actividades", - "Featured": "Destacado" + "Featured": "Destacado", + "This is an audio message in English.": "Este es un mensaje de audio en inglés." } \ No newline at end of file diff --git a/app_data/translations_source/translated_strings/translated.es_sp.json b/app_data/translations_source/translated_strings/translated.es_sp.json index d2aaadf..0b320e7 100644 --- a/app_data/translations_source/translated_strings/translated.es_sp.json +++ b/app_data/translations_source/translated_strings/translated.es_sp.json @@ -253,5 +253,10 @@ "SourceText": "Featured", "text": "Destacado", "type": "template" + }, + { + "SourceText": "This is an audio message in English.", + "text": "Este es un mensaje de audio en inglés.", + "type": "template" } ] \ No newline at end of file diff --git a/config.ts b/config.ts index 1ae7b52..b120af7 100644 --- a/config.ts +++ b/config.ts @@ -14,7 +14,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.47", + content_tag_latest: "1.2.48", }; config.app_config.ASSET_PACKS = { diff --git a/reports/summary.json b/reports/summary.json index de5c499..d1f2d53 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -18,7 +18,7 @@ }, { "type": "audio", - "count": 11 + "count": 12 }, { "type": "button", @@ -166,7 +166,7 @@ }, { "type": "set_variable", - "count": 507 + "count": 508 }, { "type": "simple_checkbox", @@ -198,7 +198,7 @@ }, { "type": "text", - "count": 638 + "count": 639 }, { "type": "text_area", @@ -520,7 +520,7 @@ }, { "path": "audio/test_audio.mp3", - "count": 6, + "count": 7, "size_kb": 43.4 }, { @@ -645,7 +645,7 @@ }, { "path": "images/icons/audio/play-sharp.svg", - "count": 3, + "count": 4, "size_kb": 0.1 }, { diff --git a/reports/summary.md b/reports/summary.md index b96fb12..e821b24 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -7,7 +7,7 @@ | advanced_dashed_box | 4 | | animated_section | 5 | | animated_slides | 1 | -| audio | 11 | +| audio | 12 | | button | 176 | | calendar | 1 | | carousel | 7 | @@ -44,7 +44,7 @@ | select_text | 5 | | set_default | 1 | | set_field | 26 | -| set_variable | 507 | +| set_variable | 508 | | simple_checkbox | 23 | | slider | 32 | | square_button | 8 | @@ -52,7 +52,7 @@ | task_card | 15 | | task_progress_bar | 2 | | template | 105 | -| text | 638 | +| text | 639 | | text_area | 5 | | text_box | 30 | | text_bubble | 7 | @@ -167,7 +167,7 @@ Assets that are used within sheets and also can be found in the synced asset dat | path | size_kb | count | | --- | --- | --- | | audio/baby_elephant_walk.wav | 430.7 | 3 | -| audio/test_audio.mp3 | 43.4 | 6 | +| audio/test_audio.mp3 | 43.4 | 7 | | audio/timer/bell_1.mp3 | 121.6 | 1 | | audio/timer/ping_1.wav | 196.4 | 1 | | audio/timer/ping_2.wav | 829.6 | 1 | @@ -192,7 +192,7 @@ Assets that are used within sheets and also can be found in the synced asset dat | images/icons/audio/pause-sharp.svg | 0.1 | 1 | | images/icons/audio/play-back-sharp.svg | 0.1 | 1 | | images/icons/audio/play-forward-sharp.svg | 0.1 | 1 | -| images/icons/audio/play-sharp.svg | 0.1 | 3 | +| images/icons/audio/play-sharp.svg | 0.1 | 4 | | images/icons/book_white.svg | 0.7 | 9 | | images/icons/globe_blue.svg | 3.9 | 13 | | images/icons/heart_blue.svg | 1.4 | 34 |