Skip to content

Commit

Permalink
Merge pull request #108 from IDEMSInternational/content/1.2.53
Browse files Browse the repository at this point in the history
content: 1.2.53
  • Loading branch information
esmeetewinkel authored Nov 4, 2024
2 parents b42fcf7 + 86534b6 commit 6f6f1cc
Show file tree
Hide file tree
Showing 13 changed files with 217 additions and 27 deletions.
4 changes: 4 additions & 0 deletions app_data/assets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@
"md5Checksum": "9c8109ef8e302cad49ecd2bb184908b3",
"size_kb": 133.5
},
"map_data/forecast_riots.json": {
"md5Checksum": "4ced38fc0e746d7279859f1e4341b55d",
"size_kb": 48.6
},
"map_data/ke.json": {
"md5Checksum": "9a887a75373ec2e4bef94070ca0597f1",
"size_kb": 10219.4
Expand Down
1 change: 1 addition & 0 deletions app_data/assets/map_data/forecast_riots.json

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions app_data/sheets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2956,6 +2956,19 @@
"flow_name": "feature_home",
"_xlsxPath": "feature_sheets/to_be_sorted/feature_template_components.xlsx"
},
"feature_landscape_mode_false": {
"flow_type": "template",
"flow_name": "feature_landscape_mode_false",
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
},
"feature_landscape_mode_true": {
"flow_type": "template",
"flow_name": "feature_landscape_mode_true",
"parameter_list": {
"landscape": true
},
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
},
"feature_lottie": {
"flow_type": "template",
"flow_name": "feature_lottie",
Expand Down Expand Up @@ -2991,6 +3004,11 @@
"flow_name": "feature_save_open_file",
"_xlsxPath": "feature_sheets/to_be_sorted/feature_save_open_file.xlsx"
},
"feature_screen_orientation": {
"flow_type": "template",
"flow_name": "feature_screen_orientation",
"_xlsxPath": "feature_sheets/feature_screen_orientation.xlsx"
},
"feature_set_theme": {
"flow_type": "template",
"flow_name": "feature_set_theme",
Expand Down
24 changes: 20 additions & 4 deletions app_data/sheets/data_list/comp_map_layer_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"property": "sum_Z",
"scale_max": 2000000,
"scale_min": 0,
"gradient_palette": "#e7e1ef, #c994c7, #dd1c77",
"scale_title": "Total Population",
"gradient_palette": "#e7e1ef, #c994c7, #dd1c77",
"opacity": 0.8,
"visible_default": false
},
Expand All @@ -26,8 +26,8 @@
"property": "mean_Z",
"scale_max": 400,
"scale_min": 0,
"gradient_palette": "#380645, #298680, yellow",
"scale_title": "Population Density (units)",
"gradient_palette": "#380645, #298680, yellow",
"visible_default": true
},
{
Expand Down Expand Up @@ -80,9 +80,25 @@
"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
"gradient_palette": "#c4c4c4, #f0e0cc, #e5c9a9, #d29780, #c4665c, #bc3630, #9d222e, #740035",
"opacity": 1,
"visible_default": false
},
{
"id": "layer_7",
"name": "Riots Forecast",
"description": "Next 4 weeks",
"source_asset": "map_data/forecast_riots.json",
"type": "vector",
"stroke": "none",
"property": "prob_bin",
"scale_max": 8,
"scale_min": 1,
"scale_title": "Riots risks level",
"scale_slider": true,
"gradient_palette": "#fcf8f3, #f0e0cc, #e5c9a9, #d29780, #c4665c, #bc3630, #9d222e, #740036",
"visible_default": true
}
],
"_xlsxPath": "component_sheets/component_map.xlsx"
Expand Down
3 changes: 2 additions & 1 deletion app_data/sheets/template/component_demo/comp_button.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
},
"parameter_list": {
"variant": "card",
"icon": "images/icons/leaf_blue.svg"
"icon": "images/icons/leaf_blue.svg",
"icon_position": "right"
},
"name": "button_5",
"_nested_name": "button_5"
Expand Down
6 changes: 2 additions & 4 deletions app_data/sheets/template/component_demo/comp_text_bubble.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,12 @@
},
{
"type": "text_bubble",
"value": "Text bubble containing some Markdown **bold** and *italics* text",
"value": "Text bubble containing some Markdown **bold** and *italics* text. And a numbered list:\n1. Item one\n2. Item two\n3. Item three",
"_translations": {
"value": {}
},
"parameter_list": {
"speaker_image_asset": "images/avatar_1.png",
"speaker_position": "right",
"variant": "primary"
"speaker_image_asset": "images/avatar_1.png"
},
"name": "text_bubble_9",
"_nested_name": "text_bubble_9"
Expand Down
16 changes: 14 additions & 2 deletions app_data/sheets/template/component_demo/comp_youtube.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"rows": [
{
"type": "youtube",
"value": "0oOAGrStVGI",
"value": "https://www.youtube.com/watch?v=0oOAGrStVGI",
"_translations": {
"value": {}
},
Expand All @@ -15,12 +15,24 @@
},
{
"type": "youtube",
"value": "https://www.youtube.com/watch?v=0oOAGrStVGI",
"_translations": {
"value": {}
},
"parameter_list": {
"video_id": "0oOAGrStVGI",
"allow_fullscreen": "false"
},
"name": "youtube_3",
"_nested_name": "youtube_3"
},
{
"type": "youtube",
"value": "0oOAGrStVGI",
"_translations": {
"value": {}
},
"name": "youtube_4",
"_nested_name": "youtube_4"
}
],
"_xlsxPath": "component_sheets/component_youtube.xlsx"
Expand Down
37 changes: 37 additions & 0 deletions app_data/sheets/template/feature_landscape_mode_false.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"flow_type": "template",
"flow_name": "feature_landscape_mode_false",
"status": "released",
"rows": [
{
"type": "title",
"value": "Landscape mode disabled (default)",
"_translations": {
"value": {}
},
"name": "title_2",
"_nested_name": "title_2"
},
{
"type": "button",
"value": "Go to feature_landscape_mode_true",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "go_to",
"args": [
"feature_landscape_mode_true"
],
"_raw": "click | go_to: feature_landscape_mode_true",
"_cleaned": "click | go_to: feature_landscape_mode_true"
}
],
"name": "button_3",
"_nested_name": "button_3"
}
],
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
}
40 changes: 40 additions & 0 deletions app_data/sheets/template/feature_landscape_mode_true.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"flow_type": "template",
"flow_name": "feature_landscape_mode_true",
"status": "released",
"parameter_list": {
"landscape": true
},
"rows": [
{
"type": "title",
"value": "Landscape mode enabled",
"_translations": {
"value": {}
},
"name": "title_2",
"_nested_name": "title_2"
},
{
"type": "button",
"value": "Go to feature_landscape_mode_false",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "go_to",
"args": [
"feature_landscape_mode_false"
],
"_raw": "click | go_to: feature_landscape_mode_false",
"_cleaned": "click | go_to: feature_landscape_mode_false"
}
],
"name": "button_3",
"_nested_name": "button_3"
}
],
"_xlsxPath": "feature_sheets/feature_landscape_mode.xlsx"
}
48 changes: 48 additions & 0 deletions app_data/sheets/template/feature_screen_orientation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"flow_type": "template",
"flow_name": "feature_screen_orientation",
"status": "released",
"rows": [
{
"type": "button",
"value": "Portrait",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "screen_orientation",
"args": [
"portrait"
],
"_raw": "click | screen_orientation: portrait",
"_cleaned": "click | screen_orientation: portrait"
}
],
"name": "button_2",
"_nested_name": "button_2"
},
{
"type": "button",
"value": "Landscape",
"_translations": {
"value": {}
},
"action_list": [
{
"trigger": "click",
"action_id": "screen_orientation",
"args": [
"landscape"
],
"_raw": "click | screen_orientation: landscape",
"_cleaned": "click | screen_orientation: landscape"
}
],
"name": "button_3",
"_nested_name": "button_3"
}
],
"_xlsxPath": "feature_sheets/feature_screen_orientation.xlsx"
}
10 changes: 7 additions & 3 deletions config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.52",
content_tag_latest: "1.2.53",
};

