From 201be941c9799dd4bbe56059588387f1d1084b05 Mon Sep 17 00:00:00 2001 From: babaevmm Date: Fri, 7 Feb 2025 18:40:58 +0300 Subject: [PATCH] fix json format commit_hash:fd6e36a8ea96d96b9a00bac60a72f213c5f2dc0e --- schema/common.json | 5 +- schema/div-accessibility.json | 4 +- schema/div-action-scroll-destination.json | 2 +- schema/div-action-submit.json | 8 +- schema/div-container.json | 16 +- schema/div-data.json | 4 +- schema/div-indicator.json | 6 +- schema/div-input.json | 14 +- schema/div-pager.json | 3 +- schema/div-patch.json | 3 +- schema/div-pivot-percentage.json | 1 - schema/div-radial-gradient-center.json | 20 +- schema/div-radial-gradient-fixed-center.json | 44 +- schema/div-radial-gradient-radius.json | 20 +- .../div-radial-gradient-relative-center.json | 34 +- .../div-radial-gradient-relative-radius.json | 46 +- schema/div-shape-drawable.json | 4 +- schema/div-size-unit.json | 22 +- schema/div-slide-transition.json | 2 +- schema/div-stroke.json | 2 +- schema/div-text-range-mask-particles.json | 3 +- schema/div-text-range-mask-solid.json | 3 +- schema/div-text.json | 10 +- schema/div-timer.json | 2 +- schema/div-tooltip-mode-modal.json | 36 +- schema/div-tooltip-mode-non-modal.json | 29 +- schema/div-tooltip.json | 7 +- .../functions_arithmetic_number.json | 2 +- .../expression_test_data/functions_array.json | 3 +- .../expression_test_data/literals_number.json | 6 +- .../expression_test_data/variables_names.json | 2 +- .../div-container/patch_container.json | 1 - .../div-container/patch_inside_container.json | 1 - .../div-container/separators.json | 446 +++++------ .../div-gallery/base-properties.json | 3 - .../div-gallery/scroll-actions.json | 412 +++++----- .../div-gallery/select-elements.json | 1 - .../div-gallery/specific-properties.json | 3 +- .../div-gallery/typed-actions.json | 19 +- .../div-gallery/visibility.json | 3 - .../div-grid/patch_grid.json | 1 - .../div-grid/patch_inside_grid.json | 1 - .../div-image/blur.json | 2 +- .../div-input/currency_input_mask.json | 2 +- .../div-input/phone_input_mask.json | 1 - .../div-pager/select-elements.json | 3 +- .../div-slider/shapes.json | 112 +-- .../div-state/patch_state_partial.json | 1 - .../patch_state_transactional_broken.json | 1 - .../patch_state_transactional_success.json | 1 - .../div-trigger/condition-mode.json | 2 +- .../div-trigger/variable-mode.json | 2 +- test_data/perf_test_data/expressions.json | 13 +- .../accessibility/checkbox.json | 85 ++- .../accessibility/mode/mode_change.json | 328 ++++---- .../action_animation/animations.json | 2 +- .../actions/clear-focus.json | 334 ++++---- .../actions/focus-element-mobile.json | 4 +- .../actions/focus-element.json | 718 +++++++++--------- .../actions/hover-and-press.json | 2 +- .../animations/article.json | 2 +- .../animations/lottie/lottie_animations.json | 50 +- .../animations/rive/rive_animation.json | 262 +++---- .../animations/rive/rive_one_shot_loop.json | 1 - .../change_bounds_diff_ids_dst.json | 2 +- .../change_bounds_diff_ids_src.json | 2 +- .../change_bounds_diff_sizes_dst.json | 2 +- .../change_bounds_diff_sizes_src.json | 2 +- .../change_bounds_diff_types_dst.json | 2 +- .../change_bounds_diff_types_src.json | 2 +- .../change_bounds_same_ids_dst.json | 2 +- .../change_bounds_same_ids_src.json | 2 +- .../animations/transition/fade_full_dst.json | 2 +- .../animations/transition/fade_full_src.json | 2 +- .../animations/transition/fade_part_dst.json | 2 +- .../animations/transition/fade_part_src.json | 2 +- .../animations/transition/scale_full_dst.json | 2 +- .../animations/transition/scale_full_src.json | 2 +- .../animations/transition/scale_part_dst.json | 2 +- .../animations/transition/scale_part_src.json | 2 +- .../animations/transition/set_dst.json | 2 +- .../animations/transition/set_src.json | 2 +- .../animations/transition/slide_full_dst.json | 2 +- .../animations/transition/slide_full_src.json | 2 +- .../animations/transition/slide_part_dst.json | 2 +- .../animations/transition/slide_part_src.json | 2 +- .../animations/transition/transition_set.json | 10 +- .../transition_triggers_complex_dst.json | 2 +- .../change_bounds_transition_input.json | 164 ++-- .../Item_builder_with_id_override.json | 344 ++++----- .../container/item_builder.json | 288 +++---- .../currency_input_mask.json | 2 +- .../regression_test_data/enter_key_input.json | 18 +- .../fixed_length_input_mask.json | 2 +- .../fixed_length_phone_input_mask.json | 2 +- ...lery-bottom-multiline-selected-action.json | 6 +- .../gallery/gallery-bottom-multiline.json | 6 +- .../gallery/gallery-bottom-singleline.json | 6 +- .../gallery/gallery-item-actions-typed.json | 1 - .../gallery/gallery-item-actions.json | 1 - .../gallery/gallery-items-posing.json | 9 +- .../gallery/gallery-top-multiline.json | 6 +- .../gallery_paging_default_item_states.json | 2 +- .../gallery_swipe_disappear_action.json | 1 - .../image_shimmer_preview.json | 2 - test_data/regression_test_data/input.json | 20 +- .../input_inside_pager.json | 11 +- .../layout_provider_recursive.json | 122 +-- test_data/regression_test_data/logging.json | 6 +- .../regression_test_data/pager/pager.json | 1 - .../pager/pager_default_item_states.json | 2 +- .../pager/pager_infinite_scroll.json | 226 +++--- .../patch/actions_applied.json | 12 +- .../patch/actions_failed.json | 12 +- test_data/regression_test_data/select.json | 24 +- .../select_with_default.json | 24 +- .../regression_test_data/set_visibility.json | 10 +- .../regression_test_data/stored_value.json | 2 +- .../timers/common-timer.json | 2 +- .../timers/countdown-timer.json | 2 +- .../timers/endless-timer.json | 2 +- .../timers/typed-common-timer.json | 2 +- .../tooltips-with-tap-outside-properties.json | 6 +- .../regression_test_data/typed-tooltips.json | 8 +- .../typed_stored_value.json | 6 +- .../variables/div_image.json | 3 +- .../variables/div_tabs.json | 10 +- .../variables/div_variable_trigger_loops.json | 4 - .../video/video_aspect.json | 146 ++-- .../video/video_scale.json | 139 ++-- .../visibility_actions/pager.json | 2 +- .../pager_selected_actions.json | 1 - test_data/samples/base/alpha.json | 3 +- test_data/samples/base/background.json | 2 +- test_data/samples/container/horizontal.json | 12 +- test_data/samples/image/scale.json | 2 +- test_data/samples/input/text_input.json | 18 +- .../samples/pager/pager_with_indicator.json | 2 +- .../div-container/corners_radius.json | 1 - .../fixed-size-with-paddings.json | 1 - ...ent-inside-wrap-content-on-cross-axis.json | 2 +- .../horizontal-orientation-alignments.json | 1 - .../known-match-parent-cross-axis.json | 3 +- ...rlap-orientation-custom-alignments-bc.json | 1 - ...rlap-orientation-custom-alignments-bl.json | 1 - ...rlap-orientation-custom-alignments-br.json | 1 - ...rlap-orientation-custom-alignments-cc.json | 1 - ...rlap-orientation-custom-alignments-cl.json | 1 - ...rlap-orientation-custom-alignments-cr.json | 1 - ...rlap-orientation-custom-alignments-tc.json | 1 - ...rlap-orientation-custom-alignments-tl.json | 1 - ...rlap-orientation-custom-alignments-tr.json | 1 - ...verlap-orientation-default-alignments.json | 1 - .../unknown-match-parent-cross-axis.json | 3 +- .../vertical-orientation-alignments.json | 1 - ...tal-grid-gallery-wrapped-item-spacing.json | 2 +- .../div-gallery/rtl_gallery.json | 1 - .../div-gif-image/border-with-stroke.json | 1 - .../div-gif-image/corner-radius.json | 1 - .../div-gif-image/shadow.json | 1 - .../content-not-fit-with-paddings.json | 1 - .../div-grid/examples/example_7.json | 2 +- .../div-grid/fixed-size-with-paddings.json | 1 - .../intrinsic-size-with-max-size.json | 240 +++--- .../intrinsic-size-with-min-size.json | 256 +++---- .../snapshot_test_data/div-image/blur.json | 1 - .../div-image/border-with-stroke.json | 1 - .../div-image/corner-radius.json | 1 - .../div-image/corners_radius.json | 1 - .../snapshot_test_data/div-image/shadow.json | 1 - .../fixed-center-negative.json | 2 +- .../fixed-center-positive.json | 2 +- .../relative-center-positive.json | 2 +- .../relative-radius-farthest-corner.json | 2 +- .../relative-radius-farthest-side.json | 2 +- .../relative-radius-nearest-corner.json | 2 +- .../relative-radius-nearest-side.json | 2 +- .../div-radial-gradient/zero-radius.json | 2 +- .../div-separator/big_corner_radius.json | 2 - .../div-text/underline.json | 2 +- .../array/test_array_empty.json | 2 +- .../array/test_array_invalid_items.json | 2 +- .../array/test_array_missing_data.json | 2 +- .../array/test_array_missing_one_link.json | 2 +- .../array/test_array_nested.json | 2 +- .../test_array_nested_with_internal_link.json | 2 +- .../array/test_array_not_templated.json | 3 +- .../array/test_array_one_invalid_item.json | 3 +- ...ith_complex_items_with_internal_links.json | 2 +- .../array/test_array_with_internal_links.json | 2 +- .../array/test_array_with_link.json | 2 +- ...est_array_with_nested_templated_array.json | 2 +- .../test_array_with_override_in_items.json | 2 +- .../test_array_with_override_in_template.json | 2 +- .../test_array_with_templated_items.json | 2 +- .../array/test_array_without_link.json | 2 +- ...transform_not_templated_invalid_items.json | 3 +- ...nsform_not_templated_one_invalid_item.json | 3 +- .../test_complex_property_not_templated.json | 3 +- .../test_complex_property_without_link.json | 2 +- ...ex_property_without_link_missing_data.json | 3 +- ...nvalid_complex_property_not_templated.json | 6 +- ...test_invalid_value_presented_directly.json | 3 +- ...tional_complex_property_not_templated.json | 3 +- ...th_internal_link_override_in_template.json | 1 - ...ptional_complex_property_without_link.json | 2 +- ...ex_property_without_link_missing_data.json | 3 +- ...nvalid_complex_property_not_templated.json | 6 +- .../test_optional_property_not_templated.json | 3 +- ...al_string_enum_property_not_templated.json | 3 +- .../property/test_property_not_templated.json | 3 +- .../test_property_not_templated_invalid.json | 4 +- .../property/test_property_unknown_type.json | 3 +- .../test_property_with_link_invalid.json | 1 - ...st_string_enum_property_not_templated.json | 3 +- test_data/test_schema/common.json | 5 +- test_data/tutorials/counter.json | 2 +- test_data/tutorials/stateful_card.json | 2 +- test_data/tutorials/ticking_timer.json | 2 +- .../focus-element-and-clear-actions.json | 2 +- .../select/select_with_default.json | 2 +- .../div-reuse-id-background-wrapper.json | 8 +- .../div-base/div-reuse-id-lottie-wrapper.json | 8 +- .../div-base/div-reuse-id-pager-items.json | 22 +- ...div-text-visibility-actions-invisible.json | 1 - ...-text-visibility-and-disappear-action.json | 1 - ...rizontal_orientation_axial_alignments.json | 2 +- .../horizontal_orientation_no_alignments.json | 2 +- ...vertical_orientation_axial_alignments.json | 2 +- .../vertical_orientation_no_alignments.json | 2 +- .../div-container/with_multi_actions.json | 26 +- .../with_multi_actions_with_menu.json | 66 +- ...wrap_content_width_match_parent_items.json | 1 - .../div-with-extension-handler.json | 22 +- .../div-data/root_states_visibility.json | 1 - .../unit_test_data/div-gallery/gallery.json | 1 - .../unit_test_data/div-gallery/paging.json | 1 - .../div-grid/invalid-column-span1.json | 2 +- .../div-grid/invalid-column-span2.json | 2 +- .../unit_test_data/div-grid/with-action.json | 2 +- .../new_container_other_items.json | 1 - .../div-text/with_menu_items.json | 2 +- .../container-broken-patch-transactional.json | 2 +- .../container/container-patch-partial.json | 2 +- .../container-patch-transactional.json | 2 +- .../gallery/gallery-patch-partial.json | 83 +- .../gallery-patch-transactional-broken.json | 83 +- .../gallery/gallery-patch-transactional.json | 83 +- .../patches/grid/grid-patch-partial.json | 83 +- .../grid/grid-patch-transactional-broken.json | 83 +- .../grid/grid-patch-transactional.json | 83 +- .../patches/pager/pager-patch-partial.json | 83 +- .../pager-patch-transactional-broken.json | 83 +- .../pager/pager-patch-transactional.json | 83 +- 254 files changed, 3330 insertions(+), 3200 deletions(-) diff --git a/schema/common.json b/schema/common.json index ad4dc892b..6bc4cb94e 100644 --- a/schema/common.json +++ b/schema/common.json @@ -30,7 +30,10 @@ }, { "type": "integer", - "enum": [ 0, 1 ] + "enum": [ + 0, + 1 + ] } ] }, diff --git a/schema/div-accessibility.json b/schema/div-accessibility.json index 941a59412..bd698b702 100644 --- a/schema/div-accessibility.json +++ b/schema/div-accessibility.json @@ -72,7 +72,9 @@ "$ref": "common.json#/boolean_int", "default_value": "false", "$description": "translations.json#/div_accessibility_mute_after_action", - "platforms": [ "ios" ] + "platforms": [ + "ios" + ] } }, "platforms": [ diff --git a/schema/div-action-scroll-destination.json b/schema/div-action-scroll-destination.json index af13c645d..18f9bcf83 100644 --- a/schema/div-action-scroll-destination.json +++ b/schema/div-action-scroll-destination.json @@ -86,4 +86,4 @@ "$ref": "#/definitions/end_destination" } ] -} \ No newline at end of file +} diff --git a/schema/div-action-submit.json b/schema/div-action-submit.json index 249d8910e..819711bd6 100644 --- a/schema/div-action-submit.json +++ b/schema/div-action-submit.json @@ -36,7 +36,13 @@ "default_value": "post", "$description": "translations.json#/div_action_submit_request_method", "enum": [ - "get", "post", "put", "patch", "delete", "head", "options" + "get", + "post", + "put", + "patch", + "delete", + "head", + "options" ] } }, diff --git a/schema/div-container.json b/schema/div-container.json index 704da1e54..da24c0448 100644 --- a/schema/div-container.json +++ b/schema/div-container.json @@ -31,12 +31,16 @@ }, "typescript": { "union_interfaces": [ - { - "required_params": [ "items" ] - }, - { - "required_params": [ "item_builder" ] - } + { + "required_params": [ + "items" + ] + }, + { + "required_params": [ + "item_builder" + ] + } ] } }, diff --git a/schema/div-data.json b/schema/div-data.json index 1bf3f1dad..95733d099 100644 --- a/schema/div-data.json +++ b/schema/div-data.json @@ -38,8 +38,8 @@ "$description": "translations.json#/div_data_div_state_state_id" }, "div": { - "$ref": "div.json", - "$description": "translations.json#/div_data_div_state_div" + "$ref": "div.json", + "$description": "translations.json#/div_data_div_state_div" } }, "required": [ diff --git a/schema/div-indicator.json b/schema/div-indicator.json index d790f6cd3..35332200e 100644 --- a/schema/div-indicator.json +++ b/schema/div-indicator.json @@ -16,7 +16,7 @@ "$ref": "common.json#/id", "$description": "translations.json#/div_indicator_pager_id" }, - "items_placement" : { + "items_placement": { "$ref": "div-indicator-item-placement.json", "$description": "translations.json#/div_indicator_item_placement" }, @@ -79,7 +79,9 @@ "animation": { "type": "string", "enum": [ - "scale", "worm", "slider" + "scale", + "worm", + "slider" ], "default_value": "scale", "$description": "translations.json#/div_indicator_animation", diff --git a/schema/div-input.json b/schema/div-input.json index 4b0c4a5ff..4520d6a52 100644 --- a/schema/div-input.json +++ b/schema/div-input.json @@ -144,7 +144,11 @@ "autocapitalization": { "type": "string", "enum": [ - "auto", "none", "words", "sentences", "all_characters" + "auto", + "none", + "words", + "sentences", + "all_characters" ], "default_value": "auto", "$description": "translations.json#/div_input_autocapitalization", @@ -186,7 +190,13 @@ "keyboard_type": { "type": "string", "enum": [ - "single_line_text", "multi_line_text", "phone", "number", "email", "uri", "password" + "single_line_text", + "multi_line_text", + "phone", + "number", + "email", + "uri", + "password" ], "default_value": "multi_line_text", "$description": "translations.json#/div_input_keyboard_type" diff --git a/schema/div-pager.json b/schema/div-pager.json index c55e541c9..9fe884258 100644 --- a/schema/div-pager.json +++ b/schema/div-pager.json @@ -80,7 +80,8 @@ "type": "string", "default_value": "horizontal", "enum": [ - "horizontal", "vertical" + "horizontal", + "vertical" ], "$description": "translations.json#/div_pager_orientation" }, diff --git a/schema/div-patch.json b/schema/div-patch.json index d73919095..eac374587 100644 --- a/schema/div-patch.json +++ b/schema/div-patch.json @@ -33,7 +33,8 @@ "mode": { "type": "string", "enum": [ - "transactional", "partial" + "transactional", + "partial" ], "default_value": "partial", "$description": "translations.json#/div_patch_mode", diff --git a/schema/div-pivot-percentage.json b/schema/div-pivot-percentage.json index 0d6e1855f..2c1981397 100644 --- a/schema/div-pivot-percentage.json +++ b/schema/div-pivot-percentage.json @@ -23,4 +23,3 @@ "value" ] } - diff --git a/schema/div-radial-gradient-center.json b/schema/div-radial-gradient-center.json index cf23b2531..fd892d9e9 100644 --- a/schema/div-radial-gradient-center.json +++ b/schema/div-radial-gradient-center.json @@ -1,12 +1,12 @@ { - "anyOf": [ - { - "$ref": "div-radial-gradient-fixed-center.json", - "$description": "translations.json#/div_radial_gradient_fixed_center" - }, - { - "$ref": "div-radial-gradient-relative-center.json", - "$description": "translations.json#/div_radial_gradient_relative_center" - } - ] + "anyOf": [ + { + "$ref": "div-radial-gradient-fixed-center.json", + "$description": "translations.json#/div_radial_gradient_fixed_center" + }, + { + "$ref": "div-radial-gradient-relative-center.json", + "$description": "translations.json#/div_radial_gradient_relative_center" + } + ] } diff --git a/schema/div-radial-gradient-fixed-center.json b/schema/div-radial-gradient-fixed-center.json index a49493400..7d9ee0941 100644 --- a/schema/div-radial-gradient-fixed-center.json +++ b/schema/div-radial-gradient-fixed-center.json @@ -1,25 +1,25 @@ { - "type": "object", - "$description": "translations.json#/div_radial_gradient_fixed_center", - "properties": { - "value": { - "type": "integer", - "$description": "translations.json#/div_radial_gradient_fixed_center_value" - }, - "unit": { - "$ref": "div-size-unit.json", - "$description": "translations.json#/div_fixed_size_unit", - "default_value": "dp" - }, - "type": { - "type": "string", - "enum": [ - "fixed" - ] - } + "type": "object", + "$description": "translations.json#/div_radial_gradient_fixed_center", + "properties": { + "value": { + "type": "integer", + "$description": "translations.json#/div_radial_gradient_fixed_center_value" }, - "required": [ - "value", - "type" - ] + "unit": { + "$ref": "div-size-unit.json", + "$description": "translations.json#/div_fixed_size_unit", + "default_value": "dp" + }, + "type": { + "type": "string", + "enum": [ + "fixed" + ] + } + }, + "required": [ + "value", + "type" + ] } diff --git a/schema/div-radial-gradient-radius.json b/schema/div-radial-gradient-radius.json index c29bf689e..6d602ed2a 100644 --- a/schema/div-radial-gradient-radius.json +++ b/schema/div-radial-gradient-radius.json @@ -1,12 +1,12 @@ { - "anyOf": [ - { - "$ref": "div-fixed-size.json", - "$description": "translations.json#/div_size_fixed" - }, - { - "$ref": "div-radial-gradient-relative-radius.json", - "$description": "translations.json#/div_radial_gradient_relative_radius" - } - ] + "anyOf": [ + { + "$ref": "div-fixed-size.json", + "$description": "translations.json#/div_size_fixed" + }, + { + "$ref": "div-radial-gradient-relative-radius.json", + "$description": "translations.json#/div_radial_gradient_relative_radius" + } + ] } diff --git a/schema/div-radial-gradient-relative-center.json b/schema/div-radial-gradient-relative-center.json index c4668333c..27727db2d 100644 --- a/schema/div-radial-gradient-relative-center.json +++ b/schema/div-radial-gradient-relative-center.json @@ -1,20 +1,20 @@ { - "type": "object", - "$description": "translations.json#/div_radial_gradient_relative_center", - "properties": { - "value": { - "type": "number", - "$description": "translations.json#/div_radial_gradient_relative_center_value" - }, - "type": { - "type": "string", - "enum": [ - "relative" - ] - } + "type": "object", + "$description": "translations.json#/div_radial_gradient_relative_center", + "properties": { + "value": { + "type": "number", + "$description": "translations.json#/div_radial_gradient_relative_center_value" }, - "required": [ - "value", - "type" - ] + "type": { + "type": "string", + "enum": [ + "relative" + ] + } + }, + "required": [ + "value", + "type" + ] } diff --git a/schema/div-radial-gradient-relative-radius.json b/schema/div-radial-gradient-relative-radius.json index dbaf1e580..003dad303 100644 --- a/schema/div-radial-gradient-relative-radius.json +++ b/schema/div-radial-gradient-relative-radius.json @@ -1,26 +1,26 @@ { - "type": "object", - "$description": "translations.json#/div_radial_gradient_relative_radius", - "properties": { - "value": { - "type": "string", - "$description": "translations.json#/div_radial_gradient_relative_radius_value", - "enum": [ - "nearest_corner", - "farthest_corner", - "nearest_side", - "farthest_side" - ] - }, - "type": { - "type": "string", - "enum": [ - "relative" - ] - } + "type": "object", + "$description": "translations.json#/div_radial_gradient_relative_radius", + "properties": { + "value": { + "type": "string", + "$description": "translations.json#/div_radial_gradient_relative_radius_value", + "enum": [ + "nearest_corner", + "farthest_corner", + "nearest_side", + "farthest_side" + ] }, - "required": [ - "value", - "type" - ] + "type": { + "type": "string", + "enum": [ + "relative" + ] + } + }, + "required": [ + "value", + "type" + ] } diff --git a/schema/div-shape-drawable.json b/schema/div-shape-drawable.json index 3224a7c8c..9a0e2e100 100644 --- a/schema/div-shape-drawable.json +++ b/schema/div-shape-drawable.json @@ -29,6 +29,8 @@ "web" ], "required": [ - "type", "shape", "color" + "type", + "shape", + "color" ] } diff --git a/schema/div-size-unit.json b/schema/div-size-unit.json index 8bc86c0e8..152385538 100644 --- a/schema/div-size-unit.json +++ b/schema/div-size-unit.json @@ -1,13 +1,13 @@ { - "type": "string", - "enum": [ - "dp", - "sp", - "px" - ], - "$description": "translations.json#/div_size_unit", - "platforms": [ - "android", - "ios" - ] + "type": "string", + "enum": [ + "dp", + "sp", + "px" + ], + "$description": "translations.json#/div_size_unit", + "platforms": [ + "android", + "ios" + ] } diff --git a/schema/div-slide-transition.json b/schema/div-slide-transition.json index e93b6a334..f35be68aa 100644 --- a/schema/div-slide-transition.json +++ b/schema/div-slide-transition.json @@ -23,7 +23,7 @@ "default_value": "bottom", "$description": "translations.json#/div_slide_transition_edge" }, - "distance":{ + "distance": { "$ref": "div-dimension.json", "$description": "translations.json#/div_slide_transition_distance" } diff --git a/schema/div-stroke.json b/schema/div-stroke.json index 196b63893..6303d20ab 100644 --- a/schema/div-stroke.json +++ b/schema/div-stroke.json @@ -19,4 +19,4 @@ "required": [ "color" ] -} \ No newline at end of file +} diff --git a/schema/div-text-range-mask-particles.json b/schema/div-text-range-mask-particles.json index ee7a33bd9..35b99c862 100644 --- a/schema/div-text-range-mask-particles.json +++ b/schema/div-text-range-mask-particles.json @@ -32,8 +32,7 @@ "$description": "translations.json#/div_text_range_mask_particles_density" } }, - "platforms": [ - ], + "platforms": [], "required": [ "type", "color" diff --git a/schema/div-text-range-mask-solid.json b/schema/div-text-range-mask-solid.json index 768f152cf..b8ba02402 100644 --- a/schema/div-text-range-mask-solid.json +++ b/schema/div-text-range-mask-solid.json @@ -17,8 +17,7 @@ "$description": "translations.json#/div_solid_background_color" } }, - "platforms": [ - ], + "platforms": [], "required": [ "color", "type" diff --git a/schema/div-text.json b/schema/div-text.json index 5567e4774..003df29c2 100644 --- a/schema/div-text.json +++ b/schema/div-text.json @@ -133,8 +133,7 @@ "mask": { "$ref": "div-text-range-mask.json", "$description": "translations.json#/div_text_range_mask", - "platforms": [ - ] + "platforms": [] } }, "$description": "translations.json#/div_text_range" @@ -241,7 +240,7 @@ ], "$description": "translations.json#/div_text_image" }, - "ellipsis": { + "ellipsis": { "type": "object", "properties": { "text": { @@ -471,7 +470,10 @@ "truncate": { "type": "string", "enum": [ - "none", "start", "end", "middle" + "none", + "start", + "end", + "middle" ], "default_value": "end", "$description": "translations.json#/div_text_truncate", diff --git a/schema/div-timer.json b/schema/div-timer.json index 657a19172..074fa81c4 100644 --- a/schema/div-timer.json +++ b/schema/div-timer.json @@ -39,4 +39,4 @@ "required": [ "id" ] -} \ No newline at end of file +} diff --git a/schema/div-tooltip-mode-modal.json b/schema/div-tooltip-mode-modal.json index ee4281481..9e1efff78 100644 --- a/schema/div-tooltip-mode-modal.json +++ b/schema/div-tooltip-mode-modal.json @@ -1,20 +1,20 @@ { - "type": "object", - "$description": "translations.json#/div_tooltip_mode_modal", - "platforms": [ - "android", - "ios", - "web" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "modal" - ] - } - }, - "required": [ - "type" - ] + "type": "object", + "$description": "translations.json#/div_tooltip_mode_modal", + "platforms": [ + "android", + "ios", + "web" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "modal" + ] + } + }, + "required": [ + "type" + ] } diff --git a/schema/div-tooltip-mode-non-modal.json b/schema/div-tooltip-mode-non-modal.json index 1ac93eeed..ff6f4f847 100644 --- a/schema/div-tooltip-mode-non-modal.json +++ b/schema/div-tooltip-mode-non-modal.json @@ -1,17 +1,16 @@ { - "type": "object", - "$description": "translations.json#/div_tooltip_mode_non_modal", - "platforms": [ - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "non_modal" - ] - } - }, - "required": [ - "type" - ] + "type": "object", + "$description": "translations.json#/div_tooltip_mode_non_modal", + "platforms": [], + "properties": { + "type": { + "type": "string", + "enum": [ + "non_modal" + ] + } + }, + "required": [ + "type" + ] } diff --git a/schema/div-tooltip.json b/schema/div-tooltip.json index 8fcb02acd..0dbcc59d9 100644 --- a/schema/div-tooltip.json +++ b/schema/div-tooltip.json @@ -39,7 +39,7 @@ "$ref": "div-point.json", "$description": "translations.json#/div_tooltip_offset" }, - "animation_in" : { + "animation_in": { "$ref": "div-animation.json", "$description": "translations.json#/div_tooltip_animation_in", "platforms": [ @@ -47,7 +47,7 @@ "web" ] }, - "animation_out" : { + "animation_out": { "$ref": "div-animation.json", "$description": "translations.json#/div_tooltip_animation_out", "platforms": [ @@ -59,8 +59,7 @@ "$ref": "div-tooltip-mode.json", "default_value": "{ \"type\": \"modal\" }", "$description": "translations.json#/div_tooltip_mode", - "platforms": [ - ] + "platforms": [] }, "tap_outside_actions": { "type": "array", diff --git a/test_data/expression_test_data/functions_arithmetic_number.json b/test_data/expression_test_data/functions_arithmetic_number.json index e70890115..5e55ffde9 100644 --- a/test_data/expression_test_data/functions_arithmetic_number.json +++ b/test_data/expression_test_data/functions_arithmetic_number.json @@ -355,7 +355,7 @@ "expression": "@{maxNumber()}", "expected": { "type": "number", - "value": 1.7976931348623157E308 + "value": 1.7976931348623157E+308 }, "platforms": [ "android", diff --git a/test_data/expression_test_data/functions_array.json b/test_data/expression_test_data/functions_array.json index 87ffc0f75..8ebe52d19 100644 --- a/test_data/expression_test_data/functions_array.json +++ b/test_data/expression_test_data/functions_array.json @@ -895,8 +895,7 @@ { "type": "array", "name": "array", - "value": [ - ] + "value": [] } ], "platforms": [ diff --git a/test_data/expression_test_data/literals_number.json b/test_data/expression_test_data/literals_number.json index 754f219b6..b9da590bf 100644 --- a/test_data/expression_test_data/literals_number.json +++ b/test_data/expression_test_data/literals_number.json @@ -82,7 +82,7 @@ "expression": "@{.0000324}", "expected": { "type": "number", - "value": 3.24e-05 + "value": 0.0000324 }, "platforms": [ "android", @@ -95,7 +95,7 @@ "expression": "@{+.0000324}", "expected": { "type": "number", - "value": 3.24e-05 + "value": 0.0000324 }, "platforms": [ "android", @@ -108,7 +108,7 @@ "expression": "@{-.0000324}", "expected": { "type": "number", - "value": -3.24e-05 + "value": -0.0000324 }, "platforms": [ "android", diff --git a/test_data/expression_test_data/variables_names.json b/test_data/expression_test_data/variables_names.json index d0359acfe..e25bebf7c 100644 --- a/test_data/expression_test_data/variables_names.json +++ b/test_data/expression_test_data/variables_names.json @@ -507,4 +507,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/interactive_snapshot_test_data/div-container/patch_container.json b/test_data/interactive_snapshot_test_data/div-container/patch_container.json index df0288745..7534cb963 100644 --- a/test_data/interactive_snapshot_test_data/div-container/patch_container.json +++ b/test_data/interactive_snapshot_test_data/div-container/patch_container.json @@ -103,4 +103,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-container/patch_inside_container.json b/test_data/interactive_snapshot_test_data/div-container/patch_inside_container.json index f0425e259..53028bbc5 100644 --- a/test_data/interactive_snapshot_test_data/div-container/patch_inside_container.json +++ b/test_data/interactive_snapshot_test_data/div-container/patch_inside_container.json @@ -123,4 +123,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-container/separators.json b/test_data/interactive_snapshot_test_data/div-container/separators.json index 22a943532..f3cf5871e 100644 --- a/test_data/interactive_snapshot_test_data/div-container/separators.json +++ b/test_data/interactive_snapshot_test_data/div-container/separators.json @@ -5,242 +5,242 @@ "ios", "web" ], - "div_data": { - "templates": { - "item_text": { + "div_data": { + "templates": { + "item_text": { + "type": "text", + "width": { + "type": "wrap_content" + }, + "height": { + "type": "wrap_content" + }, + "paddings": { + "left": 10, + "top": 10, + "right": 10, + "bottom": 10 + }, + "border": { + "stroke": { + "color": "#B2B2B2" + } + }, + "font_size": 12, + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center" + } + }, + "card": { + "log_id": "tests", + "variables": [ + { + "name": "title", + "type": "string", + "value": "Container with all separators" + }, + { + "name": "separator_show_at_start", + "type": "boolean", + "value": true + }, + { + "name": "separator_show_at_end", + "type": "boolean", + "value": true + }, + { + "name": "separator_show_between", + "type": "boolean", + "value": true + } + ], + "states": [ + { + "state_id": 1, + "div": { + "type": "container", + "orientation": "vertical", + "width": { + "type": "fixed", + "value": 330 + }, + "height": { + "type": "wrap_content" + }, + "background": [ + { + "type": "solid", + "color": "#FFFFFF" + } + ], + "items": [ + { "type": "text", + "text": "@{title}", + "paddings": { + "left": 10, + "top": 10, + "right": 10, + "bottom": 10 + } + }, + { + "type": "container", + "orientation": "horizontal", "width": { - "type": "wrap_content" + "type": "wrap_content" }, "height": { - "type": "wrap_content" - }, - "paddings": { - "left": 10, - "top": 10, - "right": 10, - "bottom": 10 + "type": "wrap_content" }, + "layout_mode": "no_wrap", + "content_alignment_horizontal": "center", "border": { - "stroke": { - "color": "#B2B2B2" + "stroke": { + "color": "#FF00EE" + } + }, + "separator": { + "show_at_start": "@{separator_show_at_start}", + "show_at_end": "@{separator_show_at_end}", + "show_between": "@{separator_show_between}", + "style": { + "type": "shape_drawable", + "shape": { + "type": "rounded_rectangle", + "item_width": { + "type": "fixed", + "value": 10 + }, + "item_height": { + "type": "fixed", + "value": 15 + }, + "corner_radius": { + "type": "fixed", + "value": 0 + } + }, + "color": "#FF0000" + } + }, + "items": [ + { + "type": "item_text", + "text": "50", + "width": { + "type": "fixed", + "value": 50 } - }, - "font_size": 12, - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center" - } - }, - "card": { - "log_id": "tests", - "variables": [ - { - "name": "title", - "type": "string", - "value": "Container with all separators" - }, - { - "name": "separator_show_at_start", - "type": "boolean", - "value": true - }, - { - "name": "separator_show_at_end", - "type": "boolean", - "value": true - }, - { - "name": "separator_show_between", - "type": "boolean", - "value": true - } - ], - "states": [ - { - "state_id": 1, - "div": { - "type": "container", - "orientation": "vertical", - "width": { - "type": "fixed", - "value": 330 - }, - "height": { - "type": "wrap_content" - }, - "background": [ - { - "type": "solid", - "color": "#FFFFFF" - } - ], - "items": [ - { - "type": "text", - "text": "@{title}", - "paddings": { - "left": 10, - "top": 10, - "right": 10, - "bottom": 10 - } - }, - { - "type": "container", - "orientation": "horizontal", - "width": { - "type": "wrap_content" - }, - "height": { - "type": "wrap_content" - }, - "layout_mode": "no_wrap", - "content_alignment_horizontal": "center", - "border": { - "stroke": { - "color": "#FF00EE" - } - }, - "separator": { - "show_at_start": "@{separator_show_at_start}", - "show_at_end": "@{separator_show_at_end}", - "show_between": "@{separator_show_between}", - "style": { - "type": "shape_drawable", - "shape": { - "type": "rounded_rectangle", - "item_width": { - "type": "fixed", - "value": 10 - }, - "item_height": { - "type": "fixed", - "value": 15 - }, - "corner_radius": { - "type": "fixed", - "value": 0 - } - }, - "color": "#FF0000" - } - }, - "items": [ - { - "type": "item_text", - "text": "50", - "width": { - "type": "fixed", - "value": 50 - } - }, - { - "type": "item_text", - "text": "100", - "width": { - "type": "fixed", - "value": 100 - } - }, - { - "type": "item_text", - "text": "50", - "width": { - "type": "fixed", - "value": 50 - } - }, - { - "type": "item_text", - "text": "50", - "width": { - "type": "fixed", - "value": 50 - } - } - ] - } - ] + }, + { + "type": "item_text", + "text": "100", + "width": { + "type": "fixed", + "value": 100 } - } + }, + { + "type": "item_text", + "text": "50", + "width": { + "type": "fixed", + "value": 50 + } + }, + { + "type": "item_text", + "text": "50", + "width": { + "type": "fixed", + "value": 50 + } + } + ] + } ] + } } + ] + } + }, + "steps": [ + { + "expected_screenshot": "step0.png" }, - "steps": [ + { + "div_actions": [ { - "expected_screenshot": "step0.png" + "url": "div-action://set_variable?name=separator_show_between&value=false", + "log_id": "change_separator" }, { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_between&value=false", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=Between%20separators%20were%20disabled", - "log_id": "change_title" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_at_start&value=false", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=Start%20and%20between%20separators%20were%20disabled", - "log_id": "change_title" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_at_end&value=false", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=All%20separators%20were%20disabled", - "log_id": "change_title" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_between&value=true", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=Between%20separators%20were%20enabled", - "log_id": "change_title" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_at_start&value=true", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=Start%20and%20between%20separators%20were%20enabled", - "log_id": "change_title" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://set_variable?name=separator_show_at_end&value=true", - "log_id": "change_separator" - }, - { - "url": "div-action://set_variable?name=title&value=All%20separators%20were%20enabled", - "log_id": "change_title" - } - ] + "url": "div-action://set_variable?name=title&value=Between%20separators%20were%20disabled", + "log_id": "change_title" } - ] + ] + }, + { + "div_actions": [ + { + "url": "div-action://set_variable?name=separator_show_at_start&value=false", + "log_id": "change_separator" + }, + { + "url": "div-action://set_variable?name=title&value=Start%20and%20between%20separators%20were%20disabled", + "log_id": "change_title" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://set_variable?name=separator_show_at_end&value=false", + "log_id": "change_separator" + }, + { + "url": "div-action://set_variable?name=title&value=All%20separators%20were%20disabled", + "log_id": "change_title" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://set_variable?name=separator_show_between&value=true", + "log_id": "change_separator" + }, + { + "url": "div-action://set_variable?name=title&value=Between%20separators%20were%20enabled", + "log_id": "change_title" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://set_variable?name=separator_show_at_start&value=true", + "log_id": "change_separator" + }, + { + "url": "div-action://set_variable?name=title&value=Start%20and%20between%20separators%20were%20enabled", + "log_id": "change_title" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://set_variable?name=separator_show_at_end&value=true", + "log_id": "change_separator" + }, + { + "url": "div-action://set_variable?name=title&value=All%20separators%20were%20enabled", + "log_id": "change_title" + } + ] + } + ] } diff --git a/test_data/interactive_snapshot_test_data/div-gallery/base-properties.json b/test_data/interactive_snapshot_test_data/div-gallery/base-properties.json index ddee35fcb..c4d998688 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/base-properties.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/base-properties.json @@ -9,12 +9,9 @@ "templates": { "div_base": { "type": "gallery", - "orientation": "vertical", - "scroll_mode": "paging", "restrict_parent_scroll": 1, - "alpha": "@{alpha}", "alignment_horizontal": "@{alignment_horizontal}", "alignment_vertical": "@{alignment_vertical}", diff --git a/test_data/interactive_snapshot_test_data/div-gallery/scroll-actions.json b/test_data/interactive_snapshot_test_data/div-gallery/scroll-actions.json index 7f93b8e71..26791e05d 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/scroll-actions.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/scroll-actions.json @@ -1,216 +1,216 @@ { - "description": "Scroll actions", - "platforms": [ - "ios", - "web" - ], - "div_data": { - "templates": { - "div_base": { - "type": "gallery", - "id": "gallery1", - "orientation": "vertical", - "restrict_parent_scroll": 1, - "margins": { - "left": 10, - "top": 10, - "right": 10, - "bottom": 10 - }, - "height": { - "type": "match_parent" - } + "description": "Scroll actions", + "platforms": [ + "ios", + "web" + ], + "div_data": { + "templates": { + "div_base": { + "type": "gallery", + "id": "gallery1", + "orientation": "vertical", + "restrict_parent_scroll": 1, + "margins": { + "left": 10, + "top": 10, + "right": 10, + "bottom": 10 }, - "test_container": { - "type": "container", - "orientation": "overlap", - "border": { - "stroke": { - "color": "#000000" - } - } - }, - "item": { - "type": "text", - "text": " ", - "font_size": 14, - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center", - "alignment_horizontal": "center", - "text_color": "#1ABC9C", - "paddings": { - "top": 4, - "bottom": 4, - "left": 8, - "right": 8 - }, - "margins": { - "left": 8, - "right": 8 - }, - "width": { - "type": "fixed", - "value": 120 - }, - "height": { - "type": "fixed", - "value": 120 - }, - "background": [ - { - "type": "solid", - "color": "#34495E" - } - ], - "border": { - "corner_radius": 6 + "height": { + "type": "match_parent" + } + }, + "test_container": { + "type": "container", + "orientation": "overlap", + "border": { + "stroke": { + "color": "#000000" } } }, - "card": { - "log_id": "tests", - "states": [ + "item": { + "type": "text", + "text": " ", + "font_size": 14, + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center", + "alignment_horizontal": "center", + "text_color": "#1ABC9C", + "paddings": { + "top": 4, + "bottom": 4, + "left": 8, + "right": 8 + }, + "margins": { + "left": 8, + "right": 8 + }, + "width": { + "type": "fixed", + "value": 120 + }, + "height": { + "type": "fixed", + "value": 120 + }, + "background": [ { - "state_id": 1, - "div": { - "type": "test_container", - "height": { - "type": "fixed", - "value": 300 - }, - "items": [ - { - "type": "div_base", - "items": [ - { - "type": "item", - "item_log_id": "item/01", - "background": [ - { - "color": "#49a5a5", - "type": "solid" - } - ] - }, - { - "type": "item", - "item_log_id": "item/02", - "background": [ - { - "color": "#49a141", - "type": "solid" - } - ] - }, - { - "type": "item", - "item_log_id": "item/03", - "background": [ - { - "color": "#4975a5", - "type": "solid" - } - ] - }, - { - "type": "item", - "item_log_id": "item/04", - "background": [ - { - "color": "#11e5a5", - "type": "solid" - } - ] - } - ] - } - ] - } + "type": "solid", + "color": "#34495E" } - ] + ], + "border": { + "corner_radius": 6 + } } }, - "steps": [ - { - "expected_screenshot": "step0.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_forward?id=gallery1&step=30", - "log_id": "scroll_forward" + "card": { + "log_id": "tests", + "states": [ + { + "state_id": 1, + "div": { + "type": "test_container", + "height": { + "type": "fixed", + "value": 300 + }, + "items": [ + { + "type": "div_base", + "items": [ + { + "type": "item", + "item_log_id": "item/01", + "background": [ + { + "color": "#49a5a5", + "type": "solid" + } + ] + }, + { + "type": "item", + "item_log_id": "item/02", + "background": [ + { + "color": "#49a141", + "type": "solid" + } + ] + }, + { + "type": "item", + "item_log_id": "item/03", + "background": [ + { + "color": "#4975a5", + "type": "solid" + } + ] + }, + { + "type": "item", + "item_log_id": "item/04", + "background": [ + { + "color": "#11e5a5", + "type": "solid" + } + ] + } + ] + } + ] } - ] - }, - { - "div_actions": [ - { - "url": "div-action://scroll_forward?id=gallery1&step=300&overflow=clamp", - "log_id": "scroll_forward_clamp" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://scroll_forward?id=gallery1&step=30&overflow=ring", - "log_id": "scroll_forward_ring" - } - ], - "expected_screenshot": "step1.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_backward?id=gallery1&step=60&overflow=ring", - "log_id": "scroll_backward_ring" - } - ] - }, - { - "div_actions": [ - { - "url": "div-action://scroll_backward?id=gallery1&step=300&overflow=clamp", - "log_id": "scroll_backward_clamp" - } - ], - "expected_screenshot": "step0.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_to_position?id=gallery1&step=30", - "log_id": "scroll_to_position" - } - ], - "expected_screenshot": "step1.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_to_position?id=gallery1&step=300", - "log_id": "scroll_to_position_clamp" - } - ], - "expected_screenshot": "step2.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_to_start?id=gallery1", - "log_id": "scroll_to_start" - } - ], - "expected_screenshot": "step0.png" - }, - { - "div_actions": [ - { - "url": "div-action://scroll_to_end?id=gallery1", - "log_id": "scroll_to_end" - } - ], - "expected_screenshot": "step2.png" - } - ] - } + } + ] + } + }, + "steps": [ + { + "expected_screenshot": "step0.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_forward?id=gallery1&step=30", + "log_id": "scroll_forward" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://scroll_forward?id=gallery1&step=300&overflow=clamp", + "log_id": "scroll_forward_clamp" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://scroll_forward?id=gallery1&step=30&overflow=ring", + "log_id": "scroll_forward_ring" + } + ], + "expected_screenshot": "step1.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_backward?id=gallery1&step=60&overflow=ring", + "log_id": "scroll_backward_ring" + } + ] + }, + { + "div_actions": [ + { + "url": "div-action://scroll_backward?id=gallery1&step=300&overflow=clamp", + "log_id": "scroll_backward_clamp" + } + ], + "expected_screenshot": "step0.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_to_position?id=gallery1&step=30", + "log_id": "scroll_to_position" + } + ], + "expected_screenshot": "step1.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_to_position?id=gallery1&step=300", + "log_id": "scroll_to_position_clamp" + } + ], + "expected_screenshot": "step2.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_to_start?id=gallery1", + "log_id": "scroll_to_start" + } + ], + "expected_screenshot": "step0.png" + }, + { + "div_actions": [ + { + "url": "div-action://scroll_to_end?id=gallery1", + "log_id": "scroll_to_end" + } + ], + "expected_screenshot": "step2.png" + } + ] +} diff --git a/test_data/interactive_snapshot_test_data/div-gallery/select-elements.json b/test_data/interactive_snapshot_test_data/div-gallery/select-elements.json index 14e5f1e8c..eb654d40f 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/select-elements.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/select-elements.json @@ -213,4 +213,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-gallery/specific-properties.json b/test_data/interactive_snapshot_test_data/div-gallery/specific-properties.json index 4037c7e4e..a9e77b8ab 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/specific-properties.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/specific-properties.json @@ -61,7 +61,6 @@ "type": "text", "text": " ", "font_size": 14, - "text_color": "#1ABC9C", "paddings": { "top": 4, @@ -296,4 +295,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/interactive_snapshot_test_data/div-gallery/typed-actions.json b/test_data/interactive_snapshot_test_data/div-gallery/typed-actions.json index 39f027649..e861437f2 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/typed-actions.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/typed-actions.json @@ -84,7 +84,7 @@ "div_actions": [ { "log_id": "gallery1/current", - "typed": { + "typed": { "type": "scroll_to", "id": "gallery1", "destination": { @@ -100,7 +100,7 @@ "div_actions": [ { "log_id": "gallery1/next", - "typed": { + "typed": { "type": "scroll_by", "id": "gallery1", "item_count": 1 @@ -113,7 +113,7 @@ "div_actions": [ { "log_id": "gallery1/prev", - "typed": { + "typed": { "type": "scroll_by", "id": "gallery1", "item_count": -1 @@ -126,7 +126,7 @@ "div_actions": [ { "log_id": "gallery1/end", - "typed": { + "typed": { "type": "scroll_to", "destination": { "type": "end" @@ -142,7 +142,7 @@ "div_actions": [ { "log_id": "gallery1/start", - "typed": { + "typed": { "type": "scroll_to", "destination": { "type": "start" @@ -158,7 +158,7 @@ "div_actions": [ { "log_id": "gallery1/current 2", - "typed": { + "typed": { "type": "scroll_to", "id": "gallery1", "destination": { @@ -174,7 +174,7 @@ "div_actions": [ { "log_id": "gallery1/forward", - "typed": { + "typed": { "type": "scroll_by", "id": "gallery1", "offset": 50 @@ -187,7 +187,7 @@ "div_actions": [ { "log_id": "gallery1/backward", - "typed": { + "typed": { "type": "scroll_by", "id": "gallery1", "offset": -50 @@ -200,7 +200,7 @@ "div_actions": [ { "log_id": "gallery1/to_position", - "typed": { + "typed": { "type": "scroll_to", "id": "gallery1", "destination": { @@ -214,4 +214,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-gallery/visibility.json b/test_data/interactive_snapshot_test_data/div-gallery/visibility.json index e35f07a41..8a6396125 100644 --- a/test_data/interactive_snapshot_test_data/div-gallery/visibility.json +++ b/test_data/interactive_snapshot_test_data/div-gallery/visibility.json @@ -9,13 +9,10 @@ "templates": { "div_base": { "type": "gallery", - "orientation": "vertical", "visibility": "@{visibility}", - "scroll_mode": "paging", "restrict_parent_scroll": 1, - "alpha": "@{alpha}", "alignment_horizontal": "@{alignment_horizontal}", "alignment_vertical": "@{alignment_vertical}", diff --git a/test_data/interactive_snapshot_test_data/div-grid/patch_grid.json b/test_data/interactive_snapshot_test_data/div-grid/patch_grid.json index 9217293c0..56861f083 100644 --- a/test_data/interactive_snapshot_test_data/div-grid/patch_grid.json +++ b/test_data/interactive_snapshot_test_data/div-grid/patch_grid.json @@ -100,4 +100,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-grid/patch_inside_grid.json b/test_data/interactive_snapshot_test_data/div-grid/patch_inside_grid.json index 982722f7d..ec0edec49 100644 --- a/test_data/interactive_snapshot_test_data/div-grid/patch_inside_grid.json +++ b/test_data/interactive_snapshot_test_data/div-grid/patch_inside_grid.json @@ -127,4 +127,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-image/blur.json b/test_data/interactive_snapshot_test_data/div-image/blur.json index cb861c726..f27c4d0ab 100644 --- a/test_data/interactive_snapshot_test_data/div-image/blur.json +++ b/test_data/interactive_snapshot_test_data/div-image/blur.json @@ -27,7 +27,7 @@ } ], "width": { - "type": "match_parent" + "type": "match_parent" }, "aspect": { "ratio": 1 diff --git a/test_data/interactive_snapshot_test_data/div-input/currency_input_mask.json b/test_data/interactive_snapshot_test_data/div-input/currency_input_mask.json index 61f40f123..9dc827a44 100644 --- a/test_data/interactive_snapshot_test_data/div-input/currency_input_mask.json +++ b/test_data/interactive_snapshot_test_data/div-input/currency_input_mask.json @@ -57,7 +57,7 @@ }, "background": [ { - "type":"solid", + "type": "solid", "color": "#eeeeee" } ], diff --git a/test_data/interactive_snapshot_test_data/div-input/phone_input_mask.json b/test_data/interactive_snapshot_test_data/div-input/phone_input_mask.json index 44a0bc9d3..659132bac 100644 --- a/test_data/interactive_snapshot_test_data/div-input/phone_input_mask.json +++ b/test_data/interactive_snapshot_test_data/div-input/phone_input_mask.json @@ -91,4 +91,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-pager/select-elements.json b/test_data/interactive_snapshot_test_data/div-pager/select-elements.json index 969c42c31..404c6072c 100644 --- a/test_data/interactive_snapshot_test_data/div-pager/select-elements.json +++ b/test_data/interactive_snapshot_test_data/div-pager/select-elements.json @@ -119,7 +119,7 @@ } ] } - }, + }, "steps": [ { "expected_screenshot": "step0.png" @@ -208,4 +208,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-slider/shapes.json b/test_data/interactive_snapshot_test_data/div-slider/shapes.json index 6ecfac4b2..3c24f3ba6 100644 --- a/test_data/interactive_snapshot_test_data/div-slider/shapes.json +++ b/test_data/interactive_snapshot_test_data/div-slider/shapes.json @@ -163,67 +163,67 @@ { "state_id": "circle", "div": { - "type": "div_base", - "thumb_style": { - "type": "shape_drawable", - "color": "#ff0000", - "stroke": { - "color": "#ffffff", - "width": 3 + "type": "div_base", + "thumb_style": { + "type": "shape_drawable", + "color": "#ff0000", + "stroke": { + "color": "#ffffff", + "width": 3 + }, + "shape": { + "type": "circle", + "radius": { + "type": "fixed", + "value": "@{slider_circle_radius}" + } + } }, - "shape": { - "type": "circle", - "radius": { - "type": "fixed", - "value": "@{slider_circle_radius}" + "track_active_style": { + "type": "shape_drawable", + "color": "#ff0000", + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 6 + } } - } - }, - "track_active_style": { - "type": "shape_drawable", - "color": "#ff0000", - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 6 + }, + "track_inactive_style": { + "type": "shape_drawable", + "color": "#20000000", + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 6 + } } - } - }, - "track_inactive_style": { - "type": "shape_drawable", - "color": "#20000000", - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 6 + }, + "tick_mark_active_style": { + "type": "shape_drawable", + "color": "#ff0000", + "shape": { + "type": "circle", + "radius": { + "type": "fixed", + "value": 8 + } } - } - }, - "tick_mark_active_style": { - "type": "shape_drawable", - "color": "#ff0000", - "shape": { - "type": "circle", - "radius": { - "type": "fixed", - "value": 8 + }, + "tick_mark_inactive_style": { + "type": "shape_drawable", + "color": "#20000000", + "shape": { + "type": "circle", + "radius": { + "type": "fixed", + "value": 8 + } } - } - }, - "tick_mark_inactive_style": { - "type": "shape_drawable", - "color": "#20000000", - "shape": { - "type": "circle", - "radius": { - "type": "fixed", - "value": 8 - } - } - }, - "thumb_value_variable": "slider_value" + }, + "thumb_value_variable": "slider_value" } } ] diff --git a/test_data/interactive_snapshot_test_data/div-state/patch_state_partial.json b/test_data/interactive_snapshot_test_data/div-state/patch_state_partial.json index be539c5ab..24cb3821f 100644 --- a/test_data/interactive_snapshot_test_data/div-state/patch_state_partial.json +++ b/test_data/interactive_snapshot_test_data/div-state/patch_state_partial.json @@ -149,4 +149,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_broken.json b/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_broken.json index 698993682..bcc18a61a 100644 --- a/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_broken.json +++ b/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_broken.json @@ -149,4 +149,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_success.json b/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_success.json index f5deaa068..64bd4b188 100644 --- a/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_success.json +++ b/test_data/interactive_snapshot_test_data/div-state/patch_state_transactional_success.json @@ -149,4 +149,3 @@ } ] } - diff --git a/test_data/interactive_snapshot_test_data/div-trigger/condition-mode.json b/test_data/interactive_snapshot_test_data/div-trigger/condition-mode.json index d266de50f..404f0b90d 100644 --- a/test_data/interactive_snapshot_test_data/div-trigger/condition-mode.json +++ b/test_data/interactive_snapshot_test_data/div-trigger/condition-mode.json @@ -44,7 +44,7 @@ }, "card": { "log_id": "sample_card", - "variables":[ + "variables": [ { "name": "total_likes", "type": "integer", diff --git a/test_data/interactive_snapshot_test_data/div-trigger/variable-mode.json b/test_data/interactive_snapshot_test_data/div-trigger/variable-mode.json index ad2ac7751..ce67b52c9 100644 --- a/test_data/interactive_snapshot_test_data/div-trigger/variable-mode.json +++ b/test_data/interactive_snapshot_test_data/div-trigger/variable-mode.json @@ -44,7 +44,7 @@ }, "card": { "log_id": "sample_card", - "variables":[ + "variables": [ { "name": "total_likes", "type": "integer", diff --git a/test_data/perf_test_data/expressions.json b/test_data/perf_test_data/expressions.json index b6726a37e..056edf540 100644 --- a/test_data/perf_test_data/expressions.json +++ b/test_data/perf_test_data/expressions.json @@ -221,9 +221,18 @@ "type": "array", "name": "arr", "value": [ - 1,2,3,4,5,6,7,"#FFAABB",9.0,"10" + 1, + 2, + 3, + 4, + 5, + 6, + 7, + "#FFAABB", + 9.0, + "10" ] } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/accessibility/checkbox.json b/test_data/regression_test_data/accessibility/checkbox.json index 54b619204..625fbe425 100644 --- a/test_data/regression_test_data/accessibility/checkbox.json +++ b/test_data/regression_test_data/accessibility/checkbox.json @@ -1,44 +1,49 @@ { - "templates": {}, - "card": { - "log_id": "snapshot_test_card", - "variables": [{ - "name": "checked", - "type": "string", - "value": "unchecked" - }], - "states": [ + "templates": {}, + "card": { + "log_id": "snapshot_test_card", + "variables": [ + { + "name": "checked", + "type": "string", + "value": "unchecked" + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "state", + "id": "check", + "state_id_variable": "checked", + "states": [ { - "state_id": 0, - "div": { - "type": "state", - "id": "check", - "state_id_variable": "checked", - "states": [{ - "state_id": "unchecked", - "div": { - "type": "text", - "font_size": 20, - "text": "☐ Approved" - } - }, { - "state_id": "checked", - "div": { - "type": "text", - "font_size": 20, - "text": "☑ Approved" - } - }], - "accessibility": { - "type": "checkbox", - "is_checked": "@{checked == 'checked'}" - }, - "action": { - "log_id": "check", - "url": "div-action://set_variable?name=checked&value=@{checked == 'checked' ? 'unchecked' : 'checked'}" - } - } + "state_id": "unchecked", + "div": { + "type": "text", + "font_size": 20, + "text": "☐ Approved" + } + }, + { + "state_id": "checked", + "div": { + "type": "text", + "font_size": 20, + "text": "☑ Approved" + } } - ] - } + ], + "accessibility": { + "type": "checkbox", + "is_checked": "@{checked == 'checked'}" + }, + "action": { + "log_id": "check", + "url": "div-action://set_variable?name=checked&value=@{checked == 'checked' ? 'unchecked' : 'checked'}" + } + } + } + ] + } } diff --git a/test_data/regression_test_data/accessibility/mode/mode_change.json b/test_data/regression_test_data/accessibility/mode/mode_change.json index 4c6484a5b..75f37cd99 100644 --- a/test_data/regression_test_data/accessibility/mode/mode_change.json +++ b/test_data/regression_test_data/accessibility/mode/mode_change.json @@ -107,98 +107,100 @@ "height": { "type": "wrap_content" }, - "items" :[{ - "type": "container", - "height": { - "type": "wrap_content" - }, - "margins": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "orientation": "vertical", - "items": [ - { - "type": "button", - "text": "Item 1", - "accessibility": { - "description": "This is Item 1", - "hint": "@{element1} mode", - "mode": "@{element1}" - }, - "border": { - "corner_radius": 8 - } + "items": [ + { + "type": "container", + "height": { + "type": "wrap_content" }, - { - "type": "container", - "background": [ - { - "type": "solid", - "color": "#0e000000" - } - ], - "border": { - "corner_radius": 8 - }, - "margins": { - "bottom": 16 - }, - "accessibility": { - "mode": "@{element23}", - "hint": "@{element23} mode" - }, - "items": [ - { - "type": "button", - "text": "Item 2", - "margins": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "accessibility": { - "hint": "@{element2} mode", - "description": "This is Item 2", - "mode": "@{element2}" - } + "margins": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "orientation": "vertical", + "items": [ + { + "type": "button", + "text": "Item 1", + "accessibility": { + "description": "This is Item 1", + "hint": "@{element1} mode", + "mode": "@{element1}" }, - { - "type": "button", - "text": "Item 3", - "margins": { - "left": 16, - "right": 16, - "bottom": 16 - }, - "accessibility": { - "description": "This is Item 3", - "hint": "@{element3} mode", - "mode": "@{element3}" - } + "border": { + "corner_radius": 8 } - ] - }, - { - "type": "button", - "text_color": "#FFFFFF", - "text": "Item 4", - "accessibility": { - "mode": "@{element4}", - "hint": "@{element4} mode", - "description": "This is Item 4" }, - "background": [ - { - "type": "solid", - "color": "#cc0605" - } - ] - } - ]}, + { + "type": "container", + "background": [ + { + "type": "solid", + "color": "#0e000000" + } + ], + "border": { + "corner_radius": 8 + }, + "margins": { + "bottom": 16 + }, + "accessibility": { + "mode": "@{element23}", + "hint": "@{element23} mode" + }, + "items": [ + { + "type": "button", + "text": "Item 2", + "margins": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "accessibility": { + "hint": "@{element2} mode", + "description": "This is Item 2", + "mode": "@{element2}" + } + }, + { + "type": "button", + "text": "Item 3", + "margins": { + "left": 16, + "right": 16, + "bottom": 16 + }, + "accessibility": { + "description": "This is Item 3", + "hint": "@{element3} mode", + "mode": "@{element3}" + } + } + ] + }, + { + "type": "button", + "text_color": "#FFFFFF", + "text": "Item 4", + "accessibility": { + "mode": "@{element4}", + "hint": "@{element4} mode", + "description": "This is Item 4" + }, + "background": [ + { + "type": "solid", + "color": "#cc0605" + } + ] + } + ] + }, { "type": "container", "height": { @@ -224,28 +226,34 @@ "type": "controlButton", "text": "Default", "backgroundColor": "@{element1 == 'default' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element1&value=default" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element1&value=default" + } + ] }, { "type": "controlButton", "text": "Merge", "backgroundColor": "@{element1 == 'merge' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element1&value=merge" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element1&value=merge" + } + ] }, { "type": "controlButton", "text": "Exclude", "backgroundColor": "@{element1 == 'exclude' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element1&value=exclude" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element1&value=exclude" + } + ] } ] }, @@ -274,28 +282,34 @@ "type": "controlButton", "text": "Default", "backgroundColor": "@{element2 == 'default' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element2&value=default" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element2&value=default" + } + ] }, { "type": "controlButton", "text": "Merge", "backgroundColor": "@{element2 == 'merge' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element2&value=merge" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element2&value=merge" + } + ] }, { "type": "controlButton", "text": "Exclude", "backgroundColor": "@{element2 == 'exclude' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element2&value=exclude" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element2&value=exclude" + } + ] } ] }, @@ -324,28 +338,34 @@ "type": "controlButton", "text": "Default", "backgroundColor": "@{element3 == 'default' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element3&value=default" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element3&value=default" + } + ] }, { "type": "controlButton", "text": "Merge", "backgroundColor": "@{element3 == 'merge' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element3&value=merge" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element3&value=merge" + } + ] }, { "type": "controlButton", "text": "Exclude", "backgroundColor": "@{element3 == 'exclude' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element3&value=exclude" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element3&value=exclude" + } + ] } ] }, @@ -374,28 +394,34 @@ "type": "controlButton", "text": "Default", "backgroundColor": "@{element23 == 'default' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element23&value=default" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element23&value=default" + } + ] }, { "type": "controlButton", "text": "Merge", "backgroundColor": "@{element23 == 'merge' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element23&value=merge" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element23&value=merge" + } + ] }, { "type": "controlButton", "text": "Exclude", "backgroundColor": "@{element23 == 'exclude' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element23&value=exclude" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element23&value=exclude" + } + ] } ] }, @@ -424,28 +450,34 @@ "type": "controlButton", "text": "Default", "backgroundColor": "@{element4 == 'default' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element4&value=default" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element4&value=default" + } + ] }, { "type": "controlButton", "text": "Merge", "backgroundColor": "@{element4 == 'merge' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element4&value=merge" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element4&value=merge" + } + ] }, { "type": "controlButton", "text": "Exclude", "backgroundColor": "@{element4 == 'exclude' ? '#59000000' : '#0E000000'}", - "actions" : [{ - "log_id": "click", - "url": "div-action://set_variable?name=element4&value=exclude" - }] + "actions": [ + { + "log_id": "click", + "url": "div-action://set_variable?name=element4&value=exclude" + } + ] } ] } diff --git a/test_data/regression_test_data/action_animation/animations.json b/test_data/regression_test_data/action_animation/animations.json index 5543c8f14..bbeec3e01 100644 --- a/test_data/regression_test_data/action_animation/animations.json +++ b/test_data/regression_test_data/action_animation/animations.json @@ -73,7 +73,7 @@ "duration": 500, "end_value": 0.6, "interpolator": "ease" - }, + }, "actions": [ { "log_id": "animation_ease_scale", diff --git a/test_data/regression_test_data/actions/clear-focus.json b/test_data/regression_test_data/actions/clear-focus.json index d3d2547ee..8917f6696 100644 --- a/test_data/regression_test_data/actions/clear-focus.json +++ b/test_data/regression_test_data/actions/clear-focus.json @@ -1,178 +1,178 @@ { - "templates": { - "button": { - "type": "text", - "paddings": { - "top": 4, - "bottom": 4, - "left": 8, - "right": 8 - }, - "margins": { - "right": 8, - "left": 8 - }, - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center", - "font_size": 12, - "text_color": "#ffff", - "font_weight": "bold", - "height": { - "type": "wrap_content" - }, - "width": { - "type": "match_parent" - }, - "border": { - "corner_radius": 16 - }, + "templates": { + "button": { + "type": "text", + "paddings": { + "top": 4, + "bottom": 4, + "left": 8, + "right": 8 + }, + "margins": { + "right": 8, + "left": 8 + }, + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center", + "font_size": 12, + "text_color": "#ffff", + "font_weight": "bold", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "match_parent" + }, + "border": { + "corner_radius": 16 + }, + "background": [ + { + "type": "solid", + "color": "#0000FF" + } + ], + "focus": { "background": [ { "type": "solid", - "color": "#0000FF" + "color": "#ff5500" } - ], - "focus": { - "background": [ + ] + } + } + }, + "card": { + "log_id": "tests", + "variables": [ + { + "name": "input_value_1", + "type": "string", + "value": "input view" + }, + { + "name": "timer_label", + "type": "string", + "value": "finished" + } + ], + "timers": [ + { + "id": "clear_focus", + "duration": 2000, + "end_actions": [ + { + "log_id": "clear focus", + "typed": { + "type": "clear_focus" + } + }, + { + "url": "div-action://set_variable?name=timer_label&value=finished", + "log_id": "timer finished" + } + ] + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "margins": { + "top": 24, + "bottom": 24 + }, + "items": [ { - "type": "solid", - "color": "#ff5500" + "type": "container", + "orientation": "horizontal", + "margins": { + "left": 16, + "top": 16 + }, + "width": { + "type": "wrap_content" + }, + "items": [ + { + "type": "text", + "text": "Timer for clear focus: ", + "font_weight": "bold" + }, + { + "type": "text", + "text": "@{timer_label}" + } + ] + }, + { + "id": "input", + "text_variable": "input_value_1", + "type": "input", + "width": { + "type": "match_parent" + }, + "height": { + "type": "wrap_content" + }, + "paddings": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "margins": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "border": { + "corner_radius": 8, + "stroke": { + "color": "#0000FF" + } + }, + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } + ] + } + }, + { + "type": "button", + "text": "Focus input", + "id": "button_1", + "alignment_horizontal": "center", + "width": { + "type": "wrap_content" + }, + "actions": [ + { + "log_id": "focus_1", + "typed": { + "type": "focus_element", + "element_id": "input" + } + }, + { + "log_id": "Start timer", + "url": "div-action://timer?id=clear_focus&action=start" + }, + { + "url": "div-action://set_variable?name=timer_label&value=started", + "log_id": "timer started" + } + ] } ] } } - }, - "card": { - "log_id": "tests", - "variables": [ - { - "name": "input_value_1", - "type": "string", - "value": "input view" - }, - { - "name": "timer_label", - "type": "string", - "value": "finished" - } - ], - "timers": [ - { - "id": "clear_focus", - "duration": 2000, - "end_actions": [ - { - "log_id": "clear focus", - "typed": { - "type": "clear_focus" - } - }, - { - "url": "div-action://set_variable?name=timer_label&value=finished", - "log_id": "timer finished" - } - ] - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "margins": { - "top": 24, - "bottom": 24 - }, - "items": [ - { - "type": "container", - "orientation": "horizontal", - "margins": { - "left": 16, - "top": 16 - }, - "width": { - "type": "wrap_content" - }, - "items": [ - { - "type": "text", - "text": "Timer for clear focus: ", - "font_weight": "bold" - }, - { - "type": "text", - "text": "@{timer_label}" - } - ] - }, - { - "id": "input", - "text_variable": "input_value_1", - "type": "input", - "width": { - "type": "match_parent" - }, - "height": { - "type": "wrap_content" - }, - "paddings": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "margins": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "border": { - "corner_radius": 8, - "stroke": { - "color": "#0000FF" - } - }, - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } - }, - { - "type": "button", - "text": "Focus input", - "id": "button_1", - "alignment_horizontal": "center", - "width": { - "type": "wrap_content" - }, - "actions": [ - { - "log_id": "focus_1", - "typed": { - "type": "focus_element", - "element_id": "input" - } - }, - { - "log_id": "Start timer", - "url": "div-action://timer?id=clear_focus&action=start" - }, - { - "url": "div-action://set_variable?name=timer_label&value=started", - "log_id": "timer started" - } - ] - } - ] - } - } - ] - } + ] } +} diff --git a/test_data/regression_test_data/actions/focus-element-mobile.json b/test_data/regression_test_data/actions/focus-element-mobile.json index 4299f4f3a..f76005a38 100644 --- a/test_data/regression_test_data/actions/focus-element-mobile.json +++ b/test_data/regression_test_data/actions/focus-element-mobile.json @@ -132,7 +132,7 @@ { "state_id": 0, "div": { - "div_id": "container", + "div_id": "container", "type": "container", "width": { "type": "match_parent" @@ -265,4 +265,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/actions/focus-element.json b/test_data/regression_test_data/actions/focus-element.json index be86021da..413f5076e 100644 --- a/test_data/regression_test_data/actions/focus-element.json +++ b/test_data/regression_test_data/actions/focus-element.json @@ -1,379 +1,379 @@ { - "templates": { - "number_input": { - "type": "input", - "width": { + "templates": { + "number_input": { + "type": "input", + "width": { + "type": "match_parent" + }, + "height": { + "type": "wrap_content" + }, + "paddings": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "margins": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "border": { + "corner_radius": 8, + "stroke": { + "color": "#0000FF" + } + }, + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } + ] + } + }, + "button": { + "type": "text", + "paddings": { + "top": 4, + "bottom": 4, + "left": 8, + "right": 8 + }, + "margins": { + "right": 8, + "left": 8 + }, + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center", + "font_size": 12, + "text_color": "#ffff", + "font_weight": "bold", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "match_parent" + }, + "border": { + "corner_radius": 16 + }, + "background": [ + { + "type": "solid", + "color": "#0000FF" + } + ], + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } + ] + } + } + }, + "card": { + "log_id": "tests", + "variables": [ + { + "name": "input_value_1", + "type": "string", + "value": "initial_text_1" + }, + { + "name": "input_value_2", + "type": "string", + "value": "initial_text_2" + }, + { + "name": "input_value_3", + "type": "string", + "value": "initial_text_3" + }, + { + "name": "select_value", + "type": "string", + "value": "" + }, + { + "name": "slide_value", + "type": "integer", + "value": 2 + }, + { + "name": "slide_value2", + "type": "integer", + "value": 5 + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "margins": { + "top": 24, + "bottom": 24 + }, + "items": [ + { + "type": "number_input", + "id": "input_1", + "text_variable": "input_value_1" + }, + { + "type": "number_input", + "id": "input_2", + "text_variable": "input_value_2" + }, + { + "type": "number_input", + "id": "input_3", + "text_variable": "input_value_3" + }, + { + "type": "select", + "id": "select_1", + "width": { "type": "match_parent" - }, - "height": { + }, + "height": { "type": "wrap_content" - }, - "paddings": { + }, + "margins": { "left": 16, - "top": 16, + "top": 20, "right": 16, "bottom": 16 - }, - "margins": { + }, + "paddings": { "left": 16, - "top": 16, + "top": 10, "right": 16, - "bottom": 16 - }, - "border": { + "bottom": 10 + }, + "alpha": 1, + "alignment_horizontal": "center", + "alignment_vertical": "center", + "border": { "corner_radius": 8, "stroke": { - "color": "#0000FF" + "color": "#0000FF" } - }, - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } - }, - "button": { - "type": "text", - "paddings": { - "top": 4, - "bottom": 4, - "left": 8, - "right": 8 - }, - "margins": { - "right": 8, - "left": 8 - }, - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center", - "font_size": 12, - "text_color": "#ffff", - "font_weight": "bold", - "height": { - "type": "wrap_content" - }, - "width": { - "type": "match_parent" - }, - "border": { - "corner_radius": 16 - }, - "background": [ + }, + "font_size": 16, + "font_weight": "medium", + "text_color": "#000000", + "value_variable": "select_variable", + "hint_text": "Select country", + "hint_color": "#888888", + "line_height": 22, + "options": [ { - "type": "solid", - "color": "#0000FF" + "value": "ru", + "text": "Russia" + }, + { + "value": "uk", + "text": "United Kingdom" + }, + { + "value": "kz" } - ], - "focus": { + ], + "focus": { "background": [ - { - "type": "solid", - "color": "#ff5500" - } + { + "type": "solid", + "color": "#ff5500" + } ] - } - } - }, - "card": { - "log_id": "tests", - "variables": [ - { - "name": "input_value_1", - "type": "string", - "value": "initial_text_1" + } }, { - "name": "input_value_2", - "type": "string", - "value": "initial_text_2" - }, - { - "name": "input_value_3", - "type": "string", - "value": "initial_text_3" - }, - { - "name": "select_value", - "type": "string", - "value": "" - }, - { - "name": "slide_value", - "type": "integer", - "value": 2 - }, - { - "name": "slide_value2", - "type": "integer", - "value": 5 - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "margins": { - "top": 24, - "bottom": 24 - }, - "items": [ - { - "type": "number_input", - "id": "input_1", - "text_variable": "input_value_1" - }, - { - "type": "number_input", - "id": "input_2", - "text_variable": "input_value_2" - }, - { - "type": "number_input", - "id": "input_3", - "text_variable": "input_value_3" - }, - { - "type": "select", - "id": "select_1", - "width": { - "type": "match_parent" - }, - "height": { - "type": "wrap_content" - }, - "margins": { - "left": 16, - "top": 20, - "right": 16, - "bottom": 16 - }, - "paddings": { - "left": 16, - "top": 10, - "right": 16, - "bottom": 10 - }, - "alpha": 1, - "alignment_horizontal": "center", - "alignment_vertical": "center", - "border": { - "corner_radius": 8, - "stroke": { - "color": "#0000FF" - } - }, - "font_size": 16, - "font_weight": "medium", - "text_color": "#000000", - "value_variable": "select_variable", - "hint_text": "Select country", - "hint_color": "#888888", - "line_height": 22, - "options": [ - { - "value": "ru", - "text": "Russia" - }, - { - "value": "uk", - "text": "United Kingdom" - }, - { - "value": "kz" - } - ], - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } - }, - { - "type": "slider", - "id": "slider_1", - "width": { - "type": "match_parent" - }, - "paddings": { - "left": 8, - "right": 8, - "top": 8, - "bottom": 8 - }, - "max_value": 10, - "min_value": 1, - "thumb_value_variable": "slide_value", - "thumb_secondary_value_variable": "slide_value2", - "thumb_style": { - "type": "shape_drawable", - "color": "#FFCC00", - "stroke": { - "color": "#ffffff", - "width": 3 - }, - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 32 - }, - "item_width": { - "type": "fixed", - "value": 32 - }, - "corner_radius": { - "type": "fixed", - "value": 100 - } - } - }, - "thumb_secondary_style": { - "type": "shape_drawable", - "color": "#FFCC00", - "stroke": { - "color": "#ffffff", - "width": 3 - }, - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 32 - }, - "item_width": { - "type": "fixed", - "value": 32 - }, - "corner_radius": { - "type": "fixed", - "value": 100 - } - } - }, - "track_active_style": { - "type": "shape_drawable", - "color": "#FFCC00", - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 6 - } - } - }, - "track_inactive_style": { - "type": "shape_drawable", - "color": "#20000000", - "shape": { - "type": "rounded_rectangle", - "item_height": { - "type": "fixed", - "value": 6 - } - } - }, - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } - }, - { - "type": "container", - "orientation": "horizontal", - "margins": { - "bottom": 16 - }, - "items": [ - { - "type": "button", - "text": "Focus 1", - "id": "button_1", - "action": { - "log_id": "focus_1", - "typed": { - "type": "focus_element", - "element_id": "input_1" - } - } - }, - { - "type": "button", - "text": "Focus 2", - "action": { - "log_id": "focus_2", - "typed": { - "type": "focus_element", - "element_id": "input_2" - } - } - }, - { - "type": "button", - "text": "Focus 3", - "action": { - "log_id": "focus_3", - "typed": { - "type": "focus_element", - "element_id": "input_3" - } - } - } - ] - }, - { - "type": "container", - "orientation": "horizontal", - "items": [ - { - "type": "button", - "text": "Focus select", - "action": { - "log_id": "select_1", - "typed": { - "type": "focus_element", - "element_id": "select_1" - } - } - }, - { - "type": "button", - "text": "Focus slider", - "action": { - "log_id": "slider_1", - "typed": { - "type": "focus_element", - "element_id": "slider_1" - } - } - }, - { - "type": "button", - "text": "Focus button 1", - "action": { - "log_id": "focus_4", - "typed": { - "type": "focus_element", - "element_id": "button_1" - } - } - } - ] - } - ] + "type": "slider", + "id": "slider_1", + "width": { + "type": "match_parent" + }, + "paddings": { + "left": 8, + "right": 8, + "top": 8, + "bottom": 8 + }, + "max_value": 10, + "min_value": 1, + "thumb_value_variable": "slide_value", + "thumb_secondary_value_variable": "slide_value2", + "thumb_style": { + "type": "shape_drawable", + "color": "#FFCC00", + "stroke": { + "color": "#ffffff", + "width": 3 + }, + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 32 + }, + "item_width": { + "type": "fixed", + "value": 32 + }, + "corner_radius": { + "type": "fixed", + "value": 100 + } } + }, + "thumb_secondary_style": { + "type": "shape_drawable", + "color": "#FFCC00", + "stroke": { + "color": "#ffffff", + "width": 3 + }, + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 32 + }, + "item_width": { + "type": "fixed", + "value": 32 + }, + "corner_radius": { + "type": "fixed", + "value": 100 + } + } + }, + "track_active_style": { + "type": "shape_drawable", + "color": "#FFCC00", + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 6 + } + } + }, + "track_inactive_style": { + "type": "shape_drawable", + "color": "#20000000", + "shape": { + "type": "rounded_rectangle", + "item_height": { + "type": "fixed", + "value": 6 + } + } + }, + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } + ] + } + }, + { + "type": "container", + "orientation": "horizontal", + "margins": { + "bottom": 16 + }, + "items": [ + { + "type": "button", + "text": "Focus 1", + "id": "button_1", + "action": { + "log_id": "focus_1", + "typed": { + "type": "focus_element", + "element_id": "input_1" + } + } + }, + { + "type": "button", + "text": "Focus 2", + "action": { + "log_id": "focus_2", + "typed": { + "type": "focus_element", + "element_id": "input_2" + } + } + }, + { + "type": "button", + "text": "Focus 3", + "action": { + "log_id": "focus_3", + "typed": { + "type": "focus_element", + "element_id": "input_3" + } + } + } + ] + }, + { + "type": "container", + "orientation": "horizontal", + "items": [ + { + "type": "button", + "text": "Focus select", + "action": { + "log_id": "select_1", + "typed": { + "type": "focus_element", + "element_id": "select_1" + } + } + }, + { + "type": "button", + "text": "Focus slider", + "action": { + "log_id": "slider_1", + "typed": { + "type": "focus_element", + "element_id": "slider_1" + } + } + }, + { + "type": "button", + "text": "Focus button 1", + "action": { + "log_id": "focus_4", + "typed": { + "type": "focus_element", + "element_id": "button_1" + } + } + } + ] } - ] - } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/actions/hover-and-press.json b/test_data/regression_test_data/actions/hover-and-press.json index 3aa402691..1a435677d 100644 --- a/test_data/regression_test_data/actions/hover-and-press.json +++ b/test_data/regression_test_data/actions/hover-and-press.json @@ -97,4 +97,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/article.json b/test_data/regression_test_data/animations/article.json index 5dc1e052f..4b08fd8e7 100644 --- a/test_data/regression_test_data/animations/article.json +++ b/test_data/regression_test_data/animations/article.json @@ -287,7 +287,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, diff --git a/test_data/regression_test_data/animations/lottie/lottie_animations.json b/test_data/regression_test_data/animations/lottie/lottie_animations.json index 0325b508b..fa3f5920f 100644 --- a/test_data/regression_test_data/animations/lottie/lottie_animations.json +++ b/test_data/regression_test_data/animations/lottie/lottie_animations.json @@ -116,7 +116,7 @@ "image_id": "DivGif 2", "lottie_image_text": "DivGif 2", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif2.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif2.json", "repeat_count": 3, "repeat_mode": "restart" } @@ -126,7 +126,7 @@ "image_id": "DivGif 3", "lottie_image_text": "DivGif 3", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif3.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif3.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -136,7 +136,7 @@ "image_id": "DivGif 4", "lottie_image_text": "DivGif 4", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif4.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif4.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -146,7 +146,7 @@ "image_id": "DivGif 5", "lottie_image_text": "DivGif 5", "lottie_params": { - "lottie_url": "https://yastatic.net/s3/home/yandex-app/div_test_data/love_anim.json", + "lottie_url": "https://yastatic.net/s3/home/yandex-app/div_test_data/love_anim.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -164,7 +164,7 @@ "image_id": "DivGif 7", "lottie_image_text": "DivGif 7", "lottie_params": { - "lottie_url": "https://yastatic.net/s3/home/yandex-app/div_test_data/banana.json", + "lottie_url": "https://yastatic.net/s3/home/yandex-app/div_test_data/banana.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -174,7 +174,7 @@ "image_id": "DivGif 8", "lottie_image_text": "DivGif 8", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif28.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif28.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -184,7 +184,7 @@ "image_id": "DivGif 9", "lottie_image_text": "DivGif 9", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif9.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif9.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -194,7 +194,7 @@ "image_id": "DivGif 10", "lottie_image_text": "DivGif 10", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif10.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif10.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -204,7 +204,7 @@ "image_id": "DivGif 11", "lottie_image_text": "DivGif 11", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif11.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif11.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -214,7 +214,7 @@ "image_id": "DivGif 12", "lottie_image_text": "DivGif 12", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif12.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif12.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -224,7 +224,7 @@ "image_id": "DivGif 13", "lottie_image_text": "DivGif 13", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif13.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif13.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -234,7 +234,7 @@ "image_id": "DivGif 14", "lottie_image_text": "DivGif 14", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif14.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif14.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -244,7 +244,7 @@ "image_id": "DivGif 15", "lottie_image_text": "DivGif 15", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif15.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif15.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -254,7 +254,7 @@ "image_id": "DivGif 16", "lottie_image_text": "DivGif 16", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif16.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif16.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -264,7 +264,7 @@ "image_id": "DivGif 17", "lottie_image_text": "DivGif 17", "lottie_params": { - "lottie_url": "" + "lottie_url": "" } }, { @@ -272,7 +272,7 @@ "image_id": "DivGif 18", "lottie_image_text": "DivGif 18", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif18.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif18.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -282,7 +282,7 @@ "image_id": "DivGif 19", "lottie_image_text": "DivGif 19", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif19.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif19.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -292,7 +292,7 @@ "image_id": "DivGif 20", "lottie_image_text": "DivGif 20", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif20.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif20.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -302,7 +302,7 @@ "image_id": "DivGif 21", "lottie_image_text": "DivGif 21", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif21.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif21.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -312,7 +312,7 @@ "image_id": "DivGif 22", "lottie_image_text": "DivGif 22", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif22.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif22.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -322,7 +322,7 @@ "image_id": "DivGif 23", "lottie_image_text": "DivGif 23", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif23.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif23.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -332,7 +332,7 @@ "image_id": "DivGif 24", "lottie_image_text": "DivGif 24", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif24.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif24.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -342,7 +342,7 @@ "image_id": "DivGif 25", "lottie_image_text": "DivGif 25", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif25.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif25.json", "repeat_count": -1, "repeat_mode": "reverse" } @@ -352,7 +352,7 @@ "image_id": "DivGif 26", "lottie_image_text": "DivGif 26", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif26.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif26.json", "repeat_count": -1, "repeat_mode": "restart" } @@ -362,7 +362,7 @@ "image_id": "DivGif 27", "lottie_image_text": "DivGif 27", "lottie_params": { - "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif27.json", + "lottie_url": "https://div-storage.s3.yandex.net/test/lottie/DivGif27.json", "repeat_count": -1, "repeat_mode": "reverse" } diff --git a/test_data/regression_test_data/animations/rive/rive_animation.json b/test_data/regression_test_data/animations/rive/rive_animation.json index 776fd5432..86b62d360 100644 --- a/test_data/regression_test_data/animations/rive/rive_animation.json +++ b/test_data/regression_test_data/animations/rive/rive_animation.json @@ -1,142 +1,142 @@ { "templates": { - "rive_grid": { - "type": "grid", - "paddings": { - "left": 8, - "top": 8, - "right": 8, - "bottom": 8 - }, - "column_count": 2 + "rive_grid": { + "type": "grid", + "paddings": { + "left": 8, + "top": 8, + "right": 8, + "bottom": 8 }, - "rive_custom": { - "type": "custom", - "custom_type": "rive_animation", - "width": { - "type": "match_parent" - }, - "height": { - "type": "match_parent" - }, - "margins": { - "top": 32, - "bottom": 16, - "left": 16, - "right": 16 - }, - "alignment_vertical": "top", - "alignment_horizontal": "center" + "column_count": 2 + }, + "rive_custom": { + "type": "custom", + "custom_type": "rive_animation", + "width": { + "type": "match_parent" }, - "card_title": { - "type": "text", - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center", - "font_size": 14, - "paddings": { - "top": 8 - }, - "font_weight": "medium", - "line_height": 18 + "height": { + "type": "match_parent" }, - "rive_card": { - "type": "container", - "width": { - "type": "fixed", - "value": 150 - }, - "height": { - "type": "fixed", - "value": 250 - }, - "margins": { - "left": 4, - "right": 4, - "bottom": 4, - "top": 4 - }, - "paddings": { - "top": 4, - "right": 2, - "left": 2 - }, - "border": { - "corner_radius": 32, - "unit": "dp" - }, - "background": [ - { - "type": "solid", - "color": "#0e000000" - } - ], - "orientation": "vertical" + "margins": { + "top": 32, + "bottom": 16, + "left": 16, + "right": 16 }, - "rive_animation_card": { - "type": "rive_card", - "items": [ - { - "type": "card_title", - "$text": "rive_card_text" - }, - { - "type": "rive_custom", - "$custom_props": "rive_props" - } - ] - } + "alignment_vertical": "top", + "alignment_horizontal": "center" + }, + "card_title": { + "type": "text", + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center", + "font_size": 14, + "paddings": { + "top": 8 + }, + "font_weight": "medium", + "line_height": 18 + }, + "rive_card": { + "type": "container", + "width": { + "type": "fixed", + "value": 150 + }, + "height": { + "type": "fixed", + "value": 250 + }, + "margins": { + "left": 4, + "right": 4, + "bottom": 4, + "top": 4 + }, + "paddings": { + "top": 4, + "right": 2, + "left": 2 + }, + "border": { + "corner_radius": 32, + "unit": "dp" + }, + "background": [ + { + "type": "solid", + "color": "#0e000000" + } + ], + "orientation": "vertical" + }, + "rive_animation_card": { + "type": "rive_card", + "items": [ + { + "type": "card_title", + "$text": "rive_card_text" + }, + { + "type": "rive_custom", + "$custom_props": "rive_props" + } + ] + } }, "card": { - "log_id": "root", - "states": [ - { - "state_id": 0, - "div": { - "id": "rive_grid", - "type": "rive_grid", - "items": [ - { - "type": "rive_animation_card", - "rive_card_text": "RiveCustom 1", - "rive_props": { - "url": "https://public.rive.app/community/runtime-files/3695-7723-funny-buttom.riv" - } - }, - { - "type": "rive_animation_card", - "rive_card_text": "RiveCustom 2", - "rive_props": { - "url": "https://public.rive.app/community/runtime-files/3370-7083-cup-walk.riv" - } - }, - { - "type": "rive_animation_card", - "rive_card_text": "RiveCustom 3", - "rive_props": { - "url": "https://public.rive.app/community/runtime-files/1414-2763-gang.riv" - } - }, - { - "type": "rive_animation_card", - "rive_card_text": "RiveCustom 4", - "rive_props": { - "url": "https://public.rive.app/community/runtime-files/2193-4329-message-icon.riv" - } - }, - { - "type": "rive_animation_card", - "rive_card_text": "RiveCustom 5", - "rive_props": { - "url": "https://public.rive.app/community/runtime-files/1180-2271-logistics-man-boxes.riv" - } - }, - { - "type": "separator", - "alpha": 0 - } - ] + "log_id": "root", + "states": [ + { + "state_id": 0, + "div": { + "id": "rive_grid", + "type": "rive_grid", + "items": [ + { + "type": "rive_animation_card", + "rive_card_text": "RiveCustom 1", + "rive_props": { + "url": "https://public.rive.app/community/runtime-files/3695-7723-funny-buttom.riv" } - } - ] + }, + { + "type": "rive_animation_card", + "rive_card_text": "RiveCustom 2", + "rive_props": { + "url": "https://public.rive.app/community/runtime-files/3370-7083-cup-walk.riv" + } + }, + { + "type": "rive_animation_card", + "rive_card_text": "RiveCustom 3", + "rive_props": { + "url": "https://public.rive.app/community/runtime-files/1414-2763-gang.riv" + } + }, + { + "type": "rive_animation_card", + "rive_card_text": "RiveCustom 4", + "rive_props": { + "url": "https://public.rive.app/community/runtime-files/2193-4329-message-icon.riv" + } + }, + { + "type": "rive_animation_card", + "rive_card_text": "RiveCustom 5", + "rive_props": { + "url": "https://public.rive.app/community/runtime-files/1180-2271-logistics-man-boxes.riv" + } + }, + { + "type": "separator", + "alpha": 0 + } + ] + } + } + ] } } diff --git a/test_data/regression_test_data/animations/rive/rive_one_shot_loop.json b/test_data/regression_test_data/animations/rive/rive_one_shot_loop.json index a2dc374ef..e4f58d4a6 100644 --- a/test_data/regression_test_data/animations/rive/rive_one_shot_loop.json +++ b/test_data/regression_test_data/animations/rive/rive_one_shot_loop.json @@ -84,4 +84,3 @@ ] } } - diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_dst.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_dst.json index e18553576..e557ec770 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_dst.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_dst.json @@ -114,4 +114,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_src.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_src.json index d08c244e3..3e39ed205 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_src.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_ids_src.json @@ -114,4 +114,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_dst.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_dst.json index 5598ab459..383826646 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_dst.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_dst.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_src.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_src.json index 755a10a0d..3661a245f 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_src.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_sizes_src.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_types_dst.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_types_dst.json index f86d79168..78f5536b3 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_types_dst.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_types_dst.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_diff_types_src.json b/test_data/regression_test_data/animations/transition/change_bounds_diff_types_src.json index d888925b1..0af454ac4 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_diff_types_src.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_diff_types_src.json @@ -98,4 +98,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_same_ids_dst.json b/test_data/regression_test_data/animations/transition/change_bounds_same_ids_dst.json index 7c6366d9c..daf12a6c1 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_same_ids_dst.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_same_ids_dst.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/change_bounds_same_ids_src.json b/test_data/regression_test_data/animations/transition/change_bounds_same_ids_src.json index 4ad53507e..8069152d9 100644 --- a/test_data/regression_test_data/animations/transition/change_bounds_same_ids_src.json +++ b/test_data/regression_test_data/animations/transition/change_bounds_same_ids_src.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/fade_full_dst.json b/test_data/regression_test_data/animations/transition/fade_full_dst.json index b8d7dac31..d6b409510 100644 --- a/test_data/regression_test_data/animations/transition/fade_full_dst.json +++ b/test_data/regression_test_data/animations/transition/fade_full_dst.json @@ -99,4 +99,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/fade_full_src.json b/test_data/regression_test_data/animations/transition/fade_full_src.json index ecb04507f..d63593706 100644 --- a/test_data/regression_test_data/animations/transition/fade_full_src.json +++ b/test_data/regression_test_data/animations/transition/fade_full_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/fade_part_dst.json b/test_data/regression_test_data/animations/transition/fade_part_dst.json index 03949af26..37f2a545a 100644 --- a/test_data/regression_test_data/animations/transition/fade_part_dst.json +++ b/test_data/regression_test_data/animations/transition/fade_part_dst.json @@ -101,4 +101,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/fade_part_src.json b/test_data/regression_test_data/animations/transition/fade_part_src.json index 4cd8b14e4..1674ca2c7 100644 --- a/test_data/regression_test_data/animations/transition/fade_part_src.json +++ b/test_data/regression_test_data/animations/transition/fade_part_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/scale_full_dst.json b/test_data/regression_test_data/animations/transition/scale_full_dst.json index 282c48002..9de7093b5 100644 --- a/test_data/regression_test_data/animations/transition/scale_full_dst.json +++ b/test_data/regression_test_data/animations/transition/scale_full_dst.json @@ -99,4 +99,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/scale_full_src.json b/test_data/regression_test_data/animations/transition/scale_full_src.json index b65817fd7..b50731bbe 100644 --- a/test_data/regression_test_data/animations/transition/scale_full_src.json +++ b/test_data/regression_test_data/animations/transition/scale_full_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/scale_part_dst.json b/test_data/regression_test_data/animations/transition/scale_part_dst.json index 984d7473c..0dcdc1b14 100644 --- a/test_data/regression_test_data/animations/transition/scale_part_dst.json +++ b/test_data/regression_test_data/animations/transition/scale_part_dst.json @@ -101,4 +101,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/scale_part_src.json b/test_data/regression_test_data/animations/transition/scale_part_src.json index cbb1c2085..0a3d17224 100644 --- a/test_data/regression_test_data/animations/transition/scale_part_src.json +++ b/test_data/regression_test_data/animations/transition/scale_part_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/set_dst.json b/test_data/regression_test_data/animations/transition/set_dst.json index 08f00fee2..b2685226e 100644 --- a/test_data/regression_test_data/animations/transition/set_dst.json +++ b/test_data/regression_test_data/animations/transition/set_dst.json @@ -125,4 +125,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/set_src.json b/test_data/regression_test_data/animations/transition/set_src.json index 6d5a91d81..c4edaa23a 100644 --- a/test_data/regression_test_data/animations/transition/set_src.json +++ b/test_data/regression_test_data/animations/transition/set_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/slide_full_dst.json b/test_data/regression_test_data/animations/transition/slide_full_dst.json index 3b221d38f..f6357d382 100644 --- a/test_data/regression_test_data/animations/transition/slide_full_dst.json +++ b/test_data/regression_test_data/animations/transition/slide_full_dst.json @@ -101,4 +101,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/slide_full_src.json b/test_data/regression_test_data/animations/transition/slide_full_src.json index 9b9c883ce..0317d766d 100644 --- a/test_data/regression_test_data/animations/transition/slide_full_src.json +++ b/test_data/regression_test_data/animations/transition/slide_full_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/slide_part_dst.json b/test_data/regression_test_data/animations/transition/slide_part_dst.json index 710dfaba0..afd0be5f7 100644 --- a/test_data/regression_test_data/animations/transition/slide_part_dst.json +++ b/test_data/regression_test_data/animations/transition/slide_part_dst.json @@ -107,4 +107,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/slide_part_src.json b/test_data/regression_test_data/animations/transition/slide_part_src.json index 8b1bff884..f45223468 100644 --- a/test_data/regression_test_data/animations/transition/slide_part_src.json +++ b/test_data/regression_test_data/animations/transition/slide_part_src.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/animations/transition/transition_set.json b/test_data/regression_test_data/animations/transition/transition_set.json index c1ceaac0f..f20ed6782 100644 --- a/test_data/regression_test_data/animations/transition/transition_set.json +++ b/test_data/regression_test_data/animations/transition/transition_set.json @@ -24,10 +24,12 @@ "border": { "corner_radius": 8 }, - "background": [{ - "type": "solid", - "color": "#e0bae3" - }], + "background": [ + { + "type": "solid", + "color": "#e0bae3" + } + ], "$image_url": "album_cover_url", "action_animation": { "name": "no_animation" diff --git a/test_data/regression_test_data/animations/transition/transition_triggers_complex_dst.json b/test_data/regression_test_data/animations/transition/transition_triggers_complex_dst.json index 33d073018..fd7881e81 100644 --- a/test_data/regression_test_data/animations/transition/transition_triggers_complex_dst.json +++ b/test_data/regression_test_data/animations/transition/transition_triggers_complex_dst.json @@ -66,4 +66,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/change_bounds_transition_input.json b/test_data/regression_test_data/change_bounds_transition_input.json index 65ed93343..8aeb7d429 100644 --- a/test_data/regression_test_data/change_bounds_transition_input.json +++ b/test_data/regression_test_data/change_bounds_transition_input.json @@ -1,86 +1,86 @@ { - "templates": { - "input_text_borderless": { - "type": "input", - "width": { - "type": "match_parent" - }, - "height": { - "type": "wrap_content" - }, - "margins": { - "left": 16, - "top": 20, - "right": 16, - "bottom": 16 - }, - "paddings": { - "left": 16, - "top": 10, - "right": 16, - "bottom": 10 - }, - "alignment_horizontal": "center", - "alignment_vertical": "center", - "font_size": 16, - "font_weight": "medium", - "text_color": "#000000", - "hint_color": "#888888", - "highlight_color": "#e0bae3", - "line_height": 22 - }, - "input_text": { - "type": "input_text_borderless", - "background": [ - { - "type": "solid", - "color": "#0e000000" - } - ], - "border": { - "corner_radius": 8 - } - } + "templates": { + "input_text_borderless": { + "type": "input", + "width": { + "type": "match_parent" + }, + "height": { + "type": "wrap_content" + }, + "margins": { + "left": 16, + "top": 20, + "right": 16, + "bottom": 16 + }, + "paddings": { + "left": 16, + "top": 10, + "right": 16, + "bottom": 10 + }, + "alignment_horizontal": "center", + "alignment_vertical": "center", + "font_size": 16, + "font_weight": "medium", + "text_color": "#000000", + "hint_color": "#888888", + "highlight_color": "#e0bae3", + "line_height": 22 }, - "card": { - "log_id": "sample_card", - "variables": [ - { - "name": "my_single_text", - "type": "string", - "value": "This is single-line input" - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "id": "1", - "transition_change": { - "type": "change_bounds", - "duration": 100 - }, - "items": [ - { - "type": "container", - "orientation": "vertical", - "margins": { - "top": 24, - "bottom": 24 - }, - "items": [ - { - "type": "input_text", - "text_variable": "my_single_text", - "keyboard_type": "single_line_text" - } - ] - } - ] - } - } - ] + "input_text": { + "type": "input_text_borderless", + "background": [ + { + "type": "solid", + "color": "#0e000000" + } + ], + "border": { + "corner_radius": 8 + } } + }, + "card": { + "log_id": "sample_card", + "variables": [ + { + "name": "my_single_text", + "type": "string", + "value": "This is single-line input" + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "id": "1", + "transition_change": { + "type": "change_bounds", + "duration": 100 + }, + "items": [ + { + "type": "container", + "orientation": "vertical", + "margins": { + "top": 24, + "bottom": 24 + }, + "items": [ + { + "type": "input_text", + "text_variable": "my_single_text", + "keyboard_type": "single_line_text" + } + ] + } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/container/Item_builder_with_id_override.json b/test_data/regression_test_data/container/Item_builder_with_id_override.json index 96c13d06a..68f5db293 100644 --- a/test_data/regression_test_data/container/Item_builder_with_id_override.json +++ b/test_data/regression_test_data/container/Item_builder_with_id_override.json @@ -1,177 +1,177 @@ { - "templates": { - "number_input": { - "type": "input", - "width": { - "type": "match_parent" - }, - "height": { - "type": "wrap_content" - }, - "paddings": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "margins": { - "left": 16, - "top": 16, - "right": 16, - "bottom": 16 - }, - "border": { - "corner_radius": 8, - "stroke": { - "color": "#0000FF" - } - }, - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } - }, - "button": { - "type": "text", - "paddings": { - "top": 4, - "bottom": 4, - "left": 8, - "right": 8 - }, - "margins": { - "right": 8, - "left": 8 - }, - "text_alignment_horizontal": "center", - "text_alignment_vertical": "center", - "font_size": 12, - "text_color": "#ffff", - "font_weight": "bold", - "height": { - "type": "wrap_content" - }, - "width": { - "type": "match_parent" - }, - "border": { - "corner_radius": 16 - }, - "background": [ - { - "type": "solid", - "color": "#0000FF" - } - ], - "focus": { - "background": [ - { - "type": "solid", - "color": "#ff5500" - } - ] - } + "templates": { + "number_input": { + "type": "input", + "width": { + "type": "match_parent" + }, + "height": { + "type": "wrap_content" + }, + "paddings": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "margins": { + "left": 16, + "top": 16, + "right": 16, + "bottom": 16 + }, + "border": { + "corner_radius": 8, + "stroke": { + "color": "#0000FF" } - }, - "card": { - "log_id": "tests", - "variables": [ - { - "name": "input_value_1", - "type": "string", - "value": "initial_text_1" - }, - { - "name": "input_value_2", - "type": "string", - "value": "initial_text_2" - }, - { - "name": "input_value_3", - "type": "string", - "value": "initial_text_3" - }, - { - "name": "select_value", - "type": "string", - "value": "" - }, - { - "name": "slide_value", - "type": "integer", - "value": 2 - }, - { - "name": "slide_value2", - "type": "integer", - "value": 5 - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "margins": { - "top": 24, - "bottom": 24 - }, - "items": [ - { - "type": "container", - "item_builder": { - "data": [ - { - "id": "input_1" - }, - { - "id": "input_2" - }, - { - "id": "input_3" - } - ], - "prototypes": [ - { - "id": "@{getStringFromDict(it, 'id')}", - "div": { - "type": "number_input", - "id": "input_1", - "text_variable": "input_value_1" - } - } - ] - } - }, - { - "type": "container", - "orientation": "horizontal", - "margins": { - "bottom": 16 - }, - "items": [ - { - "type": "button", - "text": "Focus 2", - "id": "button_2", - "action": { - "log_id": "focus_2", - "typed": { - "type": "focus_element", - "element_id": "input_2" - } - } - } - ] - } - ] - } - } + }, + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } ] + } + }, + "button": { + "type": "text", + "paddings": { + "top": 4, + "bottom": 4, + "left": 8, + "right": 8 + }, + "margins": { + "right": 8, + "left": 8 + }, + "text_alignment_horizontal": "center", + "text_alignment_vertical": "center", + "font_size": 12, + "text_color": "#ffff", + "font_weight": "bold", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "match_parent" + }, + "border": { + "corner_radius": 16 + }, + "background": [ + { + "type": "solid", + "color": "#0000FF" + } + ], + "focus": { + "background": [ + { + "type": "solid", + "color": "#ff5500" + } + ] + } } + }, + "card": { + "log_id": "tests", + "variables": [ + { + "name": "input_value_1", + "type": "string", + "value": "initial_text_1" + }, + { + "name": "input_value_2", + "type": "string", + "value": "initial_text_2" + }, + { + "name": "input_value_3", + "type": "string", + "value": "initial_text_3" + }, + { + "name": "select_value", + "type": "string", + "value": "" + }, + { + "name": "slide_value", + "type": "integer", + "value": 2 + }, + { + "name": "slide_value2", + "type": "integer", + "value": 5 + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "margins": { + "top": 24, + "bottom": 24 + }, + "items": [ + { + "type": "container", + "item_builder": { + "data": [ + { + "id": "input_1" + }, + { + "id": "input_2" + }, + { + "id": "input_3" + } + ], + "prototypes": [ + { + "id": "@{getStringFromDict(it, 'id')}", + "div": { + "type": "number_input", + "id": "input_1", + "text_variable": "input_value_1" + } + } + ] + } + }, + { + "type": "container", + "orientation": "horizontal", + "margins": { + "bottom": 16 + }, + "items": [ + { + "type": "button", + "text": "Focus 2", + "id": "button_2", + "action": { + "log_id": "focus_2", + "typed": { + "type": "focus_element", + "element_id": "input_2" + } + } + } + ] + } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/container/item_builder.json b/test_data/regression_test_data/container/item_builder.json index 52233b24d..b2df69cb8 100644 --- a/test_data/regression_test_data/container/item_builder.json +++ b/test_data/regression_test_data/container/item_builder.json @@ -1,155 +1,155 @@ { - "templates": { - "exampleCard": { - "type": "container", - "border": { - "corner_radius": 16, - "stroke": { - "color": "#aaaaaa", - "width": 1 - } - }, - "margins": { - "bottom": 6 - }, - "orientation": "vertical", - "paddings": { - "top": 12, - "bottom": 12, - "left": 12, - "right": 12 - } + "templates": { + "exampleCard": { + "type": "container", + "border": { + "corner_radius": 16, + "stroke": { + "color": "#aaaaaa", + "width": 1 } - }, - "card": { - "log_id": "prototypes", - "variables": [ + }, + "margins": { + "bottom": 6 + }, + "orientation": "vertical", + "paddings": { + "top": 12, + "bottom": 12, + "left": 12, + "right": 12 + } + } + }, + "card": { + "log_id": "prototypes", + "variables": [ + { + "name": "text_variable", + "type": "string", + "value": "Text displaying the description of the card." + }, + { + "name": "data", + "type": "array", + "value": [ + { + "style": "only_text", + "title": "First text card" + }, + { + "style": "only_text", + "title": "Second text card" + }, + { + "style": "only_text", + "title": "Third text card" + }, + { + "style": "with_image", + "title": "Card with image", + "image_url": "https://yastatic.net/s3/home/divkit/chess.png" + } + ] + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "items": [ { - "name": "text_variable", - "type": "string", - "value": "Text displaying the description of the card." + "type": "exampleCard", + "items": [ + { + "type": "text", + "text": "@{text_variable}" + } + ] }, { - "name": "data", - "type": "array", - "value": [ - { - "style": "only_text", - "title": "First text card" - }, - { - "style": "only_text", - "title": "Second text card" - }, - { - "style": "only_text", - "title": "Third text card" - }, - { - "style": "with_image", - "title": "Card with image", - "image_url": "https://yastatic.net/s3/home/divkit/chess.png" - } - ] - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "items": [ + "type": "container", + "orientation": "vertical", + "item_builder": { + "data": "@{data}", + "data_element_name": "item", + "prototypes": [ + { + "selector": "@{getStringFromDict(item, 'style') == 'only_text'}", + "div": { + "type": "exampleCard", + "actions": [ { - "type": "exampleCard", - "items": [ - { - "type": "text", - "text": "@{text_variable}" - } - ] + "log_id": "check", + "url": "div-action://set_variable?name=text_variable&value=@{getStringFromDict(item, 'title')}" + } + ], + "items": [ + { + "type": "text", + "text": "@{getStringFromDict(item, 'title')}", + "width": { + "type": "wrap_content" + }, + "font_size": 16, + "margins": { + "bottom": 4 + } + } + ], + "width": { + "type": "wrap_content" + } + } + }, + { + "selector": "@{getStringFromDict(item, 'style') == 'with_image'}", + "div": { + "type": "exampleCard", + "actions": [ + { + "log_id": "check", + "url": "div-action://set_variable?name=text_variable&value=@{getStringFromDict(item, 'title')}" + } + ], + "items": [ + { + "type": "image", + "image_url": "@{getStringFromDict(item, 'image_url')}", + "width": { + "type": "fixed", + "value": 50 + }, + "height": { + "type": "fixed", + "value": 50 + } }, { - "type": "container", - "orientation": "vertical", - "item_builder": { - "data": "@{data}", - "data_element_name": "item", - "prototypes": [ - { - "selector": "@{getStringFromDict(item, 'style') == 'only_text'}", - "div": { - "type": "exampleCard", - "actions": [ - { - "log_id": "check", - "url": "div-action://set_variable?name=text_variable&value=@{getStringFromDict(item, 'title')}" - } - ], - "items": [ - { - "type": "text", - "text": "@{getStringFromDict(item, 'title')}", - "width": { - "type": "wrap_content" - }, - "font_size": 16, - "margins": { - "bottom": 4 - } - } - ], - "width": { - "type": "wrap_content" - } - } - }, - { - "selector": "@{getStringFromDict(item, 'style') == 'with_image'}", - "div": { - "type": "exampleCard", - "actions": [ - { - "log_id": "check", - "url": "div-action://set_variable?name=text_variable&value=@{getStringFromDict(item, 'title')}" - } - ], - "items": [ - { - "type": "image", - "image_url": "@{getStringFromDict(item, 'image_url')}", - "width": { - "type": "fixed", - "value": 50 - }, - "height": { - "type": "fixed", - "value": 50 - } - }, - { - "type": "text", - "text": "@{getStringFromDict(item, 'title')}", - "width": { - "type": "wrap_content" - }, - "alignment_vertical": "center", - "font_size": 16, - "margins": { - "left": 4 - } - } - ], - "width": { - "type": "wrap_content" - } - } - } - ] + "type": "text", + "text": "@{getStringFromDict(item, 'title')}", + "width": { + "type": "wrap_content" + }, + "alignment_vertical": "center", + "font_size": 16, + "margins": { + "left": 4 + } + } + ], + "width": { + "type": "wrap_content" + } } - } - ] - } + } + ] + } } - ] - } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/currency_input_mask.json b/test_data/regression_test_data/currency_input_mask.json index 350519396..e23b441ca 100644 --- a/test_data/regression_test_data/currency_input_mask.json +++ b/test_data/regression_test_data/currency_input_mask.json @@ -102,4 +102,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/enter_key_input.json b/test_data/regression_test_data/enter_key_input.json index bdcfb674c..ff085e9f6 100644 --- a/test_data/regression_test_data/enter_key_input.json +++ b/test_data/regression_test_data/enter_key_input.json @@ -64,16 +64,16 @@ "keyboard_type": "single_line_text", "enter_key_type": "search", "enter_key_actions": [ - { - "log_id": "clear focus", - "typed": { - "type": "clear_focus" - } - }, - { - "log_id": "enter_key_tapped", - "url": "div-action://set_variable?name=my_edit_text&value=Search key tapped!" + { + "log_id": "clear focus", + "typed": { + "type": "clear_focus" } + }, + { + "log_id": "enter_key_tapped", + "url": "div-action://set_variable?name=my_edit_text&value=Search key tapped!" + } ] }, { diff --git a/test_data/regression_test_data/fixed_length_input_mask.json b/test_data/regression_test_data/fixed_length_input_mask.json index f0191ef3f..d641dd656 100644 --- a/test_data/regression_test_data/fixed_length_input_mask.json +++ b/test_data/regression_test_data/fixed_length_input_mask.json @@ -308,4 +308,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/fixed_length_phone_input_mask.json b/test_data/regression_test_data/fixed_length_phone_input_mask.json index 8b09d9d9e..82b9034a8 100644 --- a/test_data/regression_test_data/fixed_length_phone_input_mask.json +++ b/test_data/regression_test_data/fixed_length_phone_input_mask.json @@ -265,4 +265,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/gallery/gallery-bottom-multiline-selected-action.json b/test_data/regression_test_data/gallery/gallery-bottom-multiline-selected-action.json index 3e7807883..2665e762c 100644 --- a/test_data/regression_test_data/gallery/gallery-bottom-multiline-selected-action.json +++ b/test_data/regression_test_data/gallery/gallery-bottom-multiline-selected-action.json @@ -130,7 +130,7 @@ }, { "type": "text_block", - "header": "Item 1", + "header": "Item 1", "visibility_actions": [ { "log_id": "106", @@ -147,7 +147,7 @@ }, { "type": "text_block", - "header": "Item 2", + "header": "Item 2", "visibility_actions": [ { "log_id": "206", @@ -164,7 +164,7 @@ }, { "type": "text_block", - "header": "Item 3", + "header": "Item 3", "visibility_actions": [ { "log_id": "306", diff --git a/test_data/regression_test_data/gallery/gallery-bottom-multiline.json b/test_data/regression_test_data/gallery/gallery-bottom-multiline.json index a8d8ea7bd..8e0533259 100644 --- a/test_data/regression_test_data/gallery/gallery-bottom-multiline.json +++ b/test_data/regression_test_data/gallery/gallery-bottom-multiline.json @@ -124,7 +124,7 @@ }, { "type": "text_block", - "header": "Item 1", + "header": "Item 1", "visibility_actions": [ { "log_id": "106", @@ -135,7 +135,7 @@ }, { "type": "text_block", - "header": "Item 2", + "header": "Item 2", "visibility_actions": [ { "log_id": "206", @@ -146,7 +146,7 @@ }, { "type": "text_block", - "header": "Item 3", + "header": "Item 3", "visibility_actions": [ { "log_id": "306", diff --git a/test_data/regression_test_data/gallery/gallery-bottom-singleline.json b/test_data/regression_test_data/gallery/gallery-bottom-singleline.json index b35693f90..ee27fa980 100644 --- a/test_data/regression_test_data/gallery/gallery-bottom-singleline.json +++ b/test_data/regression_test_data/gallery/gallery-bottom-singleline.json @@ -130,7 +130,7 @@ }, { "type": "text_block", - "header": "Item 1", + "header": "Item 1", "visibility_actions": [ { "log_id": "106", @@ -147,7 +147,7 @@ }, { "type": "text_block", - "header": "Item 2", + "header": "Item 2", "visibility_actions": [ { "log_id": "206", @@ -164,7 +164,7 @@ }, { "type": "text_block", - "header": "Item 3", + "header": "Item 3", "visibility_actions": [ { "log_id": "306", diff --git a/test_data/regression_test_data/gallery/gallery-item-actions-typed.json b/test_data/regression_test_data/gallery/gallery-item-actions-typed.json index 92a2b11e0..67b3a928f 100644 --- a/test_data/regression_test_data/gallery/gallery-item-actions-typed.json +++ b/test_data/regression_test_data/gallery/gallery-item-actions-typed.json @@ -715,4 +715,3 @@ ] } } - diff --git a/test_data/regression_test_data/gallery/gallery-item-actions.json b/test_data/regression_test_data/gallery/gallery-item-actions.json index 27ad31bc7..5a88e452d 100644 --- a/test_data/regression_test_data/gallery/gallery-item-actions.json +++ b/test_data/regression_test_data/gallery/gallery-item-actions.json @@ -493,4 +493,3 @@ ] } } - diff --git a/test_data/regression_test_data/gallery/gallery-items-posing.json b/test_data/regression_test_data/gallery/gallery-items-posing.json index fd8716522..313747c06 100644 --- a/test_data/regression_test_data/gallery/gallery-items-posing.json +++ b/test_data/regression_test_data/gallery/gallery-items-posing.json @@ -41,11 +41,13 @@ }, "card": { "log_id": "gallery-paging", - "variables": [{ + "variables": [ + { "name": "text_position", "type": "string", "value": "start" - }], + } + ], "states": [ { "state_id": 0, @@ -96,7 +98,6 @@ "log_limit": 0, "url": "div-action://set_variable?name=text_position&value=start" } - }, { "id": "block_2", @@ -168,4 +169,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/gallery/gallery-top-multiline.json b/test_data/regression_test_data/gallery/gallery-top-multiline.json index 3de26ce22..982cdca56 100644 --- a/test_data/regression_test_data/gallery/gallery-top-multiline.json +++ b/test_data/regression_test_data/gallery/gallery-top-multiline.json @@ -454,7 +454,7 @@ }, { "type": "text_block", - "header": "Item 1", + "header": "Item 1", "visibility_actions": [ { "log_id": "106", @@ -465,7 +465,7 @@ }, { "type": "text_block", - "header": "Item 2", + "header": "Item 2", "visibility_actions": [ { "log_id": "206", @@ -476,7 +476,7 @@ }, { "type": "text_block", - "header": "Item 3", + "header": "Item 3", "visibility_actions": [ { "log_id": "306", diff --git a/test_data/regression_test_data/gallery/gallery_paging_default_item_states.json b/test_data/regression_test_data/gallery/gallery_paging_default_item_states.json index 3d675e0ca..44bce1a54 100644 --- a/test_data/regression_test_data/gallery/gallery_paging_default_item_states.json +++ b/test_data/regression_test_data/gallery/gallery_paging_default_item_states.json @@ -224,7 +224,7 @@ "$url": "text_collapse_action" } ], - "$id" : "expand_id" + "$id": "expand_id" } }, { diff --git a/test_data/regression_test_data/gallery/gallery_swipe_disappear_action.json b/test_data/regression_test_data/gallery/gallery_swipe_disappear_action.json index 571c1a8c2..71af5211e 100644 --- a/test_data/regression_test_data/gallery/gallery_swipe_disappear_action.json +++ b/test_data/regression_test_data/gallery/gallery_swipe_disappear_action.json @@ -131,4 +131,3 @@ ] } } - diff --git a/test_data/regression_test_data/image_shimmer_preview.json b/test_data/regression_test_data/image_shimmer_preview.json index 0c6757471..fbe999838 100644 --- a/test_data/regression_test_data/image_shimmer_preview.json +++ b/test_data/regression_test_data/image_shimmer_preview.json @@ -15,12 +15,10 @@ "width": { "type": "fixed", "value": 300 - }, "height": { "type": "fixed", "value": 300 - }, "extensions": [ { diff --git a/test_data/regression_test_data/input.json b/test_data/regression_test_data/input.json index 22d2edcae..a5a28e400 100644 --- a/test_data/regression_test_data/input.json +++ b/test_data/regression_test_data/input.json @@ -24,16 +24,16 @@ "type": "input", "enter_key_type": "search", "enter_key_actions": [ - { - "log_id": "clear focus", - "typed": { - "type": "clear_focus" - } - }, - { - "log_id": "change_button_1_state", - "url": "div-action://set_variable?name=my_edit_text&value=Enter key tapped! 1" + { + "log_id": "clear focus", + "typed": { + "type": "clear_focus" } + }, + { + "log_id": "change_button_1_state", + "url": "div-action://set_variable?name=my_edit_text&value=Enter key tapped! 1" + } ], "width": { "type": "match_parent" @@ -110,4 +110,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/input_inside_pager.json b/test_data/regression_test_data/input_inside_pager.json index 1f33c9477..78813de0c 100644 --- a/test_data/regression_test_data/input_inside_pager.json +++ b/test_data/regression_test_data/input_inside_pager.json @@ -14,7 +14,7 @@ "div": { "type": "pager", "orientation": "vertical", - "layout_mode":{ + "layout_mode": { "type": "percentage", "page_width": { "type": "percentage", @@ -31,10 +31,10 @@ "margins": { "bottom": 10 }, - "height":{ + "height": { "type": "match_parent" }, - "width":{ + "width": { "type": "match_parent" }, "alignment_vertical": "top", @@ -55,7 +55,8 @@ { "type": "text", "text": "Means 73" - },{ + }, + { "type": "text", "text": "73 is the best number" } @@ -70,4 +71,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/layout_provider_recursive.json b/test_data/regression_test_data/layout_provider_recursive.json index 2c2dd7ca5..f6aa3f046 100644 --- a/test_data/regression_test_data/layout_provider_recursive.json +++ b/test_data/regression_test_data/layout_provider_recursive.json @@ -1,69 +1,69 @@ { - "templates": { - "block": { - "type": "container", - "items": [ - { - "type": "text", - "$text": "text", - "font_size": 16, - "width": { - "type": "wrap_content" - }, - "margins": { - "left": 10, - "right": 10, - "top": 10, - "bottom": 10 - } - } - ], - "background": [ - { - "type": "solid", - "color": "#A0FFA0" - } - ], - "margins": { - "left": 10, - "top": 10 - } - } - }, - "card": { - "log_id": "test", - "variables": [ + "templates": { + "block": { + "type": "container", + "items": [ { - "name": "block1_width", - "type": "integer", - "value": 0 + "type": "text", + "$text": "text", + "font_size": 16, + "width": { + "type": "wrap_content" + }, + "margins": { + "left": 10, + "right": 10, + "top": 10, + "bottom": 10 + } } ], - "states": [ + "background": [ { - "state_id": 0, - "div": { - "type": "container", - "orientation": "horizontal", - "items": [ - { - "type": "block", - "text": "width = match_parent", - "layout_provider": { - "width_variable_name": "block1_width" - } - }, - { - "type": "block", - "text": "width = block1.width x 0.75", - "width": { - "type": "fixed", - "value": "@{block1_width * 3 / 4}" - } - } - ] - } + "type": "solid", + "color": "#A0FFA0" } - ] + ], + "margins": { + "left": 10, + "top": 10 + } } + }, + "card": { + "log_id": "test", + "variables": [ + { + "name": "block1_width", + "type": "integer", + "value": 0 + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "horizontal", + "items": [ + { + "type": "block", + "text": "width = match_parent", + "layout_provider": { + "width_variable_name": "block1_width" + } + }, + { + "type": "block", + "text": "width = block1.width x 0.75", + "width": { + "type": "fixed", + "value": "@{block1_width * 3 / 4}" + } + } + ] + } + } + ] } +} diff --git a/test_data/regression_test_data/logging.json b/test_data/regression_test_data/logging.json index 47ba0e5b5..422fca68a 100644 --- a/test_data/regression_test_data/logging.json +++ b/test_data/regression_test_data/logging.json @@ -41,7 +41,7 @@ }, "card": { "log_id": "simple_tap", - "states": [ + "states": [ { "state_id": 0, "div": { @@ -58,7 +58,7 @@ "log_id": "second_tap", "url": "empty://" } - ], + ], "longtap_actions": [ { "log_id": "first_longtap", @@ -68,7 +68,7 @@ "log_id": "second_longtap", "url": "empty://" } - ], + ], "doubletap_actions": [ { "log_id": "first_doubletap", diff --git a/test_data/regression_test_data/pager/pager.json b/test_data/regression_test_data/pager/pager.json index 8c8ef0d90..1915da4cc 100644 --- a/test_data/regression_test_data/pager/pager.json +++ b/test_data/regression_test_data/pager/pager.json @@ -72,7 +72,6 @@ "log_id": "content_item_show:0", "visibility_percentage": 80, "visibility_duration": 0 - } ] }, diff --git a/test_data/regression_test_data/pager/pager_default_item_states.json b/test_data/regression_test_data/pager/pager_default_item_states.json index caf66475e..73fecd7ce 100644 --- a/test_data/regression_test_data/pager/pager_default_item_states.json +++ b/test_data/regression_test_data/pager/pager_default_item_states.json @@ -227,7 +227,7 @@ "$url": "text_collapse_action" } ], - "$id" : "expand_id" + "$id": "expand_id" } }, { diff --git a/test_data/regression_test_data/pager/pager_infinite_scroll.json b/test_data/regression_test_data/pager/pager_infinite_scroll.json index 9a3cc1e5f..c6286a934 100644 --- a/test_data/regression_test_data/pager/pager_infinite_scroll.json +++ b/test_data/regression_test_data/pager/pager_infinite_scroll.json @@ -7,7 +7,6 @@ "name": "selected", "value": 2 } - ], "states": [ { @@ -15,121 +14,122 @@ "div": { "type": "container", "items": [ - { - "type": "indicator", - "active_item_color": "#000000", - "active_item_size": 1.5, - "height": { - "type": "fixed", - "value": 10 - }, - "margins": { - "top": 10, - "bottom": 10 - }, - "space_between_centers": { - "type": "fixed", - "value": 20 - }, - "inactive_item_color": "#D0D1D9", - "pager_id": "pager", - "shape": { - "type": "rounded_rectangle", - "corner_radius": { - "type": "fixed", - "value": 2 - }, - "item_height": { - "type": "fixed", - "value": 2 - }, - "item_width": { - "type": "fixed", - "value": 10 - } - } + { + "type": "indicator", + "active_item_color": "#000000", + "active_item_size": 1.5, + "height": { + "type": "fixed", + "value": 10 }, - { - "type": "pager", - "default_item": "@{selected}", - "id": "pager", - "layout_mode": { - "type": "percentage", - "page_width": { - "type": "percentage", - "value": 80 - } + "margins": { + "top": 10, + "bottom": 10 + }, + "space_between_centers": { + "type": "fixed", + "value": 20 + }, + "inactive_item_color": "#D0D1D9", + "pager_id": "pager", + "shape": { + "type": "rounded_rectangle", + "corner_radius": { + "type": "fixed", + "value": 2 }, - "orientation": "horizontal", - "infinite_scroll": true, - "item_spacing": { + "item_height": { + "type": "fixed", + "value": 2 + }, + "item_width": { "type": "fixed", "value": 10 - }, - "restrict_parent_scroll": 1, - "items": [ - { - "type": "pager_item_content", - "header_text": "Item 0", - "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", - "content_id": "content_0", - "button_id": "button_0", - "content_expand_action": "div-action://set_state?state_id=0/content_0/expanded", - "content_collapse_action": "div-action://set_state?state_id=0/content_0/collapsed", - "text_expand_action": "div-action://set_state?state_id=0/button_0/text_expand", - "text_collapse_action": "div-action://set_state?state_id=0/button_0/text_collapse", - "selected_actions": [ - { - "log_id": "selected_0", - "url": "div-action://set_variable?name=selected&value=0" - } - ] - }, - { - "id": "blocks_2", - "expand_id": "expand_1", - "type": "pager_item_content", - "header_text": "Item 1", - "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", - "content_id": "content_1", - "button_id": "button_1", - "content_expand_action": "div-action://set_state?state_id=0/content_1/expanded", - "content_collapse_action": "div-action://set_state?state_id=0/content_1/collapsed", - "text_expand_action": "div-action://set_state?state_id=0/button_1/text_expand", - "text_collapse_action": "div-action://set_state?state_id=0/button_1/text_collapse", - "selected_actions": [ - { - "log_id": "selected_1", - "url": "div-action://set_variable?name=selected&value=1" - } - ] - }, - { - "type": "pager_item_content", - "header_text": "Item 2", - "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", - "content_id": "content_2", - "button_id": "button_2", - "content_expand_action": "div-action://set_state?state_id=0/content_2/expanded", - "content_collapse_action": "div-action://set_state?state_id=0/content_2/collapsed", - "text_expand_action": "div-action://set_state?state_id=0/button_2/text_expand", - "text_collapse_action": "div-action://set_state?state_id=0/button_2/text_collapse", - "selected_actions": [ - { - "log_id": "selected_2", - "url": "div-action://set_variable?name=selected&value=2" - } - ] - } - ] - },{ - "type": "text", - "text": "Seleted: @{selected}", - "margins": { - "top": 20 - }, - "text_alignment_horizontal": "center" + } } + }, + { + "type": "pager", + "default_item": "@{selected}", + "id": "pager", + "layout_mode": { + "type": "percentage", + "page_width": { + "type": "percentage", + "value": 80 + } + }, + "orientation": "horizontal", + "infinite_scroll": true, + "item_spacing": { + "type": "fixed", + "value": 10 + }, + "restrict_parent_scroll": 1, + "items": [ + { + "type": "pager_item_content", + "header_text": "Item 0", + "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", + "content_id": "content_0", + "button_id": "button_0", + "content_expand_action": "div-action://set_state?state_id=0/content_0/expanded", + "content_collapse_action": "div-action://set_state?state_id=0/content_0/collapsed", + "text_expand_action": "div-action://set_state?state_id=0/button_0/text_expand", + "text_collapse_action": "div-action://set_state?state_id=0/button_0/text_collapse", + "selected_actions": [ + { + "log_id": "selected_0", + "url": "div-action://set_variable?name=selected&value=0" + } + ] + }, + { + "id": "blocks_2", + "expand_id": "expand_1", + "type": "pager_item_content", + "header_text": "Item 1", + "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", + "content_id": "content_1", + "button_id": "button_1", + "content_expand_action": "div-action://set_state?state_id=0/content_1/expanded", + "content_collapse_action": "div-action://set_state?state_id=0/content_1/collapsed", + "text_expand_action": "div-action://set_state?state_id=0/button_1/text_expand", + "text_collapse_action": "div-action://set_state?state_id=0/button_1/text_collapse", + "selected_actions": [ + { + "log_id": "selected_1", + "url": "div-action://set_variable?name=selected&value=1" + } + ] + }, + { + "type": "pager_item_content", + "header_text": "Item 2", + "item_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", + "content_id": "content_2", + "button_id": "button_2", + "content_expand_action": "div-action://set_state?state_id=0/content_2/expanded", + "content_collapse_action": "div-action://set_state?state_id=0/content_2/collapsed", + "text_expand_action": "div-action://set_state?state_id=0/button_2/text_expand", + "text_collapse_action": "div-action://set_state?state_id=0/button_2/text_collapse", + "selected_actions": [ + { + "log_id": "selected_2", + "url": "div-action://set_variable?name=selected&value=2" + } + ] + } + ] + }, + { + "type": "text", + "text": "Seleted: @{selected}", + "margins": { + "top": 20 + }, + "text_alignment_horizontal": "center" + } ] } } @@ -269,7 +269,7 @@ "$url": "text_collapse_action" } ], - "$id" : "expand_id" + "$id": "expand_id" } }, { @@ -295,5 +295,3 @@ } } } - - diff --git a/test_data/regression_test_data/patch/actions_applied.json b/test_data/regression_test_data/patch/actions_applied.json index add9f51ca..480cd77b4 100644 --- a/test_data/regression_test_data/patch/actions_applied.json +++ b/test_data/regression_test_data/patch/actions_applied.json @@ -46,11 +46,13 @@ }, "card": { "log_id": "alerts_gallery", - "variables": [{ - "type": "string", - "name": "patch_status", - "value": "loading" - }], + "variables": [ + { + "type": "string", + "name": "patch_status", + "value": "loading" + } + ], "states": [ { "state_id": 0, diff --git a/test_data/regression_test_data/patch/actions_failed.json b/test_data/regression_test_data/patch/actions_failed.json index 416bdb405..d8e1288b2 100644 --- a/test_data/regression_test_data/patch/actions_failed.json +++ b/test_data/regression_test_data/patch/actions_failed.json @@ -46,11 +46,13 @@ }, "card": { "log_id": "alerts_gallery", - "variables": [{ - "type": "string", - "name": "patch_status", - "value": "loading" - }], + "variables": [ + { + "type": "string", + "name": "patch_status", + "value": "loading" + } + ], "states": [ { "state_id": 0, diff --git a/test_data/regression_test_data/select.json b/test_data/regression_test_data/select.json index daafa1481..fe0736acb 100644 --- a/test_data/regression_test_data/select.json +++ b/test_data/regression_test_data/select.json @@ -60,18 +60,18 @@ "hint_color": "#888888", "line_height": 22, "options": [ - { - "value": "ru", - "text": "Russia" - }, - { - "value": "uk", - "text": "United Kingdom" - }, - { - "value": "kz" - } - ] + { + "value": "ru", + "text": "Russia" + }, + { + "value": "uk", + "text": "United Kingdom" + }, + { + "value": "kz" + } + ] }, { "type": "text", diff --git a/test_data/regression_test_data/select_with_default.json b/test_data/regression_test_data/select_with_default.json index a2d5af435..601c79a10 100644 --- a/test_data/regression_test_data/select_with_default.json +++ b/test_data/regression_test_data/select_with_default.json @@ -60,18 +60,18 @@ "hint_color": "#888888", "line_height": 22, "options": [ - { - "value": "ru", - "text": "Russia" - }, - { - "value": "uk", - "text": "United Kingdom" - }, - { - "value": "kz" - } - ] + { + "value": "ru", + "text": "Russia" + }, + { + "value": "uk", + "text": "United Kingdom" + }, + { + "value": "kz" + } + ] }, { "type": "text", diff --git a/test_data/regression_test_data/set_visibility.json b/test_data/regression_test_data/set_visibility.json index 081f7f9fe..dd47440d0 100644 --- a/test_data/regression_test_data/set_visibility.json +++ b/test_data/regression_test_data/set_visibility.json @@ -86,10 +86,12 @@ "visibility_duration": 0, "log_limit": 100 }, - "background": [{ - "type": "solid", - "color": "#f1f1f1" - }], + "background": [ + { + "type": "solid", + "color": "#f1f1f1" + } + ], "text": "Visible item", "width": { "type": "match_parent" diff --git a/test_data/regression_test_data/stored_value.json b/test_data/regression_test_data/stored_value.json index 2b755c1b7..17584d5e0 100644 --- a/test_data/regression_test_data/stored_value.json +++ b/test_data/regression_test_data/stored_value.json @@ -60,4 +60,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/timers/common-timer.json b/test_data/regression_test_data/timers/common-timer.json index 34a6061eb..b5aa71930 100644 --- a/test_data/regression_test_data/timers/common-timer.json +++ b/test_data/regression_test_data/timers/common-timer.json @@ -368,4 +368,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/timers/countdown-timer.json b/test_data/regression_test_data/timers/countdown-timer.json index 9c925ecc1..d959e45d4 100644 --- a/test_data/regression_test_data/timers/countdown-timer.json +++ b/test_data/regression_test_data/timers/countdown-timer.json @@ -339,4 +339,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/timers/endless-timer.json b/test_data/regression_test_data/timers/endless-timer.json index 34ce0508b..445be703b 100644 --- a/test_data/regression_test_data/timers/endless-timer.json +++ b/test_data/regression_test_data/timers/endless-timer.json @@ -339,4 +339,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/timers/typed-common-timer.json b/test_data/regression_test_data/timers/typed-common-timer.json index dc8f154ce..23491edf0 100644 --- a/test_data/regression_test_data/timers/typed-common-timer.json +++ b/test_data/regression_test_data/timers/typed-common-timer.json @@ -392,4 +392,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/tooltips-with-tap-outside-properties.json b/test_data/regression_test_data/tooltips-with-tap-outside-properties.json index 598999327..4ca2d28fa 100644 --- a/test_data/regression_test_data/tooltips-with-tap-outside-properties.json +++ b/test_data/regression_test_data/tooltips-with-tap-outside-properties.json @@ -69,7 +69,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, @@ -145,7 +145,6 @@ } ] }, - { "type": "button", "text": "tooltip with tap_outside_actions", @@ -171,7 +170,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, @@ -247,7 +246,6 @@ } ] }, - { "type": "text", "text": "Outside actions called: @{outside_actions_called}", diff --git a/test_data/regression_test_data/typed-tooltips.json b/test_data/regression_test_data/typed-tooltips.json index 1d66b6c17..bde951b7d 100644 --- a/test_data/regression_test_data/typed-tooltips.json +++ b/test_data/regression_test_data/typed-tooltips.json @@ -77,7 +77,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, @@ -165,7 +165,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, @@ -253,7 +253,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, @@ -348,7 +348,7 @@ "x": { "value": 0 }, - "y": { + "y": { "value": 4 } }, diff --git a/test_data/regression_test_data/typed_stored_value.json b/test_data/regression_test_data/typed_stored_value.json index ac8001c12..e2723ddc8 100644 --- a/test_data/regression_test_data/typed_stored_value.json +++ b/test_data/regression_test_data/typed_stored_value.json @@ -122,7 +122,11 @@ "lifetime": 10, "value": { "type": "array", - "value": [1, 2, 3] + "value": [ + 1, + 2, + 3 + ] } } } diff --git a/test_data/regression_test_data/variables/div_image.json b/test_data/regression_test_data/variables/div_image.json index 44c5e6681..b01d7c152 100644 --- a/test_data/regression_test_data/variables/div_image.json +++ b/test_data/regression_test_data/variables/div_image.json @@ -31,7 +31,6 @@ "type": "string", "value": "https://yastatic.net/s3/home/divkit/shape.png" } - ], "log_id": "simple_tap", "states": [ @@ -108,4 +107,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/regression_test_data/variables/div_tabs.json b/test_data/regression_test_data/variables/div_tabs.json index 7f628b37e..42f38cd6a 100644 --- a/test_data/regression_test_data/variables/div_tabs.json +++ b/test_data/regression_test_data/variables/div_tabs.json @@ -9,10 +9,12 @@ "type": "fixed", "value": 28 }, - "background": [{ - "type": "solid", - "color": "#f5f5f5" - }], + "background": [ + { + "type": "solid", + "color": "#f5f5f5" + } + ], "paddings": { "top": 3, "bottom": 3 diff --git a/test_data/regression_test_data/variables/div_variable_trigger_loops.json b/test_data/regression_test_data/variables/div_variable_trigger_loops.json index 3561e1ac5..5da4e4169 100644 --- a/test_data/regression_test_data/variables/div_variable_trigger_loops.json +++ b/test_data/regression_test_data/variables/div_variable_trigger_loops.json @@ -154,7 +154,6 @@ "type": "string", "value": "" }, - { "name": "red_int", "type": "integer", @@ -165,7 +164,6 @@ "type": "string", "value": "0" }, - { "name": "green_int", "type": "integer", @@ -176,7 +174,6 @@ "type": "string", "value": "0" }, - { "name": "blue_int", "type": "integer", @@ -187,7 +184,6 @@ "type": "string", "value": "0" }, - { "name": "sky_blue", "type": "color", diff --git a/test_data/regression_test_data/video/video_aspect.json b/test_data/regression_test_data/video/video_aspect.json index 591fc2ef4..121872049 100644 --- a/test_data/regression_test_data/video/video_aspect.json +++ b/test_data/regression_test_data/video/video_aspect.json @@ -1,78 +1,78 @@ { - "templates": { - "video_item": { - "type": "container", - "width": { - "type": "match_parent", - "weight": 1 - }, - "items": [ - { - "type": "text", - "$text": "text", - "font_size": 20 - }, - { - "type": "video", - "height": { - "type": "fixed", - "value": 50 - }, - "video_sources": [ - { - "type": "video_source", - "url": "https://yastatic.net/s3/home/divkit/bears.mp4", - "mime_type": "video/mp4" - } - ], - "preload_required": true, - "repeatable": true, - "autostart": true, - "muted": true, - "background": [ - { - "type": "solid", - "color": "#000000" - } - ], - "aspect": { - "$ratio": "ratio" - } - } - ] - } - }, - "card": { - "log_id": "video", - "states": [ + "templates": { + "video_item": { + "type": "container", + "width": { + "type": "match_parent", + "weight": 1 + }, + "items": [ + { + "type": "text", + "$text": "text", + "font_size": 20 + }, + { + "type": "video", + "height": { + "type": "fixed", + "value": 50 + }, + "video_sources": [ { - "state_id": 0, - "div": { - "type": "grid", - "column_count": 2, - "items": [ - { - "type": "video_item", - "text": "Default" - }, - { - "type": "video_item", - "text": "1:1", - "ratio": 1 - }, - { - "type": "video_item", - "text": "2:1", - "ratio": 2 - }, - { - "type": "video_item", - "text": "1:2", - "ratio": 0.5 - } - ] - } + "type": "video_source", + "url": "https://yastatic.net/s3/home/divkit/bears.mp4", + "mime_type": "video/mp4" } - ] + ], + "preload_required": true, + "repeatable": true, + "autostart": true, + "muted": true, + "background": [ + { + "type": "solid", + "color": "#000000" + } + ], + "aspect": { + "$ratio": "ratio" + } + } + ] } + }, + "card": { + "log_id": "video", + "states": [ + { + "state_id": 0, + "div": { + "type": "grid", + "column_count": 2, + "items": [ + { + "type": "video_item", + "text": "Default" + }, + { + "type": "video_item", + "text": "1:1", + "ratio": 1 + }, + { + "type": "video_item", + "text": "2:1", + "ratio": 2 + }, + { + "type": "video_item", + "text": "1:2", + "ratio": 0.5 + } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/video/video_scale.json b/test_data/regression_test_data/video/video_scale.json index 4aa12bb04..221bc21b8 100644 --- a/test_data/regression_test_data/video/video_scale.json +++ b/test_data/regression_test_data/video/video_scale.json @@ -1,73 +1,76 @@ { - "templates": { - "video_item": { - "type": "container", - "width": { - "type": "match_parent", - "weight": 1 - }, - "items": [{ - "type": "text", - "$text": "text", - "font_size": 20 - }, { - "type": "video", - "video_sources": [ - { - "type": "video_source", - "url": "https://yastatic.net/s3/home/divkit/bears.mp4", - "mime_type": "video/mp4" - } - ], - "preload_required": true, - "repeatable": true, - "autostart": true, - "muted": true, - "height": { - "type": "fixed", - "value": 200 - }, - "background": [ - { - "type": "solid", - "color": "#000000" - } - ], - "$scale": "scale" - }] - } - }, - "card": { - "log_id": "video", - "states": [ + "templates": { + "video_item": { + "type": "container", + "width": { + "type": "match_parent", + "weight": 1 + }, + "items": [ + { + "type": "text", + "$text": "text", + "font_size": 20 + }, + { + "type": "video", + "video_sources": [ { - "state_id": 0, - "div": { - "type": "grid", - "column_count": 2, - "items": [ - { - "type": "video_item", - "text": "Default" - }, - { - "type": "video_item", - "text": "fill", - "scale": "fill" - }, - { - "type": "video_item", - "text": "no_scale", - "scale": "no_scale" - }, - { - "type": "video_item", - "text": "fit", - "scale": "fit" - } - ] - } + "type": "video_source", + "url": "https://yastatic.net/s3/home/divkit/bears.mp4", + "mime_type": "video/mp4" } - ] + ], + "preload_required": true, + "repeatable": true, + "autostart": true, + "muted": true, + "height": { + "type": "fixed", + "value": 200 + }, + "background": [ + { + "type": "solid", + "color": "#000000" + } + ], + "$scale": "scale" + } + ] } + }, + "card": { + "log_id": "video", + "states": [ + { + "state_id": 0, + "div": { + "type": "grid", + "column_count": 2, + "items": [ + { + "type": "video_item", + "text": "Default" + }, + { + "type": "video_item", + "text": "fill", + "scale": "fill" + }, + { + "type": "video_item", + "text": "no_scale", + "scale": "no_scale" + }, + { + "type": "video_item", + "text": "fit", + "scale": "fit" + } + ] + } + } + ] + } } diff --git a/test_data/regression_test_data/visibility_actions/pager.json b/test_data/regression_test_data/visibility_actions/pager.json index 8079d867d..5672b3720 100644 --- a/test_data/regression_test_data/visibility_actions/pager.json +++ b/test_data/regression_test_data/visibility_actions/pager.json @@ -57,7 +57,7 @@ "state_id": 0, "div": { "type": "container", - "text":"Item ", + "text": "Item ", "background": [ { "type": "solid", diff --git a/test_data/regression_test_data/visibility_actions/pager_selected_actions.json b/test_data/regression_test_data/visibility_actions/pager_selected_actions.json index 507b70dfe..e30fb1044 100644 --- a/test_data/regression_test_data/visibility_actions/pager_selected_actions.json +++ b/test_data/regression_test_data/visibility_actions/pager_selected_actions.json @@ -90,4 +90,3 @@ ] } } - diff --git a/test_data/samples/base/alpha.json b/test_data/samples/base/alpha.json index c7549e629..1c9ae9b94 100644 --- a/test_data/samples/base/alpha.json +++ b/test_data/samples/base/alpha.json @@ -70,7 +70,8 @@ "image_url": "https://yastatic.net/s3/home/yandex-app/div_demo/containers.png" } ] - },{ + }, + { "type": "subtitle", "text": "The transparency of the first image is 1 and the second is 0.5." } diff --git a/test_data/samples/base/background.json b/test_data/samples/base/background.json index cad8f94d6..75e07032c 100644 --- a/test_data/samples/base/background.json +++ b/test_data/samples/base/background.json @@ -47,7 +47,7 @@ "states": [ { "state_id": 0, - "div":{ + "div": { "type": "container", "orientation": "vertical", "margins": { diff --git a/test_data/samples/container/horizontal.json b/test_data/samples/container/horizontal.json index 3eece5606..881d7b22b 100644 --- a/test_data/samples/container/horizontal.json +++ b/test_data/samples/container/horizontal.json @@ -94,7 +94,9 @@ "type": "match_parent", "weight": 1 }, - "margins": {"left": 2} + "margins": { + "left": 2 + } }, { "type": "text_block", @@ -103,12 +105,16 @@ "type": "match_parent", "weight": 2 }, - "margins": {"left": 2} + "margins": { + "left": 2 + } }, { "type": "text_block", "text": "wrap_content", - "margins": {"left": 2} + "margins": { + "left": 2 + } } ] } diff --git a/test_data/samples/image/scale.json b/test_data/samples/image/scale.json index 850aa33dc..52580c5c0 100644 --- a/test_data/samples/image/scale.json +++ b/test_data/samples/image/scale.json @@ -139,7 +139,7 @@ "end": 40 }, "width": { - "type":"fixed", + "type": "fixed", "value": 100 } }, diff --git a/test_data/samples/input/text_input.json b/test_data/samples/input/text_input.json index 913786ca0..16ebe1e97 100644 --- a/test_data/samples/input/text_input.json +++ b/test_data/samples/input/text_input.json @@ -143,16 +143,16 @@ "keyboard_type": "single_line_text", "enter_key_type": "done", "enter_key_actions": [ - { - "log_id": "clear focus", - "typed": { - "type": "clear_focus" - } - }, - { - "log_id": "change_button_1_state", - "url": "div-action://set_variable?name=my_single_text&value=Enter key tapped!" + { + "log_id": "clear focus", + "typed": { + "type": "clear_focus" } + }, + { + "log_id": "change_button_1_state", + "url": "div-action://set_variable?name=my_single_text&value=Enter key tapped!" + } ] }, { diff --git a/test_data/samples/pager/pager_with_indicator.json b/test_data/samples/pager/pager_with_indicator.json index aae162962..dc6749ff8 100644 --- a/test_data/samples/pager/pager_with_indicator.json +++ b/test_data/samples/pager/pager_with_indicator.json @@ -54,7 +54,7 @@ "states": [ { "state_id": 0, - "div":{ + "div": { "type": "container", "orientation": "vertical", "margins": { diff --git a/test_data/snapshot_test_data/div-container/corners_radius.json b/test_data/snapshot_test_data/div-container/corners_radius.json index 185580358..dfae42420 100644 --- a/test_data/snapshot_test_data/div-container/corners_radius.json +++ b/test_data/snapshot_test_data/div-container/corners_radius.json @@ -62,4 +62,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/fixed-size-with-paddings.json b/test_data/snapshot_test_data/div-container/fixed-size-with-paddings.json index f3758adeb..cc393197e 100644 --- a/test_data/snapshot_test_data/div-container/fixed-size-with-paddings.json +++ b/test_data/snapshot_test_data/div-container/fixed-size-with-paddings.json @@ -56,4 +56,3 @@ }, "templates": {} } - diff --git a/test_data/snapshot_test_data/div-container/horizontal-match-parent-inside-wrap-content-on-cross-axis.json b/test_data/snapshot_test_data/div-container/horizontal-match-parent-inside-wrap-content-on-cross-axis.json index c020827b8..a268b3c11 100644 --- a/test_data/snapshot_test_data/div-container/horizontal-match-parent-inside-wrap-content-on-cross-axis.json +++ b/test_data/snapshot_test_data/div-container/horizontal-match-parent-inside-wrap-content-on-cross-axis.json @@ -95,4 +95,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-container/horizontal-orientation-alignments.json b/test_data/snapshot_test_data/div-container/horizontal-orientation-alignments.json index 27592ef10..8e999b999 100644 --- a/test_data/snapshot_test_data/div-container/horizontal-orientation-alignments.json +++ b/test_data/snapshot_test_data/div-container/horizontal-orientation-alignments.json @@ -133,4 +133,3 @@ } } } - diff --git a/test_data/snapshot_test_data/div-container/known-match-parent-cross-axis.json b/test_data/snapshot_test_data/div-container/known-match-parent-cross-axis.json index 54ac2adeb..42295d617 100644 --- a/test_data/snapshot_test_data/div-container/known-match-parent-cross-axis.json +++ b/test_data/snapshot_test_data/div-container/known-match-parent-cross-axis.json @@ -6,8 +6,7 @@ "web", "flutter" ], - "templates": { - }, + "templates": {}, "card": { "log_id": "div2_sample_card", "states": [ diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bc.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bc.json index af56a6209..80ad72607 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bc.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bc.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bl.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bl.json index d8a78cc3b..e0f080547 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bl.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-bl.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-br.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-br.json index 07563ac28..da64e402e 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-br.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-br.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cc.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cc.json index f5560c48a..d7516c7e8 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cc.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cc.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cl.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cl.json index 3406daa9c..185dd4d6f 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cl.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cl.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cr.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cr.json index b1225cc64..88c7b2eac 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cr.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-cr.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tc.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tc.json index 161925735..933e378b8 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tc.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tc.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tl.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tl.json index 6825178c4..c0445aac1 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tl.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tl.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tr.json b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tr.json index ce9d93e10..9652682d1 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tr.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-custom-alignments-tr.json @@ -122,4 +122,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/overlap-orientation-default-alignments.json b/test_data/snapshot_test_data/div-container/overlap-orientation-default-alignments.json index 5c3ccf19a..9e6fb93ba 100644 --- a/test_data/snapshot_test_data/div-container/overlap-orientation-default-alignments.json +++ b/test_data/snapshot_test_data/div-container/overlap-orientation-default-alignments.json @@ -168,4 +168,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-container/unknown-match-parent-cross-axis.json b/test_data/snapshot_test_data/div-container/unknown-match-parent-cross-axis.json index d14ae52da..bd9e1ce5b 100644 --- a/test_data/snapshot_test_data/div-container/unknown-match-parent-cross-axis.json +++ b/test_data/snapshot_test_data/div-container/unknown-match-parent-cross-axis.json @@ -6,8 +6,7 @@ "web", "flutter" ], - "templates": { - }, + "templates": {}, "card": { "log_id": "div2_sample_card", "states": [ diff --git a/test_data/snapshot_test_data/div-container/vertical-orientation-alignments.json b/test_data/snapshot_test_data/div-container/vertical-orientation-alignments.json index e5c2530cd..8c6a55c6f 100644 --- a/test_data/snapshot_test_data/div-container/vertical-orientation-alignments.json +++ b/test_data/snapshot_test_data/div-container/vertical-orientation-alignments.json @@ -132,4 +132,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-gallery/horizontal-grid-gallery-wrapped-item-spacing.json b/test_data/snapshot_test_data/div-gallery/horizontal-grid-gallery-wrapped-item-spacing.json index 7fd67a7ef..88b6bef89 100644 --- a/test_data/snapshot_test_data/div-gallery/horizontal-grid-gallery-wrapped-item-spacing.json +++ b/test_data/snapshot_test_data/div-gallery/horizontal-grid-gallery-wrapped-item-spacing.json @@ -131,4 +131,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-gallery/rtl_gallery.json b/test_data/snapshot_test_data/div-gallery/rtl_gallery.json index 27574e76c..bb02aca04 100644 --- a/test_data/snapshot_test_data/div-gallery/rtl_gallery.json +++ b/test_data/snapshot_test_data/div-gallery/rtl_gallery.json @@ -112,4 +112,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-gif-image/border-with-stroke.json b/test_data/snapshot_test_data/div-gif-image/border-with-stroke.json index 17067084a..ae4c55a00 100644 --- a/test_data/snapshot_test_data/div-gif-image/border-with-stroke.json +++ b/test_data/snapshot_test_data/div-gif-image/border-with-stroke.json @@ -29,4 +29,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-gif-image/corner-radius.json b/test_data/snapshot_test_data/div-gif-image/corner-radius.json index cd0dd43fc..7e6f452c6 100644 --- a/test_data/snapshot_test_data/div-gif-image/corner-radius.json +++ b/test_data/snapshot_test_data/div-gif-image/corner-radius.json @@ -35,4 +35,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-gif-image/shadow.json b/test_data/snapshot_test_data/div-gif-image/shadow.json index 42e57db0d..ce1b2f557 100644 --- a/test_data/snapshot_test_data/div-gif-image/shadow.json +++ b/test_data/snapshot_test_data/div-gif-image/shadow.json @@ -43,4 +43,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-grid/content-not-fit-with-paddings.json b/test_data/snapshot_test_data/div-grid/content-not-fit-with-paddings.json index 4b40e99a8..1442c8146 100644 --- a/test_data/snapshot_test_data/div-grid/content-not-fit-with-paddings.json +++ b/test_data/snapshot_test_data/div-grid/content-not-fit-with-paddings.json @@ -93,4 +93,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-grid/examples/example_7.json b/test_data/snapshot_test_data/div-grid/examples/example_7.json index 46f51e514..7e8e5105a 100644 --- a/test_data/snapshot_test_data/div-grid/examples/example_7.json +++ b/test_data/snapshot_test_data/div-grid/examples/example_7.json @@ -116,4 +116,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-grid/fixed-size-with-paddings.json b/test_data/snapshot_test_data/div-grid/fixed-size-with-paddings.json index e1c8647a6..9ccadee7b 100644 --- a/test_data/snapshot_test_data/div-grid/fixed-size-with-paddings.json +++ b/test_data/snapshot_test_data/div-grid/fixed-size-with-paddings.json @@ -95,4 +95,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-grid/intrinsic-size-with-max-size.json b/test_data/snapshot_test_data/div-grid/intrinsic-size-with-max-size.json index a614b0e08..8b9180ef4 100644 --- a/test_data/snapshot_test_data/div-grid/intrinsic-size-with-max-size.json +++ b/test_data/snapshot_test_data/div-grid/intrinsic-size-with-max-size.json @@ -1,129 +1,129 @@ { - "description": "Grid block with max_size property", - "platforms": [ - "android", - "ios", - "web" + "description": "Grid block with max_size property", + "platforms": [ + "android", + "ios", + "web" + ], + "card": { + "log_id": "div_grid_card", + "variables": [ + { + "name": "fixed_width", + "type": "integer", + "value": 200 + }, + { + "name": "fixed_height", + "type": "integer", + "value": 100 + } ], - "card": { - "log_id": "div_grid_card", - "variables": [ + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "height": { + "type": "wrap_content" + }, + "items": [ { - "name": "fixed_width", - "type": "integer", - "value": 200 + "type": "text", + "text": "Grid with max_size", + "font_size": 20, + "margins": { + "bottom": 12 + } }, { - "name": "fixed_height", - "type": "integer", - "value": 100 - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "height": { - "type": "wrap_content" - }, - "items": [ - { - "type": "text", - "text": "Grid with max_size", - "font_size": 20, - "margins": { - "bottom": 12 - } - }, - { - "type": "container", - "orientation": "overlap", - "items": [ - { - "type": "text", - "text": "Grid size without max_size", - "font_size": 11, - "text_alignment_vertical": "bottom", - "paddings": { - "bottom": 3, - "left": 4 - }, - "height": { - "type": "fixed", - "value": "@{fixed_height}" - }, - "width": { - "type": "fixed", - "value": "@{fixed_width}" - }, - "background": [ - { - "type": "solid", - "color": "#eef" - } - ], - "border": { - "stroke": { - "color": "#aaf", - "width": 3 - } - } - }, - { - "type": "grid", - "column_count": 1, - "background": [ - { - "type": "solid", - "color": "#fae695" - } - ], - "height": { - "type": "wrap_content", - "max_size": { - "value": "@{fixed_height / 2}" - } - }, - "width": { - "type": "wrap_content", - "max_size": { - "value": "@{fixed_width / 2}" - } - }, - "items": [ - { - "type": "text", - "text": "Grid size with\n max_size", - "font_size": 11, - "text_alignment_vertical": "top", - "paddings": { - "top": 4, - "left": 4 - }, - "height": { - "type": "fixed", - "value": "@{fixed_height}" - }, - "width": { - "type": "fixed", - "value": "@{fixed_width}" - }, - "border": { - "stroke": { - "color": "#FA4", - "width": 3 - } - } - } - ] - } - ] + "type": "container", + "orientation": "overlap", + "items": [ + { + "type": "text", + "text": "Grid size without max_size", + "font_size": 11, + "text_alignment_vertical": "bottom", + "paddings": { + "bottom": 3, + "left": 4 + }, + "height": { + "type": "fixed", + "value": "@{fixed_height}" + }, + "width": { + "type": "fixed", + "value": "@{fixed_width}" + }, + "background": [ + { + "type": "solid", + "color": "#eef" + } + ], + "border": { + "stroke": { + "color": "#aaf", + "width": 3 + } + } + }, + { + "type": "grid", + "column_count": 1, + "background": [ + { + "type": "solid", + "color": "#fae695" + } + ], + "height": { + "type": "wrap_content", + "max_size": { + "value": "@{fixed_height / 2}" + } + }, + "width": { + "type": "wrap_content", + "max_size": { + "value": "@{fixed_width / 2}" + } + }, + "items": [ + { + "type": "text", + "text": "Grid size with\n max_size", + "font_size": 11, + "text_alignment_vertical": "top", + "paddings": { + "top": 4, + "left": 4 + }, + "height": { + "type": "fixed", + "value": "@{fixed_height}" + }, + "width": { + "type": "fixed", + "value": "@{fixed_width}" + }, + "border": { + "stroke": { + "color": "#FA4", + "width": 3 } - ] + } + } + ] } + ] } - ] - } + ] + } + } + ] + } } diff --git a/test_data/snapshot_test_data/div-grid/intrinsic-size-with-min-size.json b/test_data/snapshot_test_data/div-grid/intrinsic-size-with-min-size.json index 8df3ea008..2de6b2fb7 100644 --- a/test_data/snapshot_test_data/div-grid/intrinsic-size-with-min-size.json +++ b/test_data/snapshot_test_data/div-grid/intrinsic-size-with-min-size.json @@ -1,136 +1,136 @@ { - "description": "Grid block with min_size properties", - "platforms": [ - "android", - "ios", - "web" + "description": "Grid block with min_size properties", + "platforms": [ + "android", + "ios", + "web" + ], + "card": { + "log_id": "div_grid_card", + "variables": [ + { + "name": "fixed_width", + "type": "integer", + "value": 100 + }, + { + "name": "fixed_height", + "type": "integer", + "value": 50 + } ], - "card": { - "log_id": "div_grid_card", - "variables": [ + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "height": { + "type": "wrap_content" + }, + "items": [ { - "name": "fixed_width", - "type": "integer", - "value": 100 + "type": "text", + "text": "Grid with min_size", + "font_size": 20, + "margins": { + "bottom": 12 + } }, { - "name": "fixed_height", - "type": "integer", - "value": 50 - } - ], - "states": [ - { - "state_id": 0, - "div": { - "type": "container", - "orientation": "vertical", - "height": { - "type": "wrap_content" - }, - "items": [ - { - "type": "text", - "text": "Grid with min_size", - "font_size": 20, - "margins": { - "bottom": 12 - } - }, - { - "type": "container", - "orientation": "overlap", - "height": { - "type": "wrap_content" - }, - "width": { - "type": "wrap_content" - }, - "items": [ - { - "type": "grid", - "column_count": 1, - "content_alignment_vertical": "bottom", - "border": { - "stroke": { - "color": "#FA4", - "width": 3 - } - }, - "background": [ - { - "type": "solid", - "color": "#fae695" - } - ], - "height": { - "type": "wrap_content", - "min_size": { - "value": "@{fixed_height * 2}" - } - }, - "width": { - "type": "wrap_content", - "min_size": { - "value": "@{fixed_width * 2}" - } - }, - "items": [ - { - "type": "text", - "text": "Grid size with min_size", - "font_size": 11, - "text_alignment_vertical": "bottom", - "height": { - "type": "fixed", - "value": "@{fixed_height}" - }, - "width": { - "type": "fixed", - "value": "@{fixed_width}" - }, - "paddings": { - "bottom": 3, - "left": 4 - } - } - ] - }, - { - "type": "text", - "text": "Grid size without min_size", - "text_alignment_vertical": "bottom", - "font_size": 11, - "paddings": { - "bottom": 3, - "left": 4 - }, - "height": { - "type": "fixed", - "value": "@{fixed_height}" - }, - "width": { - "type": "fixed", - "value": "@{fixed_width}" - }, - "border": { - "stroke": { - "color": "#aaf", - "width": 3 - } - }, - "background": [ - { - "type": "solid", - "color": "#eef" - } - ] - } - ] - } - ] + "type": "container", + "orientation": "overlap", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "wrap_content" + }, + "items": [ + { + "type": "grid", + "column_count": 1, + "content_alignment_vertical": "bottom", + "border": { + "stroke": { + "color": "#FA4", + "width": 3 + } + }, + "background": [ + { + "type": "solid", + "color": "#fae695" + } + ], + "height": { + "type": "wrap_content", + "min_size": { + "value": "@{fixed_height * 2}" + } + }, + "width": { + "type": "wrap_content", + "min_size": { + "value": "@{fixed_width * 2}" + } + }, + "items": [ + { + "type": "text", + "text": "Grid size with min_size", + "font_size": 11, + "text_alignment_vertical": "bottom", + "height": { + "type": "fixed", + "value": "@{fixed_height}" + }, + "width": { + "type": "fixed", + "value": "@{fixed_width}" + }, + "paddings": { + "bottom": 3, + "left": 4 + } + } + ] + }, + { + "type": "text", + "text": "Grid size without min_size", + "text_alignment_vertical": "bottom", + "font_size": 11, + "paddings": { + "bottom": 3, + "left": 4 + }, + "height": { + "type": "fixed", + "value": "@{fixed_height}" + }, + "width": { + "type": "fixed", + "value": "@{fixed_width}" + }, + "border": { + "stroke": { + "color": "#aaf", + "width": 3 + } + }, + "background": [ + { + "type": "solid", + "color": "#eef" + } + ] } + ] } - ] - } + ] + } + } + ] + } } diff --git a/test_data/snapshot_test_data/div-image/blur.json b/test_data/snapshot_test_data/div-image/blur.json index 7bf946c1c..a3b496739 100644 --- a/test_data/snapshot_test_data/div-image/blur.json +++ b/test_data/snapshot_test_data/div-image/blur.json @@ -71,4 +71,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-image/border-with-stroke.json b/test_data/snapshot_test_data/div-image/border-with-stroke.json index 3b342b40c..290200131 100644 --- a/test_data/snapshot_test_data/div-image/border-with-stroke.json +++ b/test_data/snapshot_test_data/div-image/border-with-stroke.json @@ -30,4 +30,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-image/corner-radius.json b/test_data/snapshot_test_data/div-image/corner-radius.json index cf5177a73..91393fab5 100644 --- a/test_data/snapshot_test_data/div-image/corner-radius.json +++ b/test_data/snapshot_test_data/div-image/corner-radius.json @@ -36,4 +36,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-image/corners_radius.json b/test_data/snapshot_test_data/div-image/corners_radius.json index 483d0fe94..8ce94b106 100644 --- a/test_data/snapshot_test_data/div-image/corners_radius.json +++ b/test_data/snapshot_test_data/div-image/corners_radius.json @@ -41,4 +41,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-image/shadow.json b/test_data/snapshot_test_data/div-image/shadow.json index ee41ce547..dd2250873 100644 --- a/test_data/snapshot_test_data/div-image/shadow.json +++ b/test_data/snapshot_test_data/div-image/shadow.json @@ -44,4 +44,3 @@ ] } } - diff --git a/test_data/snapshot_test_data/div-radial-gradient/fixed-center-negative.json b/test_data/snapshot_test_data/div-radial-gradient/fixed-center-negative.json index fed3f6f89..0b9a5348f 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/fixed-center-negative.json +++ b/test_data/snapshot_test_data/div-radial-gradient/fixed-center-negative.json @@ -59,4 +59,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/fixed-center-positive.json b/test_data/snapshot_test_data/div-radial-gradient/fixed-center-positive.json index 01ed1bb1d..2d6d43e1d 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/fixed-center-positive.json +++ b/test_data/snapshot_test_data/div-radial-gradient/fixed-center-positive.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/relative-center-positive.json b/test_data/snapshot_test_data/div-radial-gradient/relative-center-positive.json index bfcfffb79..e5449424f 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/relative-center-positive.json +++ b/test_data/snapshot_test_data/div-radial-gradient/relative-center-positive.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-corner.json b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-corner.json index 7e61dae78..56c4897d3 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-corner.json +++ b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-corner.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-side.json b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-side.json index 2c539b15a..acdd0e159 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-side.json +++ b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-farthest-side.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-corner.json b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-corner.json index 4f73d30b0..c8b76d3ec 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-corner.json +++ b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-corner.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-side.json b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-side.json index bb6733156..e51a97238 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-side.json +++ b/test_data/snapshot_test_data/div-radial-gradient/relative-radius-nearest-side.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-radial-gradient/zero-radius.json b/test_data/snapshot_test_data/div-radial-gradient/zero-radius.json index 781242566..54e4cdab4 100644 --- a/test_data/snapshot_test_data/div-radial-gradient/zero-radius.json +++ b/test_data/snapshot_test_data/div-radial-gradient/zero-radius.json @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/snapshot_test_data/div-separator/big_corner_radius.json b/test_data/snapshot_test_data/div-separator/big_corner_radius.json index ce3411398..a5d0605b4 100644 --- a/test_data/snapshot_test_data/div-separator/big_corner_radius.json +++ b/test_data/snapshot_test_data/div-separator/big_corner_radius.json @@ -45,5 +45,3 @@ ] } } - - \ No newline at end of file diff --git a/test_data/snapshot_test_data/div-text/underline.json b/test_data/snapshot_test_data/div-text/underline.json index 7f7871d01..a3027caf9 100644 --- a/test_data/snapshot_test_data/div-text/underline.json +++ b/test_data/snapshot_test_data/div-text/underline.json @@ -74,4 +74,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_empty.json b/test_data/template_test_data/array/test_array_empty.json index 67c4ce6ae..05ac631f7 100644 --- a/test_data/template_test_data/array/test_array_empty.json +++ b/test_data/template_test_data/array/test_array_empty.json @@ -8,4 +8,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_invalid_items.json b/test_data/template_test_data/array/test_array_invalid_items.json index 816470ae8..70e0d585f 100644 --- a/test_data/template_test_data/array/test_array_invalid_items.json +++ b/test_data/template_test_data/array/test_array_invalid_items.json @@ -10,4 +10,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_missing_data.json b/test_data/template_test_data/array/test_array_missing_data.json index b5566999f..ca13d6d52 100644 --- a/test_data/template_test_data/array/test_array_missing_data.json +++ b/test_data/template_test_data/array/test_array_missing_data.json @@ -17,4 +17,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_missing_one_link.json b/test_data/template_test_data/array/test_array_missing_one_link.json index 66d16280a..42a61c2d1 100644 --- a/test_data/template_test_data/array/test_array_missing_one_link.json +++ b/test_data/template_test_data/array/test_array_missing_one_link.json @@ -27,4 +27,4 @@ "value": "https://ya.ru" } } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_nested.json b/test_data/template_test_data/array/test_array_nested.json index eb7076074..c2f7df9fa 100644 --- a/test_data/template_test_data/array/test_array_nested.json +++ b/test_data/template_test_data/array/test_array_nested.json @@ -27,4 +27,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_nested_with_internal_link.json b/test_data/template_test_data/array/test_array_nested_with_internal_link.json index 847f9e0e5..6bef0ae94 100644 --- a/test_data/template_test_data/array/test_array_nested_with_internal_link.json +++ b/test_data/template_test_data/array/test_array_nested_with_internal_link.json @@ -27,4 +27,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_not_templated.json b/test_data/template_test_data/array/test_array_not_templated.json index 847e90c67..24b72b952 100644 --- a/test_data/template_test_data/array/test_array_not_templated.json +++ b/test_data/template_test_data/array/test_array_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_array", "array": [ diff --git a/test_data/template_test_data/array/test_array_one_invalid_item.json b/test_data/template_test_data/array/test_array_one_invalid_item.json index 0c4c6b150..fc096123c 100644 --- a/test_data/template_test_data/array/test_array_one_invalid_item.json +++ b/test_data/template_test_data/array/test_array_one_invalid_item.json @@ -3,8 +3,7 @@ "t_0": { "type": "entity_with_array", "array": [ - { - }, + {}, { "type": "entity_with_complex_property", "$property": "link_1" diff --git a/test_data/template_test_data/array/test_array_with_complex_items_with_internal_links.json b/test_data/template_test_data/array/test_array_with_complex_items_with_internal_links.json index 6392bb7bc..c6b2d3910 100644 --- a/test_data/template_test_data/array/test_array_with_complex_items_with_internal_links.json +++ b/test_data/template_test_data/array/test_array_with_complex_items_with_internal_links.json @@ -23,4 +23,4 @@ "link_1": "https://ya.ru", "link_2": "https://ya.ru" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_internal_links.json b/test_data/template_test_data/array/test_array_with_internal_links.json index eb522435f..a2bbf6597 100644 --- a/test_data/template_test_data/array/test_array_with_internal_links.json +++ b/test_data/template_test_data/array/test_array_with_internal_links.json @@ -23,4 +23,4 @@ "value": "https://ya.ru" } } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_link.json b/test_data/template_test_data/array/test_array_with_link.json index f9a6b66b2..33cb52720 100644 --- a/test_data/template_test_data/array/test_array_with_link.json +++ b/test_data/template_test_data/array/test_array_with_link.json @@ -22,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_nested_templated_array.json b/test_data/template_test_data/array/test_array_with_nested_templated_array.json index cd0c0fed1..0e638db53 100644 --- a/test_data/template_test_data/array/test_array_with_nested_templated_array.json +++ b/test_data/template_test_data/array/test_array_with_nested_templated_array.json @@ -33,4 +33,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_override_in_items.json b/test_data/template_test_data/array/test_array_with_override_in_items.json index db677df79..9853c737b 100644 --- a/test_data/template_test_data/array/test_array_with_override_in_items.json +++ b/test_data/template_test_data/array/test_array_with_override_in_items.json @@ -28,4 +28,4 @@ "type": "t_0", "link_override": "https://ya.ru" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_override_in_template.json b/test_data/template_test_data/array/test_array_with_override_in_template.json index 3623f6466..d8d979457 100644 --- a/test_data/template_test_data/array/test_array_with_override_in_template.json +++ b/test_data/template_test_data/array/test_array_with_override_in_template.json @@ -26,4 +26,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_with_templated_items.json b/test_data/template_test_data/array/test_array_with_templated_items.json index 80cbd6bac..da400d1ad 100644 --- a/test_data/template_test_data/array/test_array_with_templated_items.json +++ b/test_data/template_test_data/array/test_array_with_templated_items.json @@ -20,4 +20,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array/test_array_without_link.json b/test_data/template_test_data/array/test_array_without_link.json index 2e67156e6..543f62b43 100644 --- a/test_data/template_test_data/array/test_array_without_link.json +++ b/test_data/template_test_data/array/test_array_without_link.json @@ -21,4 +21,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_invalid_items.json b/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_invalid_items.json index ce1828d75..a873a79b2 100644 --- a/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_invalid_items.json +++ b/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_invalid_items.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_array_with_transform", "array": [ diff --git a/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_one_invalid_item.json b/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_one_invalid_item.json index 17bda2210..87e060169 100644 --- a/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_one_invalid_item.json +++ b/test_data/template_test_data/array_with_transform/test_array_with_transform_not_templated_one_invalid_item.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_array_with_transform", "array": [ diff --git a/test_data/template_test_data/complex_property/test_complex_property_not_templated.json b/test_data/template_test_data/complex_property/test_complex_property_not_templated.json index 85a3264f2..bf05d859b 100644 --- a/test_data/template_test_data/complex_property/test_complex_property_not_templated.json +++ b/test_data/template_test_data/complex_property/test_complex_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_complex_property", "property": { diff --git a/test_data/template_test_data/complex_property/test_complex_property_without_link.json b/test_data/template_test_data/complex_property/test_complex_property_without_link.json index de79392fa..233854d9f 100644 --- a/test_data/template_test_data/complex_property/test_complex_property_without_link.json +++ b/test_data/template_test_data/complex_property/test_complex_property_without_link.json @@ -10,4 +10,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/complex_property/test_complex_property_without_link_missing_data.json b/test_data/template_test_data/complex_property/test_complex_property_without_link_missing_data.json index 3304c4e0b..ad8affe95 100644 --- a/test_data/template_test_data/complex_property/test_complex_property_without_link_missing_data.json +++ b/test_data/template_test_data/complex_property/test_complex_property_without_link_missing_data.json @@ -2,8 +2,7 @@ "templates": { "t_0": { "type": "entity_with_complex_property", - "property": { - } + "property": {} } }, "entity": { diff --git a/test_data/template_test_data/complex_property/test_invalid_complex_property_not_templated.json b/test_data/template_test_data/complex_property/test_invalid_complex_property_not_templated.json index e92289f7e..f06c4fc45 100644 --- a/test_data/template_test_data/complex_property/test_invalid_complex_property_not_templated.json +++ b/test_data/template_test_data/complex_property/test_invalid_complex_property_not_templated.json @@ -1,9 +1,7 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_complex_property", - "property": { - } + "property": {} } } diff --git a/test_data/template_test_data/default_value/test_invalid_value_presented_directly.json b/test_data/template_test_data/default_value/test_invalid_value_presented_directly.json index 547da63fd..68056cd6a 100644 --- a/test_data/template_test_data/default_value/test_invalid_value_presented_directly.json +++ b/test_data/template_test_data/default_value/test_invalid_value_presented_directly.json @@ -1,7 +1,6 @@ { "description": "'int' field is required to be non-negative and 'url' requires `https` scheme", - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_property_with_default_value", "int": -1, diff --git a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_not_templated.json b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_not_templated.json index 141105b98..1d453537e 100644 --- a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_not_templated.json +++ b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_optional_complex_property", "property": { diff --git a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_with_internal_link_override_in_template.json b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_with_internal_link_override_in_template.json index bb265a548..62e74936b 100644 --- a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_with_internal_link_override_in_template.json +++ b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_with_internal_link_override_in_template.json @@ -12,7 +12,6 @@ "$value": "link_override" } } - }, "entity": { "type": "t_1", diff --git a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link.json b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link.json index f0b063129..e7460df94 100644 --- a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link.json +++ b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link.json @@ -10,4 +10,4 @@ "entity": { "type": "t_0" } -} \ No newline at end of file +} diff --git a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link_missing_data.json b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link_missing_data.json index 6275f8b98..7344ffb16 100644 --- a/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link_missing_data.json +++ b/test_data/template_test_data/optional_complex_property/test_optional_complex_property_without_link_missing_data.json @@ -2,8 +2,7 @@ "templates": { "t_0": { "type": "entity_with_optional_complex_property", - "property": { - } + "property": {} } }, "entity": { diff --git a/test_data/template_test_data/optional_complex_property/test_optional_invalid_complex_property_not_templated.json b/test_data/template_test_data/optional_complex_property/test_optional_invalid_complex_property_not_templated.json index 6a3aaed98..8f7ab15e4 100644 --- a/test_data/template_test_data/optional_complex_property/test_optional_invalid_complex_property_not_templated.json +++ b/test_data/template_test_data/optional_complex_property/test_optional_invalid_complex_property_not_templated.json @@ -1,9 +1,7 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_optional_complex_property", - "property": { - } + "property": {} } } diff --git a/test_data/template_test_data/optional_property/test_optional_property_not_templated.json b/test_data/template_test_data/optional_property/test_optional_property_not_templated.json index 3c0f6855a..778dbbae6 100644 --- a/test_data/template_test_data/optional_property/test_optional_property_not_templated.json +++ b/test_data/template_test_data/optional_property/test_optional_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_optional_property", "property": "Some text" diff --git a/test_data/template_test_data/optional_string_enum_property/test_optional_string_enum_property_not_templated.json b/test_data/template_test_data/optional_string_enum_property/test_optional_string_enum_property_not_templated.json index 7cd98500d..98178e911 100644 --- a/test_data/template_test_data/optional_string_enum_property/test_optional_string_enum_property_not_templated.json +++ b/test_data/template_test_data/optional_string_enum_property/test_optional_string_enum_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_optional_string_enum_property", "property": "second" diff --git a/test_data/template_test_data/property/test_property_not_templated.json b/test_data/template_test_data/property/test_property_not_templated.json index b5fc7f0e9..b9d1b7984 100644 --- a/test_data/template_test_data/property/test_property_not_templated.json +++ b/test_data/template_test_data/property/test_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_required_property", "property": "Some text" diff --git a/test_data/template_test_data/property/test_property_not_templated_invalid.json b/test_data/template_test_data/property/test_property_not_templated_invalid.json index 15631e874..512116748 100644 --- a/test_data/template_test_data/property/test_property_not_templated_invalid.json +++ b/test_data/template_test_data/property/test_property_not_templated_invalid.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_complex_property", "property": { @@ -8,4 +7,3 @@ } } } - diff --git a/test_data/template_test_data/property/test_property_unknown_type.json b/test_data/template_test_data/property/test_property_unknown_type.json index d69dd036f..1be54c795 100644 --- a/test_data/template_test_data/property/test_property_unknown_type.json +++ b/test_data/template_test_data/property/test_property_unknown_type.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "t_0", "link": "Some text" diff --git a/test_data/template_test_data/property/test_property_with_link_invalid.json b/test_data/template_test_data/property/test_property_with_link_invalid.json index 9d52018c6..83c36ca95 100644 --- a/test_data/template_test_data/property/test_property_with_link_invalid.json +++ b/test_data/template_test_data/property/test_property_with_link_invalid.json @@ -10,4 +10,3 @@ "link": "" } } - diff --git a/test_data/template_test_data/string_enum_property/test_string_enum_property_not_templated.json b/test_data/template_test_data/string_enum_property/test_string_enum_property_not_templated.json index 632f73c0a..ba6be636c 100644 --- a/test_data/template_test_data/string_enum_property/test_string_enum_property_not_templated.json +++ b/test_data/template_test_data/string_enum_property/test_string_enum_property_not_templated.json @@ -1,6 +1,5 @@ { - "templates": { - }, + "templates": {}, "entity": { "type": "entity_with_string_enum_property", "property": "second" diff --git a/test_data/test_schema/common.json b/test_data/test_schema/common.json index a3c7d9ae0..321977733 100644 --- a/test_data/test_schema/common.json +++ b/test_data/test_schema/common.json @@ -22,7 +22,10 @@ }, { "type": "integer", - "enum": [ 0, 1 ] + "enum": [ + 0, + 1 + ] } ] } diff --git a/test_data/tutorials/counter.json b/test_data/tutorials/counter.json index 29cf474af..0bf4db230 100644 --- a/test_data/tutorials/counter.json +++ b/test_data/tutorials/counter.json @@ -135,4 +135,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/tutorials/stateful_card.json b/test_data/tutorials/stateful_card.json index 52487e537..1aca5b81c 100644 --- a/test_data/tutorials/stateful_card.json +++ b/test_data/tutorials/stateful_card.json @@ -234,4 +234,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/tutorials/ticking_timer.json b/test_data/tutorials/ticking_timer.json index cd0cd3aed..901edb07f 100644 --- a/test_data/tutorials/ticking_timer.json +++ b/test_data/tutorials/ticking_timer.json @@ -387,4 +387,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/ui_test_data/focus/focus-element-and-clear-actions.json b/test_data/ui_test_data/focus/focus-element-and-clear-actions.json index 88305259c..8917f6696 100644 --- a/test_data/ui_test_data/focus/focus-element-and-clear-actions.json +++ b/test_data/ui_test_data/focus/focus-element-and-clear-actions.json @@ -73,7 +73,7 @@ } ] } - ], + ], "states": [ { "state_id": 0, diff --git a/test_data/ui_test_data/select/select_with_default.json b/test_data/ui_test_data/select/select_with_default.json index 72d56845a..77ee615f2 100644 --- a/test_data/ui_test_data/select/select_with_default.json +++ b/test_data/ui_test_data/select/select_with_default.json @@ -237,4 +237,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-base/div-reuse-id-background-wrapper.json b/test_data/unit_test_data/div-base/div-reuse-id-background-wrapper.json index a1772e74b..11a71afdc 100644 --- a/test_data/unit_test_data/div-base/div-reuse-id-background-wrapper.json +++ b/test_data/unit_test_data/div-base/div-reuse-id-background-wrapper.json @@ -1,10 +1,10 @@ { "type": "text", "background": [ - { - "type": "image", - "image_url": "https://yastatic.net/s3/home/yandex-app/div_demo/containers.png" - } + { + "type": "image", + "image_url": "https://yastatic.net/s3/home/yandex-app/div_demo/containers.png" + } ], "text": "Image", "reuse_id": "test_reuse_id" diff --git a/test_data/unit_test_data/div-base/div-reuse-id-lottie-wrapper.json b/test_data/unit_test_data/div-base/div-reuse-id-lottie-wrapper.json index ede90cb34..d3d13747b 100644 --- a/test_data/unit_test_data/div-base/div-reuse-id-lottie-wrapper.json +++ b/test_data/unit_test_data/div-base/div-reuse-id-lottie-wrapper.json @@ -1,10 +1,10 @@ { "type": "text", "background": [ - { - "type": "image", - "image_url": "https://yastatic.net/s3/home/yandex-app/div_demo/containers.png" - } + { + "type": "image", + "image_url": "https://yastatic.net/s3/home/yandex-app/div_demo/containers.png" + } ], "text": "Image", "reuse_id": "test_reuse_id", diff --git a/test_data/unit_test_data/div-base/div-reuse-id-pager-items.json b/test_data/unit_test_data/div-base/div-reuse-id-pager-items.json index 72a93d003..3e04f4999 100644 --- a/test_data/unit_test_data/div-base/div-reuse-id-pager-items.json +++ b/test_data/unit_test_data/div-base/div-reuse-id-pager-items.json @@ -2,12 +2,12 @@ "type": "pager", "orientation": "vertical", "layout_mode": { - "type": "fixed", - "neighbour_page_width": { - "type": "fixed", - "value": 20 - } - }, + "type": "fixed", + "neighbour_page_width": { + "type": "fixed", + "value": 20 + } + }, "items": [ { "type": "text", @@ -23,15 +23,15 @@ "type": "gif", "gif_url": "https://yastatic.net/s3/home/divkit/chess.png", "width": { - "type": "fixed", - "value": 15 + "type": "fixed", + "value": 15 }, "height": { - "type": "fixed", - "value": 15 + "type": "fixed", + "value": 15 }, "margins": { - "left": 4 + "left": 4 }, "reuse_id": "test_reuse_id1" }, diff --git a/test_data/unit_test_data/div-base/div-text-visibility-actions-invisible.json b/test_data/unit_test_data/div-base/div-text-visibility-actions-invisible.json index 17e224f1d..77af5a85a 100644 --- a/test_data/unit_test_data/div-base/div-text-visibility-actions-invisible.json +++ b/test_data/unit_test_data/div-base/div-text-visibility-actions-invisible.json @@ -9,4 +9,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-base/div-text-visibility-and-disappear-action.json b/test_data/unit_test_data/div-base/div-text-visibility-and-disappear-action.json index ab2ce156d..4e62ae420 100644 --- a/test_data/unit_test_data/div-base/div-text-visibility-and-disappear-action.json +++ b/test_data/unit_test_data/div-base/div-text-visibility-and-disappear-action.json @@ -16,4 +16,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-container/horizontal_orientation_axial_alignments.json b/test_data/unit_test_data/div-container/horizontal_orientation_axial_alignments.json index df7ee13db..a97279c75 100644 --- a/test_data/unit_test_data/div-container/horizontal_orientation_axial_alignments.json +++ b/test_data/unit_test_data/div-container/horizontal_orientation_axial_alignments.json @@ -81,4 +81,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-container/horizontal_orientation_no_alignments.json b/test_data/unit_test_data/div-container/horizontal_orientation_no_alignments.json index e88d4f384..8ea7e3a32 100644 --- a/test_data/unit_test_data/div-container/horizontal_orientation_no_alignments.json +++ b/test_data/unit_test_data/div-container/horizontal_orientation_no_alignments.json @@ -72,4 +72,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-container/vertical_orientation_axial_alignments.json b/test_data/unit_test_data/div-container/vertical_orientation_axial_alignments.json index a77a5e986..0d596bcfa 100644 --- a/test_data/unit_test_data/div-container/vertical_orientation_axial_alignments.json +++ b/test_data/unit_test_data/div-container/vertical_orientation_axial_alignments.json @@ -81,4 +81,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-container/vertical_orientation_no_alignments.json b/test_data/unit_test_data/div-container/vertical_orientation_no_alignments.json index 406065686..69f4c0039 100644 --- a/test_data/unit_test_data/div-container/vertical_orientation_no_alignments.json +++ b/test_data/unit_test_data/div-container/vertical_orientation_no_alignments.json @@ -72,4 +72,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-container/with_multi_actions.json b/test_data/unit_test_data/div-container/with_multi_actions.json index 7183944bd..558dbd1b3 100644 --- a/test_data/unit_test_data/div-container/with_multi_actions.json +++ b/test_data/unit_test_data/div-container/with_multi_actions.json @@ -1,24 +1,24 @@ { - "type":"container", - "items":[ + "type": "container", + "items": [ { - "type":"text", - "text":"It is a dark time for the Rebellion", - "font_size":12 + "type": "text", + "text": "It is a dark time for the Rebellion", + "font_size": 12 } ], - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id" + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id" }, - "actions":[ + "actions": [ { - "log_id":"test_log_id_1", - "url":"https://lenta.ru" + "log_id": "test_log_id_1", + "url": "https://lenta.ru" }, { - "log_id":"test_log_id_2", - "url":"https://dtf.ru" + "log_id": "test_log_id_2", + "url": "https://dtf.ru" } ] } diff --git a/test_data/unit_test_data/div-container/with_multi_actions_with_menu.json b/test_data/unit_test_data/div-container/with_multi_actions_with_menu.json index b92edc599..6b1cf73af 100644 --- a/test_data/unit_test_data/div-container/with_multi_actions_with_menu.json +++ b/test_data/unit_test_data/div-container/with_multi_actions_with_menu.json @@ -1,59 +1,59 @@ { - "type":"container", - "items":[ + "type": "container", + "items": [ { - "type":"text", - "text":"It is a dark time for the Rebellion", - "font_size":12 + "type": "text", + "text": "It is a dark time for the Rebellion", + "font_size": 12 } ], - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id" + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id" }, - "actions":[ + "actions": [ { - "log_id":"test_log_id_1", - "url":"https://lenta.ru" + "log_id": "test_log_id_1", + "url": "https://lenta.ru" }, { - "log_id":"test_log_id_2", - "menu_items":[ + "log_id": "test_log_id_2", + "menu_items": [ { - "text":"Have questions?", - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id" + "text": "Have questions?", + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id" } }, { - "text":"Definitely!", - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id" + "text": "Definitely!", + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id" } } ] }, { - "log_id":"test_log_id_5", - "url":"https://dtf.ru" + "log_id": "test_log_id_5", + "url": "https://dtf.ru" }, { - "log_id":"test_log_id_6", - "menu_items":[ + "log_id": "test_log_id_6", + "menu_items": [ { - "text":"Absolutely not!", - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id_7" + "text": "Absolutely not!", + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id_7" } }, { - "text":"Yes!", - "action":{ - "url":"https://ya.ru", - "log_id":"test_log_id_8" + "text": "Yes!", + "action": { + "url": "https://ya.ru", + "log_id": "test_log_id_8" } } ] diff --git a/test_data/unit_test_data/div-container/wrap_content_width_match_parent_items.json b/test_data/unit_test_data/div-container/wrap_content_width_match_parent_items.json index 5650f5be0..5cc33e4b8 100644 --- a/test_data/unit_test_data/div-container/wrap_content_width_match_parent_items.json +++ b/test_data/unit_test_data/div-container/wrap_content_width_match_parent_items.json @@ -12,4 +12,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-context/div-with-extension-handler.json b/test_data/unit_test_data/div-context/div-with-extension-handler.json index 4a04b8a66..6b4297755 100644 --- a/test_data/unit_test_data/div-context/div-with-extension-handler.json +++ b/test_data/unit_test_data/div-context/div-with-extension-handler.json @@ -1,13 +1,17 @@ { "log_id": "logid", - "states": [{ - "state_id": 0, - "div": { - "type": "text", - "text": "my_text", - "extensions": [{ - "id": "sample_extension_id" - }] + "states": [ + { + "state_id": 0, + "div": { + "type": "text", + "text": "my_text", + "extensions": [ + { + "id": "sample_extension_id" + } + ] + } } - }] + ] } diff --git a/test_data/unit_test_data/div-data/root_states_visibility.json b/test_data/unit_test_data/div-data/root_states_visibility.json index 2ac3b18d1..1be63b799 100644 --- a/test_data/unit_test_data/div-data/root_states_visibility.json +++ b/test_data/unit_test_data/div-data/root_states_visibility.json @@ -25,4 +25,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-gallery/gallery.json b/test_data/unit_test_data/div-gallery/gallery.json index faf9044d9..c74186512 100644 --- a/test_data/unit_test_data/div-gallery/gallery.json +++ b/test_data/unit_test_data/div-gallery/gallery.json @@ -15,4 +15,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-gallery/paging.json b/test_data/unit_test_data/div-gallery/paging.json index 5bc752c3f..b407c577b 100644 --- a/test_data/unit_test_data/div-gallery/paging.json +++ b/test_data/unit_test_data/div-gallery/paging.json @@ -16,4 +16,3 @@ } ] } - diff --git a/test_data/unit_test_data/div-grid/invalid-column-span1.json b/test_data/unit_test_data/div-grid/invalid-column-span1.json index cb2e917e2..28b46c555 100644 --- a/test_data/unit_test_data/div-grid/invalid-column-span1.json +++ b/test_data/unit_test_data/div-grid/invalid-column-span1.json @@ -9,4 +9,4 @@ "column_span": 2 } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-grid/invalid-column-span2.json b/test_data/unit_test_data/div-grid/invalid-column-span2.json index 955fff7ed..10157a6af 100644 --- a/test_data/unit_test_data/div-grid/invalid-column-span2.json +++ b/test_data/unit_test_data/div-grid/invalid-column-span2.json @@ -13,4 +13,4 @@ "column_span": 2 } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-grid/with-action.json b/test_data/unit_test_data/div-grid/with-action.json index 02bb617b5..9ac17b1b9 100644 --- a/test_data/unit_test_data/div-grid/with-action.json +++ b/test_data/unit_test_data/div-grid/with-action.json @@ -22,4 +22,4 @@ "text": "1" } ] -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/div-state/autoanimations/new_container_other_items.json b/test_data/unit_test_data/div-state/autoanimations/new_container_other_items.json index b7bacf543..a7755c1dc 100644 --- a/test_data/unit_test_data/div-state/autoanimations/new_container_other_items.json +++ b/test_data/unit_test_data/div-state/autoanimations/new_container_other_items.json @@ -38,7 +38,6 @@ } ] }, - { "type": "text", "text": "Line 3", diff --git a/test_data/unit_test_data/div-text/with_menu_items.json b/test_data/unit_test_data/div-text/with_menu_items.json index 9283ee8ed..ca06086b0 100644 --- a/test_data/unit_test_data/div-text/with_menu_items.json +++ b/test_data/unit_test_data/div-text/with_menu_items.json @@ -46,4 +46,4 @@ "text_alignment_vertical": "center", "text_color": "#1ABC9C", "text": "Open menu" -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/container/container-broken-patch-transactional.json b/test_data/unit_test_data/patches/container/container-broken-patch-transactional.json index 57c7cecd0..0283b4aa0 100644 --- a/test_data/unit_test_data/patches/container/container-broken-patch-transactional.json +++ b/test_data/unit_test_data/patches/container/container-broken-patch-transactional.json @@ -66,4 +66,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/container/container-patch-partial.json b/test_data/unit_test_data/patches/container/container-patch-partial.json index 102fe05e6..2f39e15a3 100644 --- a/test_data/unit_test_data/patches/container/container-patch-partial.json +++ b/test_data/unit_test_data/patches/container/container-patch-partial.json @@ -66,4 +66,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/container/container-patch-transactional.json b/test_data/unit_test_data/patches/container/container-patch-transactional.json index 95b0a76e4..8caf60ca4 100644 --- a/test_data/unit_test_data/patches/container/container-patch-transactional.json +++ b/test_data/unit_test_data/patches/container/container-patch-transactional.json @@ -66,4 +66,4 @@ } ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/gallery/gallery-patch-partial.json b/test_data/unit_test_data/patches/gallery/gallery-patch-partial.json index 608a33c8e..cee6707bb 100644 --- a/test_data/unit_test_data/patches/gallery/gallery-patch-partial.json +++ b/test_data/unit_test_data/patches/gallery/gallery-patch-partial.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "partial", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item444", - "items": [{ - "type": "patch_card", - "alert_text": "invalid patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item444", + "items": [ + { + "type": "patch_card", + "alert_text": "invalid patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/gallery/gallery-patch-transactional-broken.json b/test_data/unit_test_data/patches/gallery/gallery-patch-transactional-broken.json index 6805a8709..e168d3241 100644 --- a/test_data/unit_test_data/patches/gallery/gallery-patch-transactional-broken.json +++ b/test_data/unit_test_data/patches/gallery/gallery-patch-transactional-broken.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item5" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item5" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/gallery/gallery-patch-transactional.json b/test_data/unit_test_data/patches/gallery/gallery-patch-transactional.json index fdcaf511e..9f5b18af8 100644 --- a/test_data/unit_test_data/patches/gallery/gallery-patch-transactional.json +++ b/test_data/unit_test_data/patches/gallery/gallery-patch-transactional.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/grid/grid-patch-partial.json b/test_data/unit_test_data/patches/grid/grid-patch-partial.json index 608a33c8e..cee6707bb 100644 --- a/test_data/unit_test_data/patches/grid/grid-patch-partial.json +++ b/test_data/unit_test_data/patches/grid/grid-patch-partial.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "partial", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item444", - "items": [{ - "type": "patch_card", - "alert_text": "invalid patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item444", + "items": [ + { + "type": "patch_card", + "alert_text": "invalid patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/grid/grid-patch-transactional-broken.json b/test_data/unit_test_data/patches/grid/grid-patch-transactional-broken.json index 6805a8709..e168d3241 100644 --- a/test_data/unit_test_data/patches/grid/grid-patch-transactional-broken.json +++ b/test_data/unit_test_data/patches/grid/grid-patch-transactional-broken.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item5" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item5" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/grid/grid-patch-transactional.json b/test_data/unit_test_data/patches/grid/grid-patch-transactional.json index fdcaf511e..9f5b18af8 100644 --- a/test_data/unit_test_data/patches/grid/grid-patch-transactional.json +++ b/test_data/unit_test_data/patches/grid/grid-patch-transactional.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/pager/pager-patch-partial.json b/test_data/unit_test_data/patches/pager/pager-patch-partial.json index 608a33c8e..cee6707bb 100644 --- a/test_data/unit_test_data/patches/pager/pager-patch-partial.json +++ b/test_data/unit_test_data/patches/pager/pager-patch-partial.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "partial", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item444", - "items": [{ - "type": "patch_card", - "alert_text": "invalid patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item444", + "items": [ + { + "type": "patch_card", + "alert_text": "invalid patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/pager/pager-patch-transactional-broken.json b/test_data/unit_test_data/patches/pager/pager-patch-transactional-broken.json index 6805a8709..e168d3241 100644 --- a/test_data/unit_test_data/patches/pager/pager-patch-transactional-broken.json +++ b/test_data/unit_test_data/patches/pager/pager-patch-transactional-broken.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item5" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item5" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/test_data/unit_test_data/patches/pager/pager-patch-transactional.json b/test_data/unit_test_data/patches/pager/pager-patch-transactional.json index fdcaf511e..9f5b18af8 100644 --- a/test_data/unit_test_data/patches/pager/pager-patch-transactional.json +++ b/test_data/unit_test_data/patches/pager/pager-patch-transactional.json @@ -11,10 +11,12 @@ "type": "match_parent", "weight": 2 }, - "background": [{ - "color": "#FF0000", - "type": "solid" - }], + "background": [ + { + "color": "#FF0000", + "type": "solid" + } + ], "border": { "corner_radius": 6, "stroke": { @@ -22,39 +24,50 @@ } }, "orientation": "horizontal", - "items": [{ - "type": "text", - "max_lines": 3, - "font_size": 14, - "line_height": 18, - "margins": { - "top": 9, - "left": 8 - }, - "font_weight": "medium", - "$text": "alert_text" - }] + "items": [ + { + "type": "text", + "max_lines": 3, + "font_size": 14, + "line_height": 18, + "margins": { + "top": 9, + "left": 8 + }, + "font_weight": "medium", + "$text": "alert_text" + } + ] } }, "patch": { "mode": "transactional", - "changes": [{ - "id": "item2", - "items": [{ - "type": "patch_card", - "alert_text": "2.1 item from patch" - }, { - "type": "patch_card", - "alert_text": "2.2 item from patch" - }] - }, { - "id": "item3" - },{ - "id": "item4", - "items": [{ - "type": "patch_card", - "alert_text": "4.1 item from patch" - }] - }] + "changes": [ + { + "id": "item2", + "items": [ + { + "type": "patch_card", + "alert_text": "2.1 item from patch" + }, + { + "type": "patch_card", + "alert_text": "2.2 item from patch" + } + ] + }, + { + "id": "item3" + }, + { + "id": "item4", + "items": [ + { + "type": "patch_card", + "alert_text": "4.1 item from patch" + } + ] + } + ] } -} \ No newline at end of file +}