diff --git a/client/ios/Configurations/Version.xcconfig b/client/ios/Configurations/Version.xcconfig index 3d4573b5d..92cab3475 100644 --- a/client/ios/Configurations/Version.xcconfig +++ b/client/ios/Configurations/Version.xcconfig @@ -1,2 +1,2 @@ -MARKETING_VERSION = 32.0.0 +MARKETING_VERSION = 32.1.0 CURRENT_PROJECT_VERSION = 32 diff --git a/client/ios/DivKit/DivKitInfo.swift b/client/ios/DivKit/DivKitInfo.swift index f60ee5433..22afe74c8 100644 --- a/client/ios/DivKit/DivKitInfo.swift +++ b/client/ios/DivKit/DivKitInfo.swift @@ -1,3 +1,3 @@ public enum DivKitInfo { - public static let version = "32.0.0" + public static let version = "32.1.0" } diff --git a/client/web/divkit/package.json b/client/web/divkit/package.json index d5ae04e6a..c1c5de882 100644 --- a/client/web/divkit/package.json +++ b/client/web/divkit/package.json @@ -1,6 +1,6 @@ { "name": "@divkitframework/divkit", - "version": "32.0.0", + "version": "32.1.0", "description": "DivKit for the web", "keywords": [ "server-driven-ui", diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt index c8b77045b..040a6d8ed 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt @@ -415,6 +415,7 @@ data class Slider internal constructor( fontVariationSettings = additive.fontVariationSettings ?: properties.fontVariationSettings, fontWeight = additive.fontWeight ?: properties.fontWeight, fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, + letterSpacing = additive.letterSpacing ?: properties.letterSpacing, offset = additive.offset ?: properties.offset, textColor = additive.textColor ?: properties.textColor, ) @@ -448,6 +449,11 @@ data class Slider internal constructor( * Style. Numeric value. */ val fontWeightValue: Property?, + /** + * Spacing between characters. + * Default value: `0`. + */ + val letterSpacing: Property?, /** * Shift relative to the center. */ @@ -467,6 +473,7 @@ data class Slider internal constructor( result.tryPutProperty("font_variation_settings", fontVariationSettings) result.tryPutProperty("font_weight", fontWeight) result.tryPutProperty("font_weight_value", fontWeightValue) + result.tryPutProperty("letter_spacing", letterSpacing) result.tryPutProperty("offset", offset) result.tryPutProperty("text_color", textColor) return result @@ -1845,6 +1852,7 @@ fun Slider.Range.asList() = listOf(this) * @param fontVariationSettings List of TrueType/OpenType font features. The object is constructed from pairs of axis tag and style values. The axis tag must contain four ASCII characters. * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1857,6 +1865,7 @@ fun DivScope.sliderTextStyle( fontVariationSettings: Map? = null, fontWeight: FontWeight? = null, fontWeightValue: Int? = null, + letterSpacing: Double? = null, offset: Point? = null, textColor: Color? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1867,6 +1876,7 @@ fun DivScope.sliderTextStyle( fontVariationSettings = valueOrNull(fontVariationSettings), fontWeight = valueOrNull(fontWeight), fontWeightValue = valueOrNull(fontWeightValue), + letterSpacing = valueOrNull(letterSpacing), offset = valueOrNull(offset), textColor = valueOrNull(textColor), ) @@ -1879,6 +1889,7 @@ fun DivScope.sliderTextStyle( * @param fontVariationSettings List of TrueType/OpenType font features. The object is constructed from pairs of axis tag and style values. The axis tag must contain four ASCII characters. * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1891,6 +1902,7 @@ fun DivScope.sliderTextStyleProps( fontVariationSettings: Map? = null, fontWeight: FontWeight? = null, fontWeightValue: Int? = null, + letterSpacing: Double? = null, offset: Point? = null, textColor: Color? = null, ) = Slider.TextStyle.Properties( @@ -1900,6 +1912,7 @@ fun DivScope.sliderTextStyleProps( fontVariationSettings = valueOrNull(fontVariationSettings), fontWeight = valueOrNull(fontWeight), fontWeightValue = valueOrNull(fontWeightValue), + letterSpacing = valueOrNull(letterSpacing), offset = valueOrNull(offset), textColor = valueOrNull(textColor), ) @@ -1911,6 +1924,7 @@ fun DivScope.sliderTextStyleProps( * @param fontVariationSettings List of TrueType/OpenType font features. The object is constructed from pairs of axis tag and style values. The axis tag must contain four ASCII characters. * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1923,6 +1937,7 @@ fun TemplateScope.sliderTextStyleRefs( fontVariationSettings: ReferenceProperty>? = null, fontWeight: ReferenceProperty? = null, fontWeightValue: ReferenceProperty? = null, + letterSpacing: ReferenceProperty? = null, offset: ReferenceProperty? = null, textColor: ReferenceProperty? = null, ) = Slider.TextStyle.Properties( @@ -1932,6 +1947,7 @@ fun TemplateScope.sliderTextStyleRefs( fontVariationSettings = fontVariationSettings, fontWeight = fontWeight, fontWeightValue = fontWeightValue, + letterSpacing = letterSpacing, offset = offset, textColor = textColor, ) @@ -1943,6 +1959,7 @@ fun TemplateScope.sliderTextStyleRefs( * @param fontVariationSettings List of TrueType/OpenType font features. The object is constructed from pairs of axis tag and style values. The axis tag must contain four ASCII characters. * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1955,6 +1972,7 @@ fun Slider.TextStyle.override( fontVariationSettings: Map? = null, fontWeight: FontWeight? = null, fontWeightValue: Int? = null, + letterSpacing: Double? = null, offset: Point? = null, textColor: Color? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1965,6 +1983,7 @@ fun Slider.TextStyle.override( fontVariationSettings = valueOrNull(fontVariationSettings) ?: properties.fontVariationSettings, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, + letterSpacing = valueOrNull(letterSpacing) ?: properties.letterSpacing, offset = valueOrNull(offset) ?: properties.offset, textColor = valueOrNull(textColor) ?: properties.textColor, ) @@ -1977,6 +1996,7 @@ fun Slider.TextStyle.override( * @param fontVariationSettings List of TrueType/OpenType font features. The object is constructed from pairs of axis tag and style values. The axis tag must contain four ASCII characters. * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1989,6 +2009,7 @@ fun Slider.TextStyle.defer( fontVariationSettings: ReferenceProperty>? = null, fontWeight: ReferenceProperty? = null, fontWeightValue: ReferenceProperty? = null, + letterSpacing: ReferenceProperty? = null, offset: ReferenceProperty? = null, textColor: ReferenceProperty? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1999,6 +2020,7 @@ fun Slider.TextStyle.defer( fontVariationSettings = fontVariationSettings ?: properties.fontVariationSettings, fontWeight = fontWeight ?: properties.fontWeight, fontWeightValue = fontWeightValue ?: properties.fontWeightValue, + letterSpacing = letterSpacing ?: properties.letterSpacing, offset = offset ?: properties.offset, textColor = textColor ?: properties.textColor, ) @@ -2010,6 +2032,7 @@ fun Slider.TextStyle.defer( * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
  • * @param fontWeight Style. * @param fontWeightValue Style. Numeric value. + * @param letterSpacing Spacing between characters. * @param textColor Text color. */ @Generated @@ -2020,6 +2043,7 @@ fun Slider.TextStyle.evaluate( fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, fontWeightValue: ExpressionProperty? = null, + letterSpacing: ExpressionProperty? = null, textColor: ExpressionProperty? = null, ): Slider.TextStyle = Slider.TextStyle( Slider.TextStyle.Properties( @@ -2029,6 +2053,7 @@ fun Slider.TextStyle.evaluate( fontVariationSettings = properties.fontVariationSettings, fontWeight = fontWeight ?: properties.fontWeight, fontWeightValue = fontWeightValue ?: properties.fontWeightValue, + letterSpacing = letterSpacing ?: properties.letterSpacing, offset = properties.offset, textColor = textColor ?: properties.textColor, ) diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt index 72885b957..a6d437bdd 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt @@ -326,7 +326,7 @@ data class Text internal constructor( */ val textAlignmentVertical: Property?, /** - * Text color. Not used if the `text_gradient` parameter is set. + * Text color. * Default value: `#FF000000`. */ val textColor: Property?, @@ -914,7 +914,7 @@ data class Text internal constructor( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -1131,7 +1131,7 @@ fun DivScope.text( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -1346,7 +1346,7 @@ fun DivScope.textProps( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -1561,7 +1561,7 @@ fun TemplateScope.textRefs( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -1778,7 +1778,7 @@ fun Text.override( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -1968,7 +1968,7 @@ fun Text.defer( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. * @param truncate Location of text cropping marker. * @param underline Underline. @@ -2132,7 +2132,7 @@ fun Text.evaluate( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -2350,7 +2350,7 @@ fun Component.override( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param textGradient Gradient text color. * @param textShadow Parameters of the shadow applied to the text. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. @@ -2541,7 +2541,7 @@ fun Component.defer( * @param strike Strikethrough. * @param textAlignmentHorizontal Horizontal text alignment. * @param textAlignmentVertical Vertical text alignment. - * @param textColor Text color. Not used if the `text_gradient` parameter is set. + * @param textColor Text color. * @param tightenWidth Limit the text width to the maximum line width. Applies only when the width is set to `wrap_content`, `constrained=true`, and `max_size` is specified. * @param truncate Location of text cropping marker. * @param underline Underline. diff --git a/json-builder/python/pyproject.toml b/json-builder/python/pyproject.toml index 91cffa2e0..652f006a4 100644 --- a/json-builder/python/pyproject.toml +++ b/json-builder/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pydivkit" -version = "32.0.0" +version = "32.1.0" description = "DivKit python library" readme = "README.md" repository = "https://github.com/divkit/divkit/tree/main/json-builder/python" diff --git a/json-builder/typescript/package.json b/json-builder/typescript/package.json index 4f06abb65..7e2b2e74c 100644 --- a/json-builder/typescript/package.json +++ b/json-builder/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@divkitframework/jsonbuilder", - "version": "32.0.0", + "version": "32.1.0", "description": "DivKit TypeScript JSON Builder", "main": "./dist/jsonbuilder.js", "module": "./dist/es/jsonbuilder.js", diff --git a/version b/version index 308b18624..fe9ca52d1 100644 --- a/version +++ b/version @@ -1 +1 @@ -32.0.0 +32.1.0