diff --git a/.mapping.json b/.mapping.json index fafe795bf..7c34fee2e 100644 --- a/.mapping.json +++ b/.mapping.json @@ -1812,6 +1812,7 @@ "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/ui/ButtonDraft.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/ui/ButtonDraft.kt", "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/video/DemoVideoCustomImageCache.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/video/DemoVideoCustomImageCache.kt", "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/divstorage/DemoAppHistogramNameProvider.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/divstorage/DemoAppHistogramNameProvider.kt", + "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/font/YandexSansCondensedTypefaceProvider.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/font/YandexSansCondensedTypefaceProvider.kt", "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/ActivityPermissionManager.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/ActivityPermissionManager.kt", "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/PermissionManager.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/PermissionManager.kt", "client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/PermissionRequest.kt":"divkit/public/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/permissions/PermissionRequest.kt", @@ -1864,6 +1865,10 @@ "client/android/divkit-demo-app/src/main/res/drawable/sandwich.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/drawable/sandwich.xml", "client/android/divkit-demo-app/src/main/res/drawable/save.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/drawable/save.xml", "client/android/divkit-demo-app/src/main/res/drawable/to_from.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/drawable/to_from.xml", + "client/android/divkit-demo-app/src/main/res/font/ys_text_cond_bold.ttf":"divkit/public/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_bold.ttf", + "client/android/divkit-demo-app/src/main/res/font/ys_text_cond_light.ttf":"divkit/public/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_light.ttf", + "client/android/divkit-demo-app/src/main/res/font/ys_text_cond_medium.ttf":"divkit/public/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_medium.ttf", + "client/android/divkit-demo-app/src/main/res/font/ys_text_cond_regular.ttf":"divkit/public/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_regular.ttf", "client/android/divkit-demo-app/src/main/res/layout/activity_div2.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/layout/activity_div2.xml", "client/android/divkit-demo-app/src/main/res/layout/activity_div2_scenario.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/layout/activity_div2_scenario.xml", "client/android/divkit-demo-app/src/main/res/layout/activity_pager_indicator.xml":"divkit/public/client/android/divkit-demo-app/src/main/res/layout/activity_pager_indicator.xml", @@ -2972,6 +2977,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -4065,6 +4071,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -5158,6 +5165,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -6251,6 +6259,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -7344,6 +7353,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -8437,6 +8447,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -9530,6 +9541,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -10623,6 +10635,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -11716,6 +11729,7 @@ "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text-shadow.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_image_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_baseline_offset.png", + "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_vertical_alignment.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_with_cloud_background.png", "client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_with_cloud_background_alignment.png", @@ -20792,6 +20806,7 @@ "test_data/snapshot_test_data/div-text/text-shadow.json":"divkit/public/test_data/snapshot_test_data/div-text/text-shadow.json", "test_data/snapshot_test_data/div-text/text_image_vertical_alignment.json":"divkit/public/test_data/snapshot_test_data/div-text/text_image_vertical_alignment.json", "test_data/snapshot_test_data/div-text/text_range_baseline_offset.json":"divkit/public/test_data/snapshot_test_data/div-text/text_range_baseline_offset.json", + "test_data/snapshot_test_data/div-text/text_range_font_family.json":"divkit/public/test_data/snapshot_test_data/div-text/text_range_font_family.json", "test_data/snapshot_test_data/div-text/text_range_vertical_alignment.json":"divkit/public/test_data/snapshot_test_data/div-text/text_range_vertical_alignment.json", "test_data/snapshot_test_data/div-text/text_range_with_cloud_background.json":"divkit/public/test_data/snapshot_test_data/div-text/text_range_with_cloud_background.json", "test_data/snapshot_test_data/div-text/text_with_cloud_background_alignment.json":"divkit/public/test_data/snapshot_test_data/div-text/text_with_cloud_background_alignment.json", diff --git a/client/android/div/src/main/java/com/yandex/div/core/view2/DivTypefaceResolver.kt b/client/android/div/src/main/java/com/yandex/div/core/view2/DivTypefaceResolver.kt index 32f66ceb7..8c2b2b52b 100644 --- a/client/android/div/src/main/java/com/yandex/div/core/view2/DivTypefaceResolver.kt +++ b/client/android/div/src/main/java/com/yandex/div/core/view2/DivTypefaceResolver.kt @@ -16,6 +16,16 @@ internal class DivTypefaceResolver @Inject constructor( private val typefaceProviders: Map, private val defaultTypeface: DivTypefaceProvider, ) { + + internal fun getTypeface(fontFamily: String?, fontWeightValue: Int): Typeface { + val typefaceProvider = if (fontFamily == null) { + defaultTypeface + } else { + typefaceProviders[fontFamily] ?: defaultTypeface + } + return getTypeface(fontWeightValue, typefaceProvider) + } + internal fun getTypeface(fontFamily: String?, fontWeight: DivFontWeight?, fontWeightValue: Int?): Typeface { val typefaceProvider = if (fontFamily == null) { defaultTypeface diff --git a/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/SpannedTextBuilder.kt b/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/SpannedTextBuilder.kt index 7e778900f..cbc2ed90e 100644 --- a/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/SpannedTextBuilder.kt +++ b/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/SpannedTextBuilder.kt @@ -26,6 +26,7 @@ import com.yandex.div.core.util.toIntSafely import com.yandex.div.core.view2.BindingContext import com.yandex.div.core.view2.DivTypefaceResolver import com.yandex.div.core.view2.divs.dpToPxF +import com.yandex.div.core.view2.divs.getTypefaceValue import com.yandex.div.core.view2.divs.toPorterDuffMode import com.yandex.div.core.view2.divs.toPx import com.yandex.div.core.view2.divs.toTextVerticalAlignment @@ -390,13 +391,17 @@ internal class SpannedTextBuilder @Inject constructor( } } - if (span.fontWeight != null || span.fontWeightValue != null) { + if (span.fontFamily != null || span.fontWeight != null || span.fontWeightValue != null) { + val fontWeightValue = if (span.fontWeight != null || span.fontWeightValue != null) { + getTypefaceValue(span.fontWeight, span.fontWeightValue) + } else { + getTypefaceValue(textData.fontWeight, textData.fontWeightValue) + } spannedText.setSpan( TypefaceSpan( typeface = typefaceResolver.getTypeface( - span.fontFamily, - span.fontWeight, - span.fontWeightValue + span.fontFamily ?: textData.fontFamily, + fontWeightValue ) ), start, @@ -539,6 +544,8 @@ internal class SpannedTextBuilder @Inject constructor( fontSize = fontSizeValue.unitToPx(displayMetrics, fontSizeUnit), fontSizeValue = fontSizeValue, fontSizeUnit = fontSizeUnit, + fontWeight = divText.fontWeight.evaluate(resolver), + fontWeightValue = divText.fontWeightValue?.evaluate(resolver)?.toIntSafely(), fontFamily = divText.fontFamily?.evaluate(resolver), lineHeight = divText.lineHeight?.evaluate(resolver)?.toIntSafely()?.unitToPx(displayMetrics, fontSizeUnit), textColor = divText.textColor.evaluate(resolver) diff --git a/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/TextData.kt b/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/TextData.kt index d740aa2e0..fae1e6b22 100644 --- a/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/TextData.kt +++ b/client/android/div/src/main/java/com/yandex/div/core/view2/spannable/TextData.kt @@ -2,6 +2,7 @@ package com.yandex.div.core.view2.spannable import androidx.annotation.ColorInt import androidx.annotation.Px +import com.yandex.div2.DivFontWeight import com.yandex.div2.DivSizeUnit internal data class TextData( @@ -10,6 +11,8 @@ internal data class TextData( val fontSizeValue: Int, val fontSizeUnit: DivSizeUnit, val fontFamily: String?, + val fontWeight: DivFontWeight?, + val fontWeightValue: Int?, @Px val lineHeight: Int?, @ColorInt val textColor: Int ) { diff --git a/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/Div2ScenarioActivity.kt b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/Div2ScenarioActivity.kt index 107cb0c3f..279b871c4 100644 --- a/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/Div2ScenarioActivity.kt +++ b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/Div2ScenarioActivity.kt @@ -46,6 +46,7 @@ import com.yandex.divkit.demo.div.editor.DivEditorUi import com.yandex.divkit.demo.div.editor.DivEditorWebController import com.yandex.divkit.demo.div.editor.list.DivEditorAdapter import com.yandex.divkit.demo.div.histogram.LoggingHistogramBridge +import com.yandex.divkit.demo.font.YandexSansCondensedTypefaceProvider import com.yandex.divkit.demo.utils.DivkitDemoUriHandler import com.yandex.divkit.demo.utils.coroutineScope import com.yandex.divkit.demo.utils.lifecycleOwner @@ -117,7 +118,12 @@ class Div2ScenarioActivity : AppCompatActivity(), Div2MetadataBottomSheet.Metada .divDataChangeListener(transitionScheduler) .actionHandler(TransitionActionHandler(Container.uriHandler)) .typefaceProvider(YandexSansDivTypefaceProvider(this)) - .additionalTypefaceProviders(mapOf("display" to YandexSansDisplayDivTypefaceProvider(this))) + .additionalTypefaceProviders( + mapOf( + "display" to YandexSansDisplayDivTypefaceProvider(this), + "condensed" to YandexSansCondensedTypefaceProvider(this), + ) + ) .build() divContext = divContext( diff --git a/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/DivUtils.kt b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/DivUtils.kt index 4189ee44a..0a3fd1c40 100644 --- a/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/DivUtils.kt +++ b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/div/DivUtils.kt @@ -26,10 +26,10 @@ import com.yandex.div.json.templates.CachingTemplateProvider import com.yandex.div.json.templates.InMemoryTemplateProvider import com.yandex.div.json.templates.TemplateProvider import com.yandex.div.markdown.DivMarkdownExtensionHandler -import com.yandex.div.sizeprovider.DivSizeProviderExtensionHandler import com.yandex.div.shimmer.DivShimmerExtensionHandler import com.yandex.div.shine.DivShineExtensionHandler import com.yandex.div.shine.DivShineLogger +import com.yandex.div.sizeprovider.DivSizeProviderExtensionHandler import com.yandex.div.video.ExoDivPlayerFactory import com.yandex.div.video.ExoPlayerVideoPreloader import com.yandex.div2.DivAction @@ -37,6 +37,7 @@ import com.yandex.div2.DivData import com.yandex.div2.DivPatch import com.yandex.divkit.demo.Container import com.yandex.divkit.demo.R +import com.yandex.divkit.demo.font.YandexSansCondensedTypefaceProvider import com.yandex.divkit.demo.utils.DivkitDemoUriHandler import com.yandex.divkit.demo.utils.MetricaUtils import com.yandex.divkit.demo.utils.lifecycleOwner @@ -44,7 +45,6 @@ import com.yandex.divkit.regression.ScenarioLogDelegate import io.noties.markwon.AbstractMarkwonPlugin import io.noties.markwon.core.MarkwonTheme import org.json.JSONObject -import java.lang.Exception fun divConfiguration( activity: Activity, @@ -78,7 +78,12 @@ fun divConfiguration( .tooltipRestrictor { _, _, _, _ -> true } .divDownloader(DemoDivDownloader()) .typefaceProvider(YandexSansDivTypefaceProvider(activity)) - .additionalTypefaceProviders(mapOf("display" to YandexSansDisplayDivTypefaceProvider(activity))) + .additionalTypefaceProviders( + mapOf( + "display" to YandexSansDisplayDivTypefaceProvider(activity), + "condensed" to YandexSansCondensedTypefaceProvider(activity) + ) + ) .viewPoolReporter(object : ViewPoolProfiler.Reporter { override fun reportEvent(message: String, result: Map) { reporter.reportEvent(message, result) diff --git a/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/font/YandexSansCondensedTypefaceProvider.kt b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/font/YandexSansCondensedTypefaceProvider.kt new file mode 100644 index 000000000..2b7eea62f --- /dev/null +++ b/client/android/divkit-demo-app/src/main/java/com/yandex/divkit/demo/font/YandexSansCondensedTypefaceProvider.kt @@ -0,0 +1,36 @@ +package com.yandex.divkit.demo.font + +import android.content.Context +import android.graphics.Typeface +import androidx.core.content.res.ResourcesCompat +import com.yandex.div.core.font.DivTypefaceProvider +import com.yandex.divkit.demo.R + +class YandexSansCondensedTypefaceProvider( + private val context: Context +) : DivTypefaceProvider { + + private val lightTypeface by lazy { + ResourcesCompat.getFont(context, R.font.ys_text_cond_light) ?: Typeface.DEFAULT + } + + private val regularTypeface by lazy { + ResourcesCompat.getFont(context, R.font.ys_text_cond_regular) ?: Typeface.DEFAULT + } + + private val mediumTypeface by lazy { + ResourcesCompat.getFont(context, R.font.ys_text_cond_medium) ?: Typeface.DEFAULT + } + + private val boldTypeface by lazy { + ResourcesCompat.getFont(context, R.font.ys_text_cond_bold) ?: Typeface.DEFAULT + } + + override fun getLight(): Typeface = lightTypeface + + override fun getRegular(): Typeface = regularTypeface + + override fun getMedium(): Typeface = mediumTypeface + + override fun getBold(): Typeface = boldTypeface +} diff --git a/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_bold.ttf b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_bold.ttf new file mode 100644 index 000000000..4bec1a1f6 Binary files /dev/null and b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_bold.ttf differ diff --git a/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_light.ttf b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_light.ttf new file mode 100644 index 000000000..ac6ed2edc Binary files /dev/null and b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_light.ttf differ diff --git a/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_medium.ttf b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_medium.ttf new file mode 100644 index 000000000..60c4bd685 Binary files /dev/null and b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_medium.ttf differ diff --git a/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_regular.ttf b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_regular.ttf new file mode 100644 index 000000000..729982316 Binary files /dev/null and b/client/android/divkit-demo-app/src/main/res/font/ys_text_cond_regular.ttf differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..a37f22768 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..ded3d3291 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..1799fa796 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..413d9d4c6 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..1799fa796 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..993049367 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..58232a0a4 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..993049367 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png new file mode 100644 index 000000000..58232a0a4 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-text/text_range_font_family.png differ diff --git a/test_data/snapshot_test_data/div-text/text_range_font_family.json b/test_data/snapshot_test_data/div-text/text_range_font_family.json new file mode 100644 index 000000000..e9b05aa1b --- /dev/null +++ b/test_data/snapshot_test_data/div-text/text_range_font_family.json @@ -0,0 +1,81 @@ +{ + "description": "Ranges with font family", + "platforms": [ + "android" + ], + "templates": { + "test_text": { + "type": "text", + "paddings": { + "left": 4, + "top": 4, + "right": 4, + "bottom": 4 + }, + "background": [ + { + "type": "solid", + "$color": "background_color" + } + ], + "font_size": 20, + "font_weight": "regular", + "text_color": "#002B36" + } + }, + "card": { + "log_id": "text_range_font_family", + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "width": { + "type": "fixed", + "value": 240 + }, + "items": [ + { + "type": "test_text", + "background_color": "#FDF6E3", + "text": "Text with condensed font family range", + "ranges": [ + { + "start": 10, + "end": 31, + "font_family": "condensed" + } + ] + }, + { + "type": "test_text", + "background_color": "#EEE8D5", + "text": "Text with medium font weight range", + "ranges": [ + { + "start": 10, + "end": 28, + "font_weight": "medium" + } + ] + }, + { + "type": "test_text", + "background_color": "#FDF6E3", + "text": "Text with condensed font family and bold weight range", + "ranges": [ + { + "start": 10, + "end": 47, + "font_family": "condensed", + "font_weight": "bold" + } + ] + } + ] + } + } + ] + } +}