diff --git a/.mapping.json b/.mapping.json index 6486c0b01..807b4dfa4 100644 --- a/.mapping.json +++ b/.mapping.json @@ -2464,6 +2464,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -3595,6 +3596,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -4726,6 +4728,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -5857,6 +5860,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -6988,6 +6992,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -8119,6 +8124,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -9250,6 +9256,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -10381,6 +10388,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -11512,6 +11520,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator-empty.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/horizontal-with-separator.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/index.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-with-local-variables.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/nested-builders.png", @@ -14677,6 +14686,8 @@ "client/ios/Tests/reference_snapshots/div-container/horizontal-with-separator_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/horizontal-with-separator_414@3x.png", "client/ios/Tests/reference_snapshots/div-container/item_builder/index_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/index_375@2x.png", "client/ios/Tests/reference_snapshots/div-container/item_builder/index_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/index_414@3x.png", + "client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_375@2x.png", + "client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_414@3x.png", "client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-with-local-variables_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-with-local-variables_375@2x.png", "client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-with-local-variables_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-with-local-variables_414@3x.png", "client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder_375@2x.png", @@ -16928,6 +16939,8 @@ "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/horizontal-with-separator/firefoxMobile/horizontal-with-separator.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/horizontal-with-separator/firefoxMobile/horizontal-with-separator.png", "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/index/chromeMobile/index.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/index/chromeMobile/index.png", "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/index/firefoxMobile/index.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/index/firefoxMobile/index.png", + "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/chromeMobile/item-builder-priority.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/chromeMobile/item-builder-priority.png", + "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/firefoxMobile/item-builder-priority.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/firefoxMobile/item-builder-priority.png", "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-with-local-variables/chromeMobile/item-builder-with-local-variables.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-with-local-variables/chromeMobile/item-builder-with-local-variables.png", "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-with-local-variables/firefoxMobile/item-builder-with-local-variables.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-with-local-variables/firefoxMobile/item-builder-with-local-variables.png", "client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder/chromeMobile/item-builder.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder/chromeMobile/item-builder.png", @@ -20748,6 +20761,7 @@ "test_data/snapshot_test_data/div-container/horizontal-with-separator-empty.json":"divkit/public/test_data/snapshot_test_data/div-container/horizontal-with-separator-empty.json", "test_data/snapshot_test_data/div-container/horizontal-with-separator.json":"divkit/public/test_data/snapshot_test_data/div-container/horizontal-with-separator.json", "test_data/snapshot_test_data/div-container/item_builder/index.json":"divkit/public/test_data/snapshot_test_data/div-container/item_builder/index.json", + "test_data/snapshot_test_data/div-container/item_builder/item-builder-priority.json":"divkit/public/test_data/snapshot_test_data/div-container/item_builder/item-builder-priority.json", "test_data/snapshot_test_data/div-container/item_builder/item-builder-with-local-variables.json":"divkit/public/test_data/snapshot_test_data/div-container/item_builder/item-builder-with-local-variables.json", "test_data/snapshot_test_data/div-container/item_builder/item-builder.json":"divkit/public/test_data/snapshot_test_data/div-container/item_builder/item-builder.json", "test_data/snapshot_test_data/div-container/item_builder/nested-builders.json":"divkit/public/test_data/snapshot_test_data/div-container/item_builder/nested-builders.json", diff --git a/client/android/div/src/main/java/com/yandex/div/internal/core/DivCollectionExtensions.kt b/client/android/div/src/main/java/com/yandex/div/internal/core/DivCollectionExtensions.kt index f14db3010..98380e0b4 100644 --- a/client/android/div/src/main/java/com/yandex/div/internal/core/DivCollectionExtensions.kt +++ b/client/android/div/src/main/java/com/yandex/div/internal/core/DivCollectionExtensions.kt @@ -30,8 +30,13 @@ fun DivGallery.buildItems(resolver: ExpressionResolver): List = buildItems(items, itemBuilder, resolver) -private fun buildItems(items: List
?, itemBuilder: DivCollectionItemBuilder?, resolver: ExpressionResolver) = - items?.toDivItemBuilderResult(resolver) ?: itemBuilder?.build(resolver) ?: emptyList() +private fun buildItems(items: List
?, + itemBuilder: DivCollectionItemBuilder?, + resolver: ExpressionResolver): List { + return itemBuilder?.build(resolver) + ?: items?.toDivItemBuilderResult(resolver) + ?: emptyList() +} internal fun DivCollectionItemBuilder.build(resolver: ExpressionResolver): List = data.evaluate(resolver).mapIndexedNotNull { i, obj -> buildItem(obj, i, resolver) } diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..6bdcfd88f Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..86d420aea Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..46d13f39d Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..bf5fd231a Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..46d13f39d Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..a2a454c60 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..10fd28b58 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..a2a454c60 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png new file mode 100644 index 000000000..10fd28b58 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/item_builder/item-builder-priority.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_375@2x.png b/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_375@2x.png new file mode 100644 index 000000000..0aad02be7 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_375@2x.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_414@3x.png b/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_414@3x.png new file mode 100644 index 000000000..90bf0ac21 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/item_builder/item-builder-priority_414@3x.png differ diff --git a/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/chromeMobile/item-builder-priority.png b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/chromeMobile/item-builder-priority.png new file mode 100644 index 000000000..5d747e265 Binary files /dev/null and b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/chromeMobile/item-builder-priority.png differ diff --git a/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/firefoxMobile/item-builder-priority.png b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/firefoxMobile/item-builder-priority.png new file mode 100644 index 000000000..e1d092c5b Binary files /dev/null and b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/item_builder/item-builder-priority/firefoxMobile/item-builder-priority.png differ diff --git a/test_data/snapshot_test_data/div-container/item_builder/item-builder-priority.json b/test_data/snapshot_test_data/div-container/item_builder/item-builder-priority.json new file mode 100644 index 000000000..4b9f886f7 --- /dev/null +++ b/test_data/snapshot_test_data/div-container/item_builder/item-builder-priority.json @@ -0,0 +1,108 @@ +{ + "description": "item_builder has priority over items in the container.", + "platforms": [ + "android", + "ios", + "web" + ], + "templates": { + "exampleCard": { + "type": "container", + "border": { + "corner_radius": 16, + "stroke": { + "color": "#aaaaaa", + "width": 1 + } + }, + "margins": { + "bottom": 6 + }, + "orientation": "vertical", + "paddings": { + "top": 12, + "bottom": 12, + "left": 12, + "right": 12 + } + } + }, + "card": { + "log_id": "prototypes", + "variables": [ + { + "name": "data", + "type": "array", + "value": [ + { + "style": "only_text", + "title": "item from item_builder" + } + ] + } + ], + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "items": [ + { + "type": "container", + "orientation": "vertical", + "item_builder": { + "data": "@{data}", + "data_element_name": "item", + "prototypes": [ + { + "selector": "@{getStringFromDict(item, 'style') == 'only_text'}", + "div": { + "type": "exampleCard", + "items": [ + { + "type": "text", + "text": "@{getStringFromDict(item, 'title')}", + "width": { + "type": "wrap_content" + }, + "font_size": 16, + "margins": { + "bottom": 4 + } + } + ], + "width": { + "type": "wrap_content" + } + } + } + ] + }, + "items": [ + { + "type": "exampleCard", + "items": [ + { + "type": "text", + "text": "Item from items", + "width": { + "type": "wrap_content" + }, + "font_size": 16, + "margins": { + "bottom": 4 + } + } + ], + "width": { + "type": "wrap_content" + } + } + ] + } + ] + } + } + ] + } +}