diff --git a/client/android/div/src/main/java/com/yandex/div/core/state/DivStatePath.kt b/client/android/div/src/main/java/com/yandex/div/core/state/DivStatePath.kt index 92b7a0dfa..6c3689211 100644 --- a/client/android/div/src/main/java/com/yandex/div/core/state/DivStatePath.kt +++ b/client/android/div/src/main/java/com/yandex/div/core/state/DivStatePath.kt @@ -9,9 +9,9 @@ import java.lang.Math.min * Path could be parsed from string by using [parse] method. * Path structure is: * ``` - * top_level_state_id/div_id_of_DivState1/state_id1_of_DivState1/.../div_id_of_DivStateN/state_id1_of_DivStateN + * top_level_state_id/id_of_DivState1/state_id1_of_DivState1/.../id_of_DivStateN/state_id1_of_DivStateN * ``` - * **Note:** after integer top_level_state_id goes pairs of ```div_id->state_id``` of nested DivState's + * **Note:** after integer top_level_state_id goes pairs of ```id->state_id``` of nested DivState's * ignoring other Divs. */ data class DivStatePath @VisibleForTesting internal constructor( diff --git a/client/android/div/src/test/java/com/yandex/div/core/state/DivStatePathUtilsTest.kt b/client/android/div/src/test/java/com/yandex/div/core/state/DivStatePathUtilsTest.kt index 07edf9030..c7c2408ed 100644 --- a/client/android/div/src/test/java/com/yandex/div/core/state/DivStatePathUtilsTest.kt +++ b/client/android/div/src/test/java/com/yandex/div/core/state/DivStatePathUtilsTest.kt @@ -37,7 +37,7 @@ class DivStatePathUtilsTest { Assert.assertNotNull(div) val divState: DivState = div?.value() as? DivState ?: throw AssertionFailedError("DivStatePath#findDivState found smthng wrong") - Assert.assertEquals(divState.divId, containerStateId) + Assert.assertEquals(divState.id, containerStateId) Assert.assertEquals(divState.states.size, 3) } } @@ -51,7 +51,7 @@ class DivStatePathUtilsTest { Assert.assertNotNull(div) val divState: DivState = div?.value() as? DivState ?: throw AssertionFailedError("DivStatePath#findDivState found smthng wrong") - Assert.assertEquals(divState.divId, "second_state") + Assert.assertEquals(divState.id, "second_state") Assert.assertEquals(divState.states.size, 3) Assert.assertEquals(divState.states[0].stateId, "hidden") Assert.assertEquals(divState.states[1].stateId, "shown") @@ -67,7 +67,7 @@ class DivStatePathUtilsTest { Assert.assertNotNull(div) val divState: DivState = div?.value() as? DivState ?: throw AssertionFailedError("DivStatePath#findDivState found smthng wrong") - Assert.assertEquals(divState.divId, "state_container") + Assert.assertEquals(divState.id, "state_container") Assert.assertEquals(divState.states.size, 2) Assert.assertEquals(divState.states[0].stateId, "first") Assert.assertEquals(divState.states[1].stateId, "second") diff --git a/client/android/div/src/test/java/com/yandex/div/core/view2/Div2RebindTest.kt b/client/android/div/src/test/java/com/yandex/div/core/view2/Div2RebindTest.kt index e15735376..ee1d5af70 100644 --- a/client/android/div/src/test/java/com/yandex/div/core/view2/Div2RebindTest.kt +++ b/client/android/div/src/test/java/com/yandex/div/core/view2/Div2RebindTest.kt @@ -70,7 +70,7 @@ class Div2RebindTest { val divStateLayout: DivStateLayout? = divView.findStateLayout(path) assertNotNull(divStateLayout) - assertEquals("state_container", divStateLayout?.div?.divId) + assertEquals("state_container", divStateLayout?.div?.id) } @Test @@ -86,7 +86,7 @@ class Div2RebindTest { val divStateLayout: DivStateLayout? = divView.findStateLayout(path) assertNotNull(divStateLayout) - assertEquals(containerStateId, divStateLayout?.div?.divId) + assertEquals(containerStateId, divStateLayout?.div?.id) } } @@ -101,7 +101,7 @@ class Div2RebindTest { // default state is 0/state_container/first/{futher_path} but state_container is created, so we still get it. assertNotNull(divStateLayout) - assertEquals("state_container", divStateLayout?.div?.divId) + assertEquals("state_container", divStateLayout?.div?.id) } @Test diff --git a/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivBinderTest.kt b/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivBinderTest.kt index b71847aad..cafb297e1 100644 --- a/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivBinderTest.kt +++ b/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivBinderTest.kt @@ -2,7 +2,6 @@ package com.yandex.div.core.view2.divs import androidx.transition.TransitionSet import com.yandex.div.DivDataTag -import com.yandex.div.core.Div2ImageStubProvider import com.yandex.div.core.DivCustomContainerViewAdapter import com.yandex.div.core.DivCustomViewAdapter import com.yandex.div.core.dagger.Div2Component @@ -13,6 +12,7 @@ import com.yandex.div.core.view2.Div2View import com.yandex.div.core.view2.DivTransitionBuilder import com.yandex.div.core.view2.DivValidator import com.yandex.div.core.view2.DivViewCreator +import com.yandex.div.core.view2.DivViewIdProvider import com.yandex.div.core.view2.animations.DivTransitionHandler import com.yandex.div.core.view2.divs.widgets.ReleaseViewVisitor import com.yandex.div.internal.viewpool.PseudoViewPool @@ -40,7 +40,6 @@ open class DivBinderTest { on { validate(any(), any()) } doReturn true } internal val imageLoader = mock() - internal val imageStubProvider = mock() internal val context = RuntimeEnvironment.application private val expressionResolver = mock() @@ -62,18 +61,21 @@ open class DivBinderTest { divExtensionController, ) ).apply { - whenever(divView.releaseViewVisitor).doReturn(this) + whenever(divView.releaseViewVisitor) doReturn this } private val transitionBuilder = mock { on { buildTransitions(fromDiv = anyOrNull(), toDiv = anyOrNull(), any()) } doReturn TransitionSet() } - private val mockViewComponent = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS) { + private val viewIdProvider = DivViewIdProvider() + + private val viewComponent = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS) { + on { viewIdProvider } doReturn viewIdProvider on { releaseViewVisitor } doReturn visitor on { transitionBuilder } doReturn transitionBuilder }.apply { - whenever(divView.viewComponent).doReturn(this) + whenever(divView.viewComponent) doReturn this } internal val viewCreator = spy(DivViewCreator(context(), PseudoViewPool(), validator, ViewPreCreationProfile(), mock())) diff --git a/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivStateBinderReleaseViewTest.kt b/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivStateBinderReleaseViewTest.kt index 8b53bdd2f..e0c03874e 100644 --- a/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivStateBinderReleaseViewTest.kt +++ b/client/android/div/src/test/java/com/yandex/div/core/view2/divs/DivStateBinderReleaseViewTest.kt @@ -6,7 +6,6 @@ import com.yandex.div.core.childrenToFlatList import com.yandex.div.core.downloader.DivPatchCache import com.yandex.div.core.downloader.DivPatchManager import com.yandex.div.core.expression.variables.TwoWayStringVariableBinder -import com.yandex.div.core.expression.variables.TwoWayVariableBinder import com.yandex.div.core.state.DivPathUtils.findStateLayout import com.yandex.div.core.state.DivStatePath import com.yandex.div.core.state.TemporaryDivStateCache diff --git a/client/android/divkit-demo-app/src/main/assets/application/settings.json b/client/android/divkit-demo-app/src/main/assets/application/settings.json index f7f2e3e8e..8befa71ef 100644 --- a/client/android/divkit-demo-app/src/main/assets/application/settings.json +++ b/client/android/divkit-demo-app/src/main/assets/application/settings.json @@ -91,7 +91,7 @@ "items": [ { "type": "switch_pointer", - "div_id": "pointer" + "id": "pointer" } ], "actions": [ @@ -119,7 +119,7 @@ "items": [ { "type": "switch_pointer", - "div_id": "pointer" + "id": "pointer" } ], "content_alignment_horizontal": "left", @@ -365,7 +365,7 @@ }, { "type": "setting_switch_state", - "div_id": "complex_rebind", + "id": "complex_rebind", "active_click_log_id": "set_complex_rebind_disabled", "active_click_change_state_url": "div-action://set_state?state_id=0/complex_rebind/inactive", "active_click_change_settings_url": "div-action://set_preferences?name=complex_rebind&value=0", @@ -384,7 +384,7 @@ }, { "type": "setting_switch_state", - "div_id": "div2_view_pool", + "id": "div2_view_pool", "active_click_log_id": "set_div2_view_pool_disabled", "active_click_change_state_url": "div-action://set_state?state_id=0/div2_view_pool/inactive", "active_click_change_settings_url": "div-action://set_preferences?name=div2_view_pool&value=0", @@ -403,7 +403,7 @@ }, { "type": "setting_switch_state", - "div_id": "div2_view_pool_profiling", + "id": "div2_view_pool_profiling", "active_click_log_id": "set_div2_view_pool_profilingl_disabled", "active_click_change_settings_url": "div-action://set_preferences?name=div2_view_pool_profiling&value=0", "active_click_change_state_url": "div-action://set_state?state_id=0/div2_view_pool_profiling/inactive", @@ -422,7 +422,7 @@ }, { "type": "setting_switch_state", - "div_id": "multiple_state_change", + "id": "multiple_state_change", "active_click_log_id": "set_multiple_state_change_disabled", "active_click_change_state_url": "div-action://set_state?state_id=0/multiple_state_change/inactive", "active_click_change_settings_url": "div-action://set_preferences?name=multiple_state_change&value=0", @@ -442,7 +442,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "min_value": 0, "max_value": 2, "thumb_value_variable": "image_loader", @@ -621,7 +621,7 @@ }, { "type": "setting_switch_state", - "div_id": "demo_activity_rendering_time", + "id": "demo_activity_rendering_time", "active_click_log_id": "demo_activity_rendering_time_disabled", "active_click_change_state_url": "div-action://set_state?state_id=0/demo_activity_rendering_time/inactive", "active_click_change_settings_url": "div-action://set_preferences?name=demo_activity_rendering_time&value=0", diff --git a/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-multiple-change.json b/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-multiple-change.json index bf70a16cb..627cac4e9 100644 --- a/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-multiple-change.json +++ b/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-multiple-change.json @@ -111,7 +111,7 @@ }, "page": { "type": "state", - "$div_id": "page_id", + "$id": "page_id", "states": [ { "state_id": "stub", diff --git a/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-single-change.json b/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-single-change.json index 291f0d321..486f0798d 100644 --- a/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-single-change.json +++ b/client/android/divkit-demo-app/src/main/assets/div2-perf/state-benchmark-single-change.json @@ -543,7 +543,7 @@ }, { "type": "state", - "div_id": "card_content", + "id": "card_content", "states": [ { "state_id": "stub", diff --git a/client/android/divkit-demo-app/src/main/assets/div2-test/clicks.json b/client/android/divkit-demo-app/src/main/assets/div2-test/clicks.json index 75327f18e..dafa151fd 100644 --- a/client/android/divkit-demo-app/src/main/assets/div2-test/clicks.json +++ b/client/android/divkit-demo-app/src/main/assets/div2-test/clicks.json @@ -43,7 +43,7 @@ "card": { "log_id": "action_button", "type": "state", - "div_id": "action_button", + "id": "action_button", "states": [ { "state_id": 0, @@ -51,7 +51,7 @@ "type": "container", "items": [ { - "div_id": "with_double_and_long_taps", + "id": "with_double_and_long_taps", "type": "button", "text": "With double and long taps", "accessibility": { @@ -77,7 +77,7 @@ ] }, { - "div_id": "without_double_tap", + "id": "without_double_tap", "type": "button", "text": "Without double tap", "accessibility": { @@ -91,7 +91,7 @@ ] }, { - "div_id": "with_child_view_inside", + "id": "with_child_view_inside", "accessibility": { "description": "With child view inside" }, diff --git a/client/android/divkit-demo-app/src/main/assets/div2-test/pager.json b/client/android/divkit-demo-app/src/main/assets/div2-test/pager.json index e5383d07f..d5daf7d60 100644 --- a/client/android/divkit-demo-app/src/main/assets/div2-test/pager.json +++ b/client/android/divkit-demo-app/src/main/assets/div2-test/pager.json @@ -19,7 +19,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -28,7 +28,7 @@ "items": [ { "type": "state", - "div_id": "slider", + "id": "slider", "states": [ { "state_id": "without_ad", diff --git a/client/android/divkit-demo-app/src/main/assets/div2-test/tabs_show_more.json b/client/android/divkit-demo-app/src/main/assets/div2-test/tabs_show_more.json index 1278f3463..0b5f452c5 100644 --- a/client/android/divkit-demo-app/src/main/assets/div2-test/tabs_show_more.json +++ b/client/android/divkit-demo-app/src/main/assets/div2-test/tabs_show_more.json @@ -75,7 +75,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -104,7 +104,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { @@ -183,7 +183,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -212,7 +212,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { @@ -291,7 +291,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -320,7 +320,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { @@ -399,7 +399,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -428,7 +428,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { @@ -507,7 +507,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -536,7 +536,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { @@ -615,7 +615,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_0", "buttonText": "Показать ещё", "showMoreAction": { @@ -644,7 +644,7 @@ }, { "type": "tabState", - "div_id": "hidden_stories", + "id": "hidden_stories", "buttonStateId": "button_show_1", "buttonText": "Показать ещё", "showMoreAction": { diff --git a/client/android/divkit-demo-app/src/main/res/raw/div_omnibox_data.json b/client/android/divkit-demo-app/src/main/res/raw/div_omnibox_data.json index 7d27c14b9..e2383ce51 100644 --- a/client/android/divkit-demo-app/src/main/res/raw/div_omnibox_data.json +++ b/client/android/divkit-demo-app/src/main/res/raw/div_omnibox_data.json @@ -48,7 +48,7 @@ } }, { - "div_id": "text", + "id": "text", "height": { "type": "match_parent" }, diff --git a/client/android/divkit-demo-app/src/main/res/raw/informers.json b/client/android/divkit-demo-app/src/main/res/raw/informers.json index c7f63b91a..c8ab57efa 100644 --- a/client/android/divkit-demo-app/src/main/res/raw/informers.json +++ b/client/android/divkit-demo-app/src/main/res/raw/informers.json @@ -323,7 +323,7 @@ { "type": "geoblock2AlertsSeparator/a7f9bf8a2a26a568ae4bf1b89a65f7e0", "separatorColor": "#e0e0e0", - "div_id": "weather_grouped.a299c4a1c5d9b65d5c7e29e53ac41bde_separator" + "id": "weather_grouped.a299c4a1c5d9b65d5c7e29e53ac41bde_separator" } ], "orientation": "overlap", @@ -333,7 +333,7 @@ "items": [ { "type": "geoAlertWrapper/9ffb69cc6936792b127f380566211a0b", - "div_id": "weather_grouped.a299c4a1c5d9b65d5c7e29e53ac41bde", + "id": "weather_grouped.a299c4a1c5d9b65d5c7e29e53ac41bde", "onSwipeActions": [ { "url": "div-action://set_state?state_id=0/weather_grouped.a299c4a1c5d9b65d5c7e29e53ac41bde/swiped", @@ -891,7 +891,7 @@ "state_id": "default" } ], - "div_id": "more", + "id": "more", "alignment_horizontal": "right" }, "geoblock2HeaderPlayer/0dfa6153cab8f19d6ff88bf2d73d4192": { @@ -992,7 +992,7 @@ ], "type": "state", "alignment_horizontal": "right", - "div_id": "player_button" + "id": "player_button" }, "geoblock2AlertsSeparator/a7f9bf8a2a26a568ae4bf1b89a65f7e0": { "type": "state", diff --git a/test_data/interactive_snapshot_test_data/div-indicator/shapes.json b/test_data/interactive_snapshot_test_data/div-indicator/shapes.json index 7e73c0e81..fb8805db7 100644 --- a/test_data/interactive_snapshot_test_data/div-indicator/shapes.json +++ b/test_data/interactive_snapshot_test_data/div-indicator/shapes.json @@ -103,7 +103,7 @@ "state_id": 0, "div": { "type": "state", - "div_id": "state_container", + "id": "state_container", "height": { "type": "fixed", "value": 300 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 95cd5464d..6ecfac4b2 100644 --- a/test_data/interactive_snapshot_test_data/div-slider/shapes.json +++ b/test_data/interactive_snapshot_test_data/div-slider/shapes.json @@ -67,7 +67,7 @@ "state_id": 0, "div": { "type": "state", - "div_id": "state_container", + "id": "state_container", "height": { "type": "fixed", "value": 300 diff --git a/test_data/interactive_snapshot_test_data/div-state/base-properties.json b/test_data/interactive_snapshot_test_data/div-state/base-properties.json index bfc2569cf..3303e27f3 100644 --- a/test_data/interactive_snapshot_test_data/div-state/base-properties.json +++ b/test_data/interactive_snapshot_test_data/div-state/base-properties.json @@ -162,7 +162,7 @@ "items": [ { "type": "div_base", - "div_id": "div_state_test", + "id": "div_state_test", "default_state_id": "second_item", "states": [ { diff --git a/test_data/interactive_snapshot_test_data/div-state/visibility.json b/test_data/interactive_snapshot_test_data/div-state/visibility.json index 29933aae1..e00a73a93 100644 --- a/test_data/interactive_snapshot_test_data/div-state/visibility.json +++ b/test_data/interactive_snapshot_test_data/div-state/visibility.json @@ -103,7 +103,7 @@ "items": [ { "type": "div_base", - "div_id": "div_state_test", + "id": "div_state_test", "default_state_id": "second_item", "states": [ { diff --git a/test_data/regression_test_data/action_animation/nested_change_bounds.json b/test_data/regression_test_data/action_animation/nested_change_bounds.json index 98c9693d7..f0367ae6b 100644 --- a/test_data/regression_test_data/action_animation/nested_change_bounds.json +++ b/test_data/regression_test_data/action_animation/nested_change_bounds.json @@ -124,7 +124,7 @@ "state_id": 0, "div": { "type": "state", - "div_id": "card_state", + "id": "card_state", "height": { "type": "fixed", "value": 360 diff --git a/test_data/regression_test_data/animations/article.json b/test_data/regression_test_data/animations/article.json index 9bda301fe..5dc1e052f 100644 --- a/test_data/regression_test_data/animations/article.json +++ b/test_data/regression_test_data/animations/article.json @@ -139,7 +139,7 @@ "bottom": 8 }, "column_span": 2, - "$div_id": "comment_id", + "$id": "comment_id", "states": [ { "state_id": "collapsed", @@ -336,7 +336,7 @@ }, { "type": "state", - "div_id": "content", + "id": "content", "states": [ { "state_id": "collapsed", @@ -384,7 +384,7 @@ }, { "type": "state", - "div_id": "comments", + "id": "comments", "states": [ { "state_id": "collapsed", @@ -548,7 +548,7 @@ "margins": { "bottom": 8 }, - "div_id": "comments_button", + "id": "comments_button", "states": [ { "state_id": "text_show_comments", @@ -613,7 +613,7 @@ }, { "type": "state", - "div_id": "button", + "id": "button", "states": [ { "state_id": "text_expand", diff --git a/test_data/regression_test_data/animations/article_with_transitions.json b/test_data/regression_test_data/animations/article_with_transitions.json index ea6f82dd4..8584fea07 100644 --- a/test_data/regression_test_data/animations/article_with_transitions.json +++ b/test_data/regression_test_data/animations/article_with_transitions.json @@ -105,7 +105,7 @@ "bottom": 8 }, "column_span": 2, - "$div_id": "comment_id", + "$id": "comment_id", "states": [ { "state_id": "collapsed", @@ -257,7 +257,7 @@ }, { "type": "state", - "div_id": "content", + "id": "content", "states": [ { "state_id": "collapsed", @@ -298,7 +298,7 @@ "margins": { "bottom": 8 }, - "div_id": "comments_button", + "id": "comments_button", "states": [ { "state_id": "text_show_comments", @@ -338,7 +338,7 @@ }, { "type": "state", - "div_id": "comments", + "id": "comments", "states": [ { "state_id": "collapsed", @@ -466,7 +466,7 @@ }, { "type": "state", - "div_id": "button", + "id": "button", "states": [ { "state_id": "text_expand", diff --git a/test_data/regression_test_data/animations/blink.json b/test_data/regression_test_data/animations/blink.json index ff328985c..b37d0f203 100644 --- a/test_data/regression_test_data/animations/blink.json +++ b/test_data/regression_test_data/animations/blink.json @@ -75,7 +75,7 @@ "items": [ { "type": "state", - "div_id": "blink", + "id": "blink", "width": { "type": "fixed", "value": 120 @@ -183,7 +183,7 @@ }, { "type": "state", - "div_id": "button", + "id": "button", "width": { "type": "match_parent" }, 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 d506e35ae..134d3ec39 100644 --- a/test_data/regression_test_data/animations/lottie/lottie_animations.json +++ b/test_data/regression_test_data/animations/lottie/lottie_animations.json @@ -118,7 +118,7 @@ { "state_id": 0, "div": { - "div_id": "lottie_grid", + "id": "lottie_grid", "type": "lottie_grid", "items": [ { diff --git a/test_data/regression_test_data/animations/lottie/lottie_gallery.json b/test_data/regression_test_data/animations/lottie/lottie_gallery.json index f461f788b..25336b69f 100644 --- a/test_data/regression_test_data/animations/lottie/lottie_gallery.json +++ b/test_data/regression_test_data/animations/lottie/lottie_gallery.json @@ -108,7 +108,7 @@ { "state_id": 0, "div": { - "div_id": "gallery", + "id": "gallery", "type": "gallery", "items": [ { diff --git a/test_data/regression_test_data/animations/mute_notification.json b/test_data/regression_test_data/animations/mute_notification.json index 7863c1d25..283a354cf 100644 --- a/test_data/regression_test_data/animations/mute_notification.json +++ b/test_data/regression_test_data/animations/mute_notification.json @@ -140,7 +140,7 @@ }, { "type": "state", - "div_id": "mute", + "id": "mute", "margins": { "left": 16, "top": 16, 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 42db1f596..872a73f92 100644 --- a/test_data/regression_test_data/animations/rive/rive_animation.json +++ b/test_data/regression_test_data/animations/rive/rive_animation.json @@ -92,7 +92,7 @@ { "state_id": 0, "div": { - "div_id": "rive_grid", + "id": "rive_grid", "type": "rive_grid", "items": [ { diff --git a/test_data/regression_test_data/animations/rive/rive_gallery.json b/test_data/regression_test_data/animations/rive/rive_gallery.json index 5ec706fd7..2ea921be9 100644 --- a/test_data/regression_test_data/animations/rive/rive_gallery.json +++ b/test_data/regression_test_data/animations/rive/rive_gallery.json @@ -82,7 +82,7 @@ { "state_id": 0, "div": { - "div_id": "gallery", + "id": "gallery", "type": "gallery", "items": [ { diff --git a/test_data/regression_test_data/animations/transition/inner_state_transition_any_change.json b/test_data/regression_test_data/animations/transition/inner_state_transition_any_change.json index c237f8174..d60b09c46 100644 --- a/test_data/regression_test_data/animations/transition/inner_state_transition_any_change.json +++ b/test_data/regression_test_data/animations/transition/inner_state_transition_any_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, @@ -94,7 +94,7 @@ }, "card": { "type": "state", - "div_id": "root", + "id": "root", "transition_animation_selector": "data_change", "states": [ { diff --git a/test_data/regression_test_data/animations/transition/inner_state_transition_data_change.json b/test_data/regression_test_data/animations/transition/inner_state_transition_data_change.json index c3ac9cfe4..e0bf6a273 100644 --- a/test_data/regression_test_data/animations/transition/inner_state_transition_data_change.json +++ b/test_data/regression_test_data/animations/transition/inner_state_transition_data_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, @@ -94,7 +94,7 @@ }, "card": { "type": "state", - "div_id": "root", + "id": "root", "transition_animation_selector": "data_change", "states": [ { diff --git a/test_data/regression_test_data/animations/transition/inner_state_transition_state_change.json b/test_data/regression_test_data/animations/transition/inner_state_transition_state_change.json index e1c7f6c07..74eb608fa 100644 --- a/test_data/regression_test_data/animations/transition/inner_state_transition_state_change.json +++ b/test_data/regression_test_data/animations/transition/inner_state_transition_state_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, @@ -94,7 +94,7 @@ }, "card": { "type": "state", - "div_id": "root", + "id": "root", "transition_animation_selector": "data_change", "states": [ { diff --git a/test_data/regression_test_data/animations/transition/state_transition_any_change.json b/test_data/regression_test_data/animations/transition/state_transition_any_change.json index 12a4fa181..a9c117102 100644 --- a/test_data/regression_test_data/animations/transition/state_transition_any_change.json +++ b/test_data/regression_test_data/animations/transition/state_transition_any_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, diff --git a/test_data/regression_test_data/animations/transition/state_transition_data_change.json b/test_data/regression_test_data/animations/transition/state_transition_data_change.json index b401caff1..cd7081197 100644 --- a/test_data/regression_test_data/animations/transition/state_transition_data_change.json +++ b/test_data/regression_test_data/animations/transition/state_transition_data_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, diff --git a/test_data/regression_test_data/animations/transition/state_transition_state_change.json b/test_data/regression_test_data/animations/transition/state_transition_state_change.json index f28828d10..1d698d36d 100644 --- a/test_data/regression_test_data/animations/transition/state_transition_state_change.json +++ b/test_data/regression_test_data/animations/transition/state_transition_state_change.json @@ -18,7 +18,7 @@ }, "button": { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "margins": { "left": 24, "top": 24, 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 bffd3b34b..7dea5ca0d 100644 --- a/test_data/regression_test_data/animations/transition/transition_set.json +++ b/test_data/regression_test_data/animations/transition/transition_set.json @@ -35,7 +35,7 @@ }, { "type": "state", - "$div_id": "album_cover_id", + "$id": "album_cover_id", "width": { "type": "match_parent" }, diff --git a/test_data/regression_test_data/animations/transition/transition_triggers_complex_src.json b/test_data/regression_test_data/animations/transition/transition_triggers_complex_src.json index eaec4ff74..74d1a0075 100644 --- a/test_data/regression_test_data/animations/transition/transition_triggers_complex_src.json +++ b/test_data/regression_test_data/animations/transition/transition_triggers_complex_src.json @@ -63,7 +63,7 @@ }, { "type": "state", - "div_id": "transition_button", + "id": "transition_button", "states": [ { "state_id": "state_one", @@ -296,7 +296,7 @@ "items": [ { "type": "state", - "div_id": "target_div", + "id": "target_div", "background": [ { "type": "solid", @@ -414,7 +414,7 @@ "items": [ { "type": "state", - "div_id": "target_div_in_gallery", + "id": "target_div_in_gallery", "background": [ { "type": "solid", diff --git a/test_data/regression_test_data/animations/transition/transition_triggers_state_change.json b/test_data/regression_test_data/animations/transition/transition_triggers_state_change.json index 2a59a8e1b..2bf620f78 100644 --- a/test_data/regression_test_data/animations/transition/transition_triggers_state_change.json +++ b/test_data/regression_test_data/animations/transition/transition_triggers_state_change.json @@ -16,7 +16,7 @@ "items": [ { "type": "state", - "div_id": "first_case", + "id": "first_case", "transition_animation_selector": "state_change", "background": [ { @@ -89,7 +89,7 @@ }, { "type": "state", - "div_id": "second_case", + "id": "second_case", "transition_animation_selector": "state_change", "background": [ { @@ -162,7 +162,7 @@ }, { "type": "state", - "div_id": "third_case", + "id": "third_case", "background": [ { "type": "solid", @@ -234,7 +234,7 @@ }, { "type": "state", - "div_id": "transition_button", + "id": "transition_button", "states": [ { "state_id": "normal", diff --git a/test_data/regression_test_data/button_actions.json b/test_data/regression_test_data/button_actions.json index 97446709b..361432b54 100644 --- a/test_data/regression_test_data/button_actions.json +++ b/test_data/regression_test_data/button_actions.json @@ -48,7 +48,7 @@ "card": { "log_id": "action_button", "type": "state", - "div_id": "action_button", + "id": "action_button", "states": [ { "state_id": 0, diff --git a/test_data/regression_test_data/double_slider.json b/test_data/regression_test_data/double_slider.json index fd5963835..e05a3b5c6 100644 --- a/test_data/regression_test_data/double_slider.json +++ b/test_data/regression_test_data/double_slider.json @@ -324,7 +324,7 @@ }, { "type": "counter", - "div_id": "counter" + "id": "counter" } ] } diff --git a/test_data/regression_test_data/error_visual_monitor.json b/test_data/regression_test_data/error_visual_monitor.json index 3fdc1b9cd..8340ff1cc 100644 --- a/test_data/regression_test_data/error_visual_monitor.json +++ b/test_data/regression_test_data/error_visual_monitor.json @@ -53,7 +53,7 @@ "state_id": 0, "div": { "type": "container", - "div_id": "label", + "id": "label", "alignment_vertical": "center", "height": { "type": "match_parent" diff --git a/test_data/regression_test_data/expand-cutout-1.json b/test_data/regression_test_data/expand-cutout-1.json index 19fffd9fc..d04b4050d 100644 --- a/test_data/regression_test_data/expand-cutout-1.json +++ b/test_data/regression_test_data/expand-cutout-1.json @@ -32,7 +32,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -41,7 +41,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", diff --git a/test_data/regression_test_data/expand-cutout-2.json b/test_data/regression_test_data/expand-cutout-2.json index 1ec422542..9ff413ecf 100644 --- a/test_data/regression_test_data/expand-cutout-2.json +++ b/test_data/regression_test_data/expand-cutout-2.json @@ -33,7 +33,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -42,7 +42,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", diff --git a/test_data/regression_test_data/focus.json b/test_data/regression_test_data/focus.json index 15f3497ac..f1caf6164 100644 --- a/test_data/regression_test_data/focus.json +++ b/test_data/regression_test_data/focus.json @@ -33,7 +33,7 @@ "state_id": 0, "div": { "type": "container", - "div_id": "container", + "id": "container", "paddings": { "left": 8, "right": 8, @@ -80,7 +80,7 @@ "items": [ { "type": "state", - "div_id": "left", + "id": "left", "states": [ { "state_id": "not_tapped", @@ -153,7 +153,7 @@ }, { "type": "state", - "div_id": "up", + "id": "up", "states": [ { "state_id": "not_tapped", @@ -226,7 +226,7 @@ }, { "type": "state", - "div_id": "right", + "id": "right", "states": [ { "state_id": "not_tapped", @@ -299,7 +299,7 @@ }, { "type": "state", - "div_id": "down", + "id": "down", "states": [ { "state_id": "not_tapped", diff --git a/test_data/regression_test_data/focus_actions.json b/test_data/regression_test_data/focus_actions.json index 7c5925b40..6063e28ab 100644 --- a/test_data/regression_test_data/focus_actions.json +++ b/test_data/regression_test_data/focus_actions.json @@ -49,7 +49,7 @@ "state_id": 0, "div": { "type": "container", - "div_id": "container", + "id": "container", "paddings": { "left": 8, "right": 8, @@ -73,13 +73,13 @@ "items": [ { "type": "container", - "div_id": "container", + "id": "container", "orientation": "horizontal", "content_horizontal_alignment": "center", "items": [ { "type": "button", - "div_id": "focus", + "id": "focus", "text": "handler", "focus": { "background": [ @@ -110,7 +110,7 @@ }, { "type": "button", - "div_id": "focus", + "id": "focus", "text": "idle", "focus": { "background": [ @@ -129,7 +129,7 @@ }, { "type": "state", - "div_id": "indicator", + "id": "indicator", "height": { "type": "wrap_content" }, 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 a46a9b56b..3e7807883 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 @@ -62,7 +62,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -194,7 +194,7 @@ "restrict_parent_scroll": 1 }, { - "div_id": "description", + "id": "description", "type": "state", "states": [ { @@ -208,7 +208,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -289,7 +289,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -370,7 +370,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -451,7 +451,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", 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 636c1cf45..a8d8ea7bd 100644 --- a/test_data/regression_test_data/gallery/gallery-bottom-multiline.json +++ b/test_data/regression_test_data/gallery/gallery-bottom-multiline.json @@ -62,7 +62,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -170,7 +170,7 @@ "restrict_parent_scroll": 1 }, { - "div_id": "description", + "id": "description", "type": "state", "states": [ { @@ -184,7 +184,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -265,7 +265,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -346,7 +346,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -427,7 +427,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", 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 c2b42e679..b35693f90 100644 --- a/test_data/regression_test_data/gallery/gallery-bottom-singleline.json +++ b/test_data/regression_test_data/gallery/gallery-bottom-singleline.json @@ -62,7 +62,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -194,7 +194,7 @@ "restrict_parent_scroll": 1 }, { - "div_id": "description", + "id": "description", "type": "state", "states": [ { @@ -208,7 +208,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -289,7 +289,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -370,7 +370,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -451,7 +451,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", 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 8743d4a58..3de26ce22 100644 --- a/test_data/regression_test_data/gallery/gallery-top-multiline.json +++ b/test_data/regression_test_data/gallery/gallery-top-multiline.json @@ -62,7 +62,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -101,7 +101,7 @@ } }, { - "div_id": "description", + "id": "description", "type": "state", "states": [ { @@ -115,7 +115,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -196,7 +196,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -277,7 +277,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", @@ -358,7 +358,7 @@ "items": [ { "type": "state", - "div_id": "text", + "id": "text", "states": [ { "state_id": "short", diff --git a/test_data/regression_test_data/gallery/gallery_default_item_states.json b/test_data/regression_test_data/gallery/gallery_default_item_states.json index 72e743345..fd122e4f8 100644 --- a/test_data/regression_test_data/gallery/gallery_default_item_states.json +++ b/test_data/regression_test_data/gallery/gallery_default_item_states.json @@ -158,7 +158,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -205,7 +205,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", 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 92bd245e4..3d675e0ca 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 @@ -160,7 +160,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -207,7 +207,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", diff --git a/test_data/regression_test_data/gallery/zoomable-gallery.json b/test_data/regression_test_data/gallery/zoomable-gallery.json index 8fa9a9496..4287813df 100644 --- a/test_data/regression_test_data/gallery/zoomable-gallery.json +++ b/test_data/regression_test_data/gallery/zoomable-gallery.json @@ -98,7 +98,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", diff --git a/test_data/regression_test_data/grid_layout.json b/test_data/regression_test_data/grid_layout.json index bd357688b..5ea4a3f2f 100644 --- a/test_data/regression_test_data/grid_layout.json +++ b/test_data/regression_test_data/grid_layout.json @@ -134,7 +134,7 @@ }, { "type": "state", - "div_id": "button", + "id": "button", "states": [ { "state_id": "state0", diff --git a/test_data/regression_test_data/logging.json b/test_data/regression_test_data/logging.json index dbc4ed880..47ba0e5b5 100644 --- a/test_data/regression_test_data/logging.json +++ b/test_data/regression_test_data/logging.json @@ -45,7 +45,7 @@ { "state_id": 0, "div": { - "div_id": "label", + "id": "label", "alignment_vertical": "center", "type": "button", "text": "Test button", diff --git a/test_data/regression_test_data/pager/pager-selected-actions.json b/test_data/regression_test_data/pager/pager-selected-actions.json index af033167b..609c11152 100644 --- a/test_data/regression_test_data/pager/pager-selected-actions.json +++ b/test_data/regression_test_data/pager/pager-selected-actions.json @@ -101,7 +101,7 @@ "type": "pager" }, { - "div_id": "description", + "id": "description", "states": [ { "div": { 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 a95c6d5e0..caf66475e 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 @@ -169,7 +169,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -210,7 +210,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", 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 ad2173e34..9a3cc1e5f 100644 --- a/test_data/regression_test_data/pager/pager_infinite_scroll.json +++ b/test_data/regression_test_data/pager/pager_infinite_scroll.json @@ -211,7 +211,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -252,7 +252,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", diff --git a/test_data/regression_test_data/patch/state_partial.json b/test_data/regression_test_data/patch/state_partial.json index f5915c0b0..313688686 100644 --- a/test_data/regression_test_data/patch/state_partial.json +++ b/test_data/regression_test_data/patch/state_partial.json @@ -82,7 +82,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "state_id_variable": "state_id", "states": [ { diff --git a/test_data/regression_test_data/patch/state_transactional_broken.json b/test_data/regression_test_data/patch/state_transactional_broken.json index 1e561ee72..c0daf786b 100644 --- a/test_data/regression_test_data/patch/state_transactional_broken.json +++ b/test_data/regression_test_data/patch/state_transactional_broken.json @@ -82,7 +82,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "state_id_variable": "state_id", "states": [ { diff --git a/test_data/regression_test_data/patch/state_transactional_success.json b/test_data/regression_test_data/patch/state_transactional_success.json index 2b6c188c0..b8f9d3aae 100644 --- a/test_data/regression_test_data/patch/state_transactional_success.json +++ b/test_data/regression_test_data/patch/state_transactional_success.json @@ -82,7 +82,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "state_id_variable": "state_id", "states": [ { diff --git a/test_data/regression_test_data/shortcuts.json b/test_data/regression_test_data/shortcuts.json index c1c79876e..908325e20 100644 --- a/test_data/regression_test_data/shortcuts.json +++ b/test_data/regression_test_data/shortcuts.json @@ -646,7 +646,7 @@ "items": [ { "type": "state", - "div_id": "shortcuts_stack", + "id": "shortcuts_stack", "width": { "type": "fixed", "value": 114, @@ -1288,7 +1288,7 @@ }, { "type": "state", - "div_id": "switch_button", + "id": "switch_button", "states": [ { "state_id": "button_0", diff --git a/test_data/regression_test_data/simple_tap.json b/test_data/regression_test_data/simple_tap.json index f3682654b..a26734467 100644 --- a/test_data/regression_test_data/simple_tap.json +++ b/test_data/regression_test_data/simple_tap.json @@ -46,7 +46,7 @@ "state_id": 0, "div": { "type": "state", - "div_id": "label", + "id": "label", "alignment_vertical": "center", "height": { "type": "match_parent" diff --git a/test_data/regression_test_data/slider_nps.json b/test_data/regression_test_data/slider_nps.json index faa3529ab..e0b9385ad 100644 --- a/test_data/regression_test_data/slider_nps.json +++ b/test_data/regression_test_data/slider_nps.json @@ -290,7 +290,7 @@ }, { "type": "counter", - "div_id": "counter" + "id": "counter" } ] } diff --git a/test_data/regression_test_data/slider_presets.json b/test_data/regression_test_data/slider_presets.json index a92901480..6e20249d3 100644 --- a/test_data/regression_test_data/slider_presets.json +++ b/test_data/regression_test_data/slider_presets.json @@ -453,7 +453,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "thumb_value_variable": "first_thumb_value", "accessibility": { "description": "Default slider" @@ -465,7 +465,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "min_value": 0, "max_value": 10, "thumb_value_variable": "second_thumb_value", @@ -525,7 +525,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "min_value": 0, "max_value": 3, "thumb_value_variable": "third_thumb_value", @@ -585,7 +585,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "min_value": 0, "max_value": 10, "thumb_value_variable": "fourth_thumb_value", @@ -665,7 +665,7 @@ }, { "type": "slider_preset", - "div_id": "slider_default", + "id": "slider_default", "thumb_value_variable": "fifth_thumb_value", "thumb_secondary_value_variable": "fifth_thumb_secondary_value", "accessibility": { @@ -701,7 +701,7 @@ }, { "type": "state", - "div_id": "custom_slider", + "id": "custom_slider", "default_state_id": "no_tick_marks_1_thumb", "states": [ { @@ -760,7 +760,7 @@ "items": [ { "type": "state", - "div_id": "secondary_thumb_switch", + "id": "secondary_thumb_switch", "width": { "type": "fixed", "value": 40 @@ -812,7 +812,7 @@ "items": [ { "type": "state", - "div_id": "tick_marks_switch", + "id": "tick_marks_switch", "width": { "type": "fixed", "value": 40 diff --git a/test_data/regression_test_data/slider_shapes.json b/test_data/regression_test_data/slider_shapes.json index 803d29a8b..a1b5e366c 100644 --- a/test_data/regression_test_data/slider_shapes.json +++ b/test_data/regression_test_data/slider_shapes.json @@ -108,7 +108,7 @@ }, { "type": "slider_preset", - "div_id": "slider_round_rect" + "id": "slider_round_rect" }, { "type": "title_preset", @@ -116,7 +116,7 @@ }, { "type": "slider_circle", - "div_id": "slider_circle" + "id": "slider_circle" } ] } diff --git a/test_data/regression_test_data/state/default_state_id.json b/test_data/regression_test_data/state/default_state_id.json index 416f43ffa..c98b0f82e 100644 --- a/test_data/regression_test_data/state/default_state_id.json +++ b/test_data/regression_test_data/state/default_state_id.json @@ -6,7 +6,7 @@ "state_id": 0, "div": { "type": "state", - "div_id": "state_container", + "id": "state_container", "default_state_id": "@{'default'}", "states": [ { diff --git a/test_data/regression_test_data/state_binding.json b/test_data/regression_test_data/state_binding.json index a9e76d5b8..58a0c278c 100644 --- a/test_data/regression_test_data/state_binding.json +++ b/test_data/regression_test_data/state_binding.json @@ -60,7 +60,7 @@ { "type": "state", "content_alignment_vertical": "center", - "div_id": "state_container", + "id": "state_container", "state_id_variable": "state_variable", "states": [ { diff --git a/test_data/regression_test_data/states_default_state.json b/test_data/regression_test_data/states_default_state.json index 74d4aae7d..b879fd611 100644 --- a/test_data/regression_test_data/states_default_state.json +++ b/test_data/regression_test_data/states_default_state.json @@ -53,7 +53,7 @@ "type": "match_parent" }, "content_alignment_vertical": "center", - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/regression_test_data/variables/div_image.json b/test_data/regression_test_data/variables/div_image.json index 1abc89dfe..44c5e6681 100644 --- a/test_data/regression_test_data/variables/div_image.json +++ b/test_data/regression_test_data/variables/div_image.json @@ -39,7 +39,7 @@ "state_id": 0, "div": { "type": "container", - "div_id": "label", + "id": "label", "alignment_vertical": "center", "height": { "type": "match_parent" diff --git a/test_data/regression_test_data/variables/div_pager.json b/test_data/regression_test_data/variables/div_pager.json index 7755d294d..e12614f0e 100644 --- a/test_data/regression_test_data/variables/div_pager.json +++ b/test_data/regression_test_data/variables/div_pager.json @@ -242,7 +242,7 @@ "items": [ { "type": "state", - "div_id": "pager_container", + "id": "pager_container", "default_state_id": "fixed", "states": [ { diff --git a/test_data/regression_test_data/variables/div_variable_triggers.json b/test_data/regression_test_data/variables/div_variable_triggers.json index 8e70f00ec..7ff3b7fc4 100644 --- a/test_data/regression_test_data/variables/div_variable_triggers.json +++ b/test_data/regression_test_data/variables/div_variable_triggers.json @@ -127,7 +127,7 @@ "items": [ { "type": "state", - "div_id": "left_button", + "id": "left_button", "states": [ { "state_id": "off", @@ -173,7 +173,7 @@ }, { "type": "state", - "div_id": "right_button", + "id": "right_button", "states": [ { "state_id": "off", diff --git a/test_data/regression_test_data/video/video_callbacks.json b/test_data/regression_test_data/video/video_callbacks.json index 66b0cdff0..5f7336f98 100644 --- a/test_data/regression_test_data/video/video_callbacks.json +++ b/test_data/regression_test_data/video/video_callbacks.json @@ -129,7 +129,7 @@ "items": [ { "type": "state", - "div_id": "video", + "id": "video", "states": [ { "state_id": "normal", @@ -308,7 +308,7 @@ }, { "type": "state", - "div_id": "play_signal", + "id": "play_signal", "states": [ { "state_id": "play_not_called", @@ -328,7 +328,7 @@ }, { "type": "state", - "div_id": "pause_signal", + "id": "pause_signal", "states": [ { "state_id": "pause_not_called", @@ -348,7 +348,7 @@ }, { "type": "state", - "div_id": "buffering_signal", + "id": "buffering_signal", "states": [ { "state_id": "buffering_not_called", @@ -368,7 +368,7 @@ }, { "type": "state", - "div_id": "end_signal", + "id": "end_signal", "states": [ { "state_id": "end_not_called", @@ -388,7 +388,7 @@ }, { "type": "state", - "div_id": "fatal_signal", + "id": "fatal_signal", "states": [ { "state_id": "fatal_not_called", diff --git a/test_data/regression_test_data/visibility_actions/article.json b/test_data/regression_test_data/visibility_actions/article.json index 4eb205d39..e7ea00676 100644 --- a/test_data/regression_test_data/visibility_actions/article.json +++ b/test_data/regression_test_data/visibility_actions/article.json @@ -139,7 +139,7 @@ "bottom": 8 }, "column_span": 2, - "$div_id": "comment_id", + "$id": "comment_id", "states": [ { "state_id": "collapsed", @@ -281,7 +281,7 @@ }, { "type": "state", - "div_id": "content", + "id": "content", "states": [ { "state_id": "collapsed", @@ -329,7 +329,7 @@ }, { "type": "state", - "div_id": "comments", + "id": "comments", "states": [ { "state_id": "collapsed", @@ -493,7 +493,7 @@ "margins": { "bottom": 8 }, - "div_id": "comments_button", + "id": "comments_button", "states": [ { "state_id": "text_show_comments", @@ -558,7 +558,7 @@ }, { "type": "state", - "div_id": "button", + "id": "button", "states": [ { "state_id": "text_expand", diff --git a/test_data/regression_test_data/visibility_actions/default_item.json b/test_data/regression_test_data/visibility_actions/default_item.json index 6b9115588..9dd3a5429 100644 --- a/test_data/regression_test_data/visibility_actions/default_item.json +++ b/test_data/regression_test_data/visibility_actions/default_item.json @@ -84,7 +84,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -93,7 +93,7 @@ "items": [ { "type": "state", - "div_id": "slider", + "id": "slider", "states": [ { "state_id": "without_ad", @@ -288,7 +288,7 @@ }, { "type": "state", - "div_id": "description", + "id": "description", "states": [ { "state_id": "0", @@ -349,7 +349,7 @@ { "state_id": "4", "div": { - "div_id": "text", + "id": "text", "type": "text_14_18_standard", "text_14_18_regular__text": "Item 4", "max_lines": 2, diff --git a/test_data/regression_test_data/visibility_actions/pager.json b/test_data/regression_test_data/visibility_actions/pager.json index 30e558ed3..8079d867d 100644 --- a/test_data/regression_test_data/visibility_actions/pager.json +++ b/test_data/regression_test_data/visibility_actions/pager.json @@ -70,7 +70,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -79,7 +79,7 @@ "items": [ { "type": "state", - "div_id": "slider", + "id": "slider", "states": [ { "state_id": "without_ad", diff --git a/test_data/regression_test_data/visibility_actions/states.json b/test_data/regression_test_data/visibility_actions/states.json index 57fe35783..3c48fce79 100644 --- a/test_data/regression_test_data/visibility_actions/states.json +++ b/test_data/regression_test_data/visibility_actions/states.json @@ -49,7 +49,7 @@ "items": [ { "type": "state", - "div_id": "states", + "id": "states", "states": [ { "state_id": "state1", diff --git a/test_data/regression_test_data/visibility_actions/swipe_div_pager.json b/test_data/regression_test_data/visibility_actions/swipe_div_pager.json index 6afa3e50c..2d4a76656 100644 --- a/test_data/regression_test_data/visibility_actions/swipe_div_pager.json +++ b/test_data/regression_test_data/visibility_actions/swipe_div_pager.json @@ -85,7 +85,7 @@ "items": [ { "type": "state", - "div_id": "body", + "id": "body", "states": [ { "state_id": "card", @@ -94,7 +94,7 @@ "items": [ { "type": "state", - "div_id": "slider", + "id": "slider", "states": [ { "state_id": "without_ad", @@ -258,7 +258,7 @@ }, { "type": "state", - "div_id": "description", + "id": "description", "states": [ { "state_id": "0", @@ -319,7 +319,7 @@ { "state_id": "4", "div": { - "div_id": "text", + "id": "text", "type": "text_14_18_standard", "text_14_18_regular__text": "Item 4", "max_lines": 2, diff --git a/test_data/samples/animations/transition_change.json b/test_data/samples/animations/transition_change.json index 67cd567db..48e1912de 100644 --- a/test_data/samples/animations/transition_change.json +++ b/test_data/samples/animations/transition_change.json @@ -154,7 +154,7 @@ "type": "fixed", "value": 250 }, - "div_id": "transition_change_demo_state", + "id": "transition_change_demo_state", "states": [ { "state_id": "state1", diff --git a/test_data/samples/state/button.json b/test_data/samples/state/button.json index f927dd251..5a5f1d114 100644 --- a/test_data/samples/state/button.json +++ b/test_data/samples/state/button.json @@ -80,7 +80,7 @@ }, { "type": "state", - "div_id": "sample", + "id": "sample", "states": [ { "state_id": "first", diff --git a/test_data/samples/state/empty.json b/test_data/samples/state/empty.json index e650b2676..83dd9bce6 100644 --- a/test_data/samples/state/empty.json +++ b/test_data/samples/state/empty.json @@ -76,7 +76,7 @@ }, { "type": "state", - "div_id": "sample", + "id": "sample", "states": [ { "state_id": "visible", diff --git a/test_data/snapshot_test_data/div-gallery/gallery-default-item-with-states.json b/test_data/snapshot_test_data/div-gallery/gallery-default-item-with-states.json index 204cf38ad..3fb97761b 100644 --- a/test_data/snapshot_test_data/div-gallery/gallery-default-item-with-states.json +++ b/test_data/snapshot_test_data/div-gallery/gallery-default-item-with-states.json @@ -40,7 +40,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -67,7 +67,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", diff --git a/test_data/snapshot_test_data/div-pager/pager-default-item-with-states.json b/test_data/snapshot_test_data/div-pager/pager-default-item-with-states.json index e3541ed85..68b5b226c 100644 --- a/test_data/snapshot_test_data/div-pager/pager-default-item-with-states.json +++ b/test_data/snapshot_test_data/div-pager/pager-default-item-with-states.json @@ -68,7 +68,7 @@ }, { "type": "state", - "$div_id": "content_id", + "$id": "content_id", "states": [ { "state_id": "collapsed", @@ -109,7 +109,7 @@ }, { "type": "state", - "$div_id": "button_id", + "$id": "button_id", "states": [ { "state_id": "text_expand", diff --git a/test_data/snapshot_test_data/div-slider/slider_with_error_and_warning.json b/test_data/snapshot_test_data/div-slider/slider_with_error_and_warning.json index 47ae17820..fbaedee7b 100644 --- a/test_data/snapshot_test_data/div-slider/slider_with_error_and_warning.json +++ b/test_data/snapshot_test_data/div-slider/slider_with_error_and_warning.json @@ -174,7 +174,7 @@ }, { "type": "counter", - "div_id": "counter" + "id": "counter" } ] } diff --git a/test_data/snapshot_test_data/div-states/borders.json b/test_data/snapshot_test_data/div-states/borders.json index 2501eb8cb..c69344de8 100644 --- a/test_data/snapshot_test_data/div-states/borders.json +++ b/test_data/snapshot_test_data/div-states/borders.json @@ -39,7 +39,7 @@ "left": 12, "right": 12 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/snapshot_test_data/div-states/default-state.json b/test_data/snapshot_test_data/div-states/default-state.json index 967077606..d7abe5c5d 100644 --- a/test_data/snapshot_test_data/div-states/default-state.json +++ b/test_data/snapshot_test_data/div-states/default-state.json @@ -21,7 +21,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/ui_test_data/tooltips/div_tooltips.json b/test_data/ui_test_data/tooltips/div_tooltips.json index 92a9e4b1b..92dc7c889 100644 --- a/test_data/ui_test_data/tooltips/div_tooltips.json +++ b/test_data/ui_test_data/tooltips/div_tooltips.json @@ -101,8 +101,7 @@ }, "type": "state", "alignment_horizontal": "center", - "div_id": "status", - "id": "status_text", + "id": "status", "states": [ { "state_id": "hidden", 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 21678a226..b7bacf543 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 @@ -5,7 +5,7 @@ "items": [ { "type": "state", - "div_id": "alert2", + "id": "alert2", "states": [ { "state_id": "shown", diff --git a/test_data/unit_test_data/div-state/autoanimations/new_state_empty_state.json b/test_data/unit_test_data/div-state/autoanimations/new_state_empty_state.json index 5f63508b9..010d0287d 100644 --- a/test_data/unit_test_data/div-state/autoanimations/new_state_empty_state.json +++ b/test_data/unit_test_data/div-state/autoanimations/new_state_empty_state.json @@ -1,6 +1,6 @@ { "type": "state", - "div_id": "alert3", + "id": "alert3", "states": [ { "state_id": "shown" diff --git a/test_data/unit_test_data/div-state/autoanimations/new_state_incompatible.json b/test_data/unit_test_data/div-state/autoanimations/new_state_incompatible.json index bbf3b36c2..346fae4ef 100644 --- a/test_data/unit_test_data/div-state/autoanimations/new_state_incompatible.json +++ b/test_data/unit_test_data/div-state/autoanimations/new_state_incompatible.json @@ -1,6 +1,6 @@ { "type": "state", - "div_id": "alert3", + "id": "alert3", "states": [ { "state_id": "shown", diff --git a/test_data/unit_test_data/div-state/autoanimations/old_state.json b/test_data/unit_test_data/div-state/autoanimations/old_state.json index c50d1da29..597ade349 100644 --- a/test_data/unit_test_data/div-state/autoanimations/old_state.json +++ b/test_data/unit_test_data/div-state/autoanimations/old_state.json @@ -1,6 +1,6 @@ { "type": "state", - "div_id": "alert2", + "id": "alert2", "states": [ { "state_id": "shown", diff --git a/test_data/unit_test_data/div-state/autoanimations/old_state_no_swipe_actions.json b/test_data/unit_test_data/div-state/autoanimations/old_state_no_swipe_actions.json index 78275ddf2..eb2ec0d51 100644 --- a/test_data/unit_test_data/div-state/autoanimations/old_state_no_swipe_actions.json +++ b/test_data/unit_test_data/div-state/autoanimations/old_state_no_swipe_actions.json @@ -1,6 +1,6 @@ { "type": "state", - "div_id": "alert2", + "id": "alert2", "states": [ { "state_id": "shown", diff --git a/test_data/unit_test_data/div-state/default_state.json b/test_data/unit_test_data/div-state/default_state.json index 87ff2b40a..715f6d7a0 100644 --- a/test_data/unit_test_data/div-state/default_state.json +++ b/test_data/unit_test_data/div-state/default_state.json @@ -8,7 +8,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/unit_test_data/div-state/gallery_text_container.json b/test_data/unit_test_data/div-state/gallery_text_container.json index c01224212..9116ce4bc 100644 --- a/test_data/unit_test_data/div-state/gallery_text_container.json +++ b/test_data/unit_test_data/div-state/gallery_text_container.json @@ -15,7 +15,7 @@ }, { "type": "state", - "div_id": "more", + "id": "more", "states": [ { "state_id": "collapsed" diff --git a/test_data/unit_test_data/div-state/reusable_states.json b/test_data/unit_test_data/div-state/reusable_states.json index 0b2635214..fa585fec0 100644 --- a/test_data/unit_test_data/div-state/reusable_states.json +++ b/test_data/unit_test_data/div-state/reusable_states.json @@ -8,7 +8,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "states": [ { "state_id": "first_state", diff --git a/test_data/unit_test_data/div-state/state_list.json b/test_data/unit_test_data/div-state/state_list.json index 4e1a9cdfe..48d16869c 100644 --- a/test_data/unit_test_data/div-state/state_list.json +++ b/test_data/unit_test_data/div-state/state_list.json @@ -8,7 +8,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "states": [ { "state_id": "first", diff --git a/test_data/unit_test_data/div-state/state_tree.json b/test_data/unit_test_data/div-state/state_tree.json index bb7b73438..a69f977fc 100644 --- a/test_data/unit_test_data/div-state/state_tree.json +++ b/test_data/unit_test_data/div-state/state_tree.json @@ -1,6 +1,6 @@ { "type": "state", - "div_id": "state_container", + "id": "state_container", "states": [ { "state_id": "first", @@ -15,7 +15,6 @@ "items": [ { "type": "state", - "div_id": "container_item_one", "id": "container_item_one", "states": [ { @@ -43,7 +42,7 @@ }, { "type": "state", - "div_id": "container_item_two", + "id": "container_item_two", "states": [ { "state_id": "one", @@ -70,7 +69,7 @@ }, { "type": "state", - "div_id": "container_item_three", + "id": "container_item_three", "states": [ { "state_id": "one", @@ -104,7 +103,7 @@ "state_id": "second", "div": { "type": "state", - "div_id": "second_state", + "id": "second_state", "states": [ { "state_id": "hidden", diff --git a/test_data/unit_test_data/div-state/text_state.json b/test_data/unit_test_data/div-state/text_state.json index 0a09832b7..3663eb25e 100644 --- a/test_data/unit_test_data/div-state/text_state.json +++ b/test_data/unit_test_data/div-state/text_state.json @@ -9,7 +9,7 @@ }, { "type": "state", - "div_id": "more", + "id": "more", "states": [ { "state_id": "collapsed" diff --git a/test_data/unit_test_data/div-state/text_state_text.json b/test_data/unit_test_data/div-state/text_state_text.json index a1e4c9039..c7bc4c637 100644 --- a/test_data/unit_test_data/div-state/text_state_text.json +++ b/test_data/unit_test_data/div-state/text_state_text.json @@ -9,7 +9,7 @@ }, { "type": "state", - "div_id": "more", + "id": "more", "states": [ { "state_id": "collapsed" diff --git a/test_data/unit_test_data/patches/state/state-initial.json b/test_data/unit_test_data/patches/state/state-initial.json index 15c8a091f..d30e97b90 100644 --- a/test_data/unit_test_data/patches/state/state-initial.json +++ b/test_data/unit_test_data/patches/state/state-initial.json @@ -15,7 +15,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/unit_test_data/patches/state/state-success-partial.json b/test_data/unit_test_data/patches/state/state-success-partial.json index b6caa321e..b1bdc4946 100644 --- a/test_data/unit_test_data/patches/state/state-success-partial.json +++ b/test_data/unit_test_data/patches/state/state-success-partial.json @@ -55,7 +55,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ { diff --git a/test_data/unit_test_data/patches/state/state-success-transactional.json b/test_data/unit_test_data/patches/state/state-success-transactional.json index f81a3d58f..6770a327a 100644 --- a/test_data/unit_test_data/patches/state/state-success-transactional.json +++ b/test_data/unit_test_data/patches/state/state-success-transactional.json @@ -55,7 +55,7 @@ "type": "fixed", "value": 200 }, - "div_id": "state_container", + "id": "state_container", "default_state_id": "default", "states": [ {