config.app_config.ASSET_PACKS = {
Expand Down Expand Up @@ -46,6 +46,7 @@ config.android = {
icon_asset_path: "./app_data/assets/android/icon.png",
icon_asset_foreground_path: "./app_data/assets/android/icon-foreground.png",
icon_asset_background_path: "./app_data/assets/android/icon-background.png",
zoom_enabled: true
}

config.analytics={
Expand All @@ -55,8 +56,11 @@ config.analytics={
endpoint: "https://apps-server.idems.international/analytics"
}

config.ios.app_id = "international.idems.debug-app"
config.ios.app_name = "Debug App"
config.ios = {
app_id: "international.idems.debug-app",
app_name: "Debug App",
zoom_enabled: true
}

// Override any app constants here
config.app_config.APP_HEADER_DEFAULTS.title = "Debug App";
Expand Down
23 changes: 16 additions & 7 deletions reports/summary.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"type": "button",
"count": 176
"count": 180
},
{
"type": "calendar",
Expand Down Expand Up @@ -230,7 +230,7 @@
},
{
"type": "title",
"count": 342
"count": 344
},
{
"type": "toggle_bar",
Expand All @@ -250,7 +250,7 @@
},
{
"type": "youtube",
"count": 2
"count": 3
}
],
"template_actions": [
Expand Down Expand Up @@ -320,7 +320,7 @@
},
{
"type": "go_to",
"count": 44
"count": 46
},
{
"type": "go_to_url",
Expand Down Expand Up @@ -350,6 +350,10 @@
"type": "save_to_device",
"count": 2
},
{
"type": "screen_orientation",
"count": 2
},
{
"type": "set_field",
"count": 89
Expand Down Expand Up @@ -386,8 +390,8 @@
"assets_size": [
{
"assets": "total",
"KB": "31136 KB",
"MB": "31.1 MB"
"KB": "31185 KB",
"MB": "31.2 MB"
},
{
"assets": "unused",
Expand Down Expand Up @@ -776,6 +780,11 @@
"count": 2,
"size_kb": 133.5
},
{
"path": "map_data/forecast_riots.json",
"count": 1,
"size_kb": 48.6
},
{
"path": "map_data/ke.json",
"count": 1,
Expand Down Expand Up @@ -896,7 +905,7 @@
{
"type": "template",
"subtype": null,
"total": 70
"total": 73
},
{
"type": "template",
Expand Down
Loading

0 comments on commit 6f6f1cc

Please sign in to comment.