Renamed div_id to id in test data

This commit is contained in:
pkurchatov
2024-01-09 14:54:26 +03:00
parent 94a0cbf33d
commit 50ddd8fc45
98 changed files with 215 additions and 216 deletions
@@ -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(
@@ -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")
@@ -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
@@ -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<DivImageLoader>()
internal val imageStubProvider = mock<Div2ImageStubProvider>()
internal val context = RuntimeEnvironment.application
private val expressionResolver = mock<ExpressionResolver>()
@@ -62,18 +61,21 @@ open class DivBinderTest {
divExtensionController,
)
).apply {
whenever(divView.releaseViewVisitor).doReturn(this)
whenever(divView.releaseViewVisitor) doReturn this
}
private val transitionBuilder = mock<DivTransitionBuilder> {
on { buildTransitions(fromDiv = anyOrNull(), toDiv = anyOrNull(), any()) } doReturn TransitionSet()
}
private val mockViewComponent = mock<Div2ViewComponent>(defaultAnswer = Mockito.RETURNS_DEEP_STUBS) {
private val viewIdProvider = DivViewIdProvider()
private val viewComponent = mock<Div2ViewComponent>(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()))
@@ -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
@@ -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",
@@ -111,7 +111,7 @@
},
"page": {
"type": "state",
"$div_id": "page_id",
"$id": "page_id",
"states": [
{
"state_id": "stub",
@@ -543,7 +543,7 @@
},
{
"type": "state",
"div_id": "card_content",
"id": "card_content",
"states": [
{
"state_id": "stub",
@@ -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"
},
@@ -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",
@@ -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": {
@@ -48,7 +48,7 @@
}
},
{
"div_id": "text",
"id": "text",
"height": {
"type": "match_parent"
},
@@ -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",
@@ -103,7 +103,7 @@
"state_id": 0,
"div": {
"type": "state",
"div_id": "state_container",
"id": "state_container",
"height": {
"type": "fixed",
"value": 300
@@ -67,7 +67,7 @@
"state_id": 0,
"div": {
"type": "state",
"div_id": "state_container",
"id": "state_container",
"height": {
"type": "fixed",
"value": 300
@@ -162,7 +162,7 @@
"items": [
{
"type": "div_base",
"div_id": "div_state_test",
"id": "div_state_test",
"default_state_id": "second_item",
"states": [
{
@@ -103,7 +103,7 @@
"items": [
{
"type": "div_base",
"div_id": "div_state_test",
"id": "div_state_test",
"default_state_id": "second_item",
"states": [
{
@@ -124,7 +124,7 @@
"state_id": 0,
"div": {
"type": "state",
"div_id": "card_state",
"id": "card_state",
"height": {
"type": "fixed",
"value": 360
@@ -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",
@@ -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",
@@ -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"
},
@@ -118,7 +118,7 @@
{
"state_id": 0,
"div": {
"div_id": "lottie_grid",
"id": "lottie_grid",
"type": "lottie_grid",
"items": [
{
@@ -108,7 +108,7 @@
{
"state_id": 0,
"div": {
"div_id": "gallery",
"id": "gallery",
"type": "gallery",
"items": [
{
@@ -140,7 +140,7 @@
},
{
"type": "state",
"div_id": "mute",
"id": "mute",
"margins": {
"left": 16,
"top": 16,
@@ -92,7 +92,7 @@
{
"state_id": 0,
"div": {
"div_id": "rive_grid",
"id": "rive_grid",
"type": "rive_grid",
"items": [
{
@@ -82,7 +82,7 @@
{
"state_id": 0,
"div": {
"div_id": "gallery",
"id": "gallery",
"type": "gallery",
"items": [
{
@@ -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": [
{
@@ -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": [
{
@@ -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": [
{
@@ -18,7 +18,7 @@
},
"button": {
"type": "state",
"$div_id": "button_id",
"$id": "button_id",
"margins": {
"left": 24,
"top": 24,
@@ -18,7 +18,7 @@
},
"button": {
"type": "state",
"$div_id": "button_id",
"$id": "button_id",
"margins": {
"left": 24,
"top": 24,
@@ -18,7 +18,7 @@
},
"button": {
"type": "state",
"$div_id": "button_id",
"$id": "button_id",
"margins": {
"left": 24,
"top": 24,
@@ -35,7 +35,7 @@
},
{
"type": "state",
"$div_id": "album_cover_id",
"$id": "album_cover_id",
"width": {
"type": "match_parent"
},
@@ -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",
@@ -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",
@@ -48,7 +48,7 @@
"card": {
"log_id": "action_button",
"type": "state",
"div_id": "action_button",
"id": "action_button",
"states": [
{
"state_id": 0,
@@ -324,7 +324,7 @@
},
{
"type": "counter",
"div_id": "counter"
"id": "counter"
}
]
}
@@ -53,7 +53,7 @@
"state_id": 0,
"div": {
"type": "container",
"div_id": "label",
"id": "label",
"alignment_vertical": "center",
"height": {
"type": "match_parent"
@@ -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",
@@ -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",
+5 -5
View File
@@ -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",
@@ -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"
},
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -98,7 +98,7 @@
"items": [
{
"type": "state",
"div_id": "body",
"id": "body",
"states": [
{
"state_id": "card",
@@ -134,7 +134,7 @@
},
{
"type": "state",
"div_id": "button",
"id": "button",
"states": [
{
"state_id": "state0",
+1 -1
View File
@@ -45,7 +45,7 @@
{
"state_id": 0,
"div": {
"div_id": "label",
"id": "label",
"alignment_vertical": "center",
"type": "button",
"text": "Test button",
@@ -101,7 +101,7 @@
"type": "pager"
},
{
"div_id": "description",
"id": "description",
"states": [
{
"div": {
@@ -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",
@@ -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",
@@ -82,7 +82,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"state_id_variable": "state_id",
"states": [
{
@@ -82,7 +82,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"state_id_variable": "state_id",
"states": [
{
@@ -82,7 +82,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"state_id_variable": "state_id",
"states": [
{
@@ -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",
@@ -46,7 +46,7 @@
"state_id": 0,
"div": {
"type": "state",
"div_id": "label",
"id": "label",
"alignment_vertical": "center",
"height": {
"type": "match_parent"
@@ -290,7 +290,7 @@
},
{
"type": "counter",
"div_id": "counter"
"id": "counter"
}
]
}
@@ -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
@@ -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"
}
]
}
@@ -6,7 +6,7 @@
"state_id": 0,
"div": {
"type": "state",
"div_id": "state_container",
"id": "state_container",
"default_state_id": "@{'default'}",
"states": [
{
@@ -60,7 +60,7 @@
{
"type": "state",
"content_alignment_vertical": "center",
"div_id": "state_container",
"id": "state_container",
"state_id_variable": "state_variable",
"states": [
{
@@ -53,7 +53,7 @@
"type": "match_parent"
},
"content_alignment_vertical": "center",
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -39,7 +39,7 @@
"state_id": 0,
"div": {
"type": "container",
"div_id": "label",
"id": "label",
"alignment_vertical": "center",
"height": {
"type": "match_parent"
@@ -242,7 +242,7 @@
"items": [
{
"type": "state",
"div_id": "pager_container",
"id": "pager_container",
"default_state_id": "fixed",
"states": [
{
@@ -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",
@@ -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",
@@ -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",
@@ -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,
@@ -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",
@@ -49,7 +49,7 @@
"items": [
{
"type": "state",
"div_id": "states",
"id": "states",
"states": [
{
"state_id": "state1",
@@ -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,
@@ -154,7 +154,7 @@
"type": "fixed",
"value": 250
},
"div_id": "transition_change_demo_state",
"id": "transition_change_demo_state",
"states": [
{
"state_id": "state1",
+1 -1
View File
@@ -80,7 +80,7 @@
},
{
"type": "state",
"div_id": "sample",
"id": "sample",
"states": [
{
"state_id": "first",
+1 -1
View File
@@ -76,7 +76,7 @@
},
{
"type": "state",
"div_id": "sample",
"id": "sample",
"states": [
{
"state_id": "visible",
@@ -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",
@@ -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",
@@ -174,7 +174,7 @@
},
{
"type": "counter",
"div_id": "counter"
"id": "counter"
}
]
}
@@ -39,7 +39,7 @@
"left": 12,
"right": 12
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -21,7 +21,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -101,8 +101,7 @@
},
"type": "state",
"alignment_horizontal": "center",
"div_id": "status",
"id": "status_text",
"id": "status",
"states": [
{
"state_id": "hidden",
@@ -5,7 +5,7 @@
"items": [
{
"type": "state",
"div_id": "alert2",
"id": "alert2",
"states": [
{
"state_id": "shown",
@@ -1,6 +1,6 @@
{
"type": "state",
"div_id": "alert3",
"id": "alert3",
"states": [
{
"state_id": "shown"
@@ -1,6 +1,6 @@
{
"type": "state",
"div_id": "alert3",
"id": "alert3",
"states": [
{
"state_id": "shown",
@@ -1,6 +1,6 @@
{
"type": "state",
"div_id": "alert2",
"id": "alert2",
"states": [
{
"state_id": "shown",
@@ -1,6 +1,6 @@
{
"type": "state",
"div_id": "alert2",
"id": "alert2",
"states": [
{
"state_id": "shown",
@@ -8,7 +8,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -15,7 +15,7 @@
},
{
"type": "state",
"div_id": "more",
"id": "more",
"states": [
{
"state_id": "collapsed"
@@ -8,7 +8,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"states": [
{
"state_id": "first_state",
@@ -8,7 +8,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"states": [
{
"state_id": "first",
@@ -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",
@@ -9,7 +9,7 @@
},
{
"type": "state",
"div_id": "more",
"id": "more",
"states": [
{
"state_id": "collapsed"
@@ -9,7 +9,7 @@
},
{
"type": "state",
"div_id": "more",
"id": "more",
"states": [
{
"state_id": "collapsed"
@@ -15,7 +15,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -55,7 +55,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{
@@ -55,7 +55,7 @@
"type": "fixed",
"value": 200
},
"div_id": "state_container",
"id": "state_container",
"default_state_id": "default",
"states": [
{