|
|
|
@@ -55,6 +55,7 @@ class Text internal constructor(
|
|
|
|
|
focus = additive.focus ?: properties.focus,
|
|
|
|
|
focusedTextColor = additive.focusedTextColor ?: properties.focusedTextColor,
|
|
|
|
|
fontFamily = additive.fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = additive.fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = additive.fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = additive.fontWeight ?: properties.fontWeight,
|
|
|
|
@@ -172,6 +173,10 @@ class Text internal constructor(
|
|
|
|
|
* Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
*/
|
|
|
|
|
val fontFamily: Property<String>?,
|
|
|
|
|
/**
|
|
|
|
|
* List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
*/
|
|
|
|
|
val fontFeatureSettings: Property<String>?,
|
|
|
|
|
/**
|
|
|
|
|
* Font size.
|
|
|
|
|
* Default value: `12`.
|
|
|
|
@@ -349,6 +354,7 @@ class Text internal constructor(
|
|
|
|
|
result.tryPutProperty("focus", focus)
|
|
|
|
|
result.tryPutProperty("focused_text_color", focusedTextColor)
|
|
|
|
|
result.tryPutProperty("font_family", fontFamily)
|
|
|
|
|
result.tryPutProperty("font_feature_settings", fontFeatureSettings)
|
|
|
|
|
result.tryPutProperty("font_size", fontSize)
|
|
|
|
|
result.tryPutProperty("font_size_unit", fontSizeUnit)
|
|
|
|
|
result.tryPutProperty("font_weight", fontWeight)
|
|
|
|
@@ -550,6 +556,7 @@ class Text internal constructor(
|
|
|
|
|
border = additive.border ?: properties.border,
|
|
|
|
|
end = additive.end ?: properties.end,
|
|
|
|
|
fontFamily = additive.fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = additive.fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = additive.fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = additive.fontWeight ?: properties.fontWeight,
|
|
|
|
@@ -585,6 +592,10 @@ class Text internal constructor(
|
|
|
|
|
* Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
*/
|
|
|
|
|
val fontFamily: Property<String>?,
|
|
|
|
|
/**
|
|
|
|
|
* List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
*/
|
|
|
|
|
val fontFeatureSettings: Property<String>?,
|
|
|
|
|
/**
|
|
|
|
|
* Font size.
|
|
|
|
|
*/
|
|
|
|
@@ -639,6 +650,7 @@ class Text internal constructor(
|
|
|
|
|
result.tryPutProperty("border", border)
|
|
|
|
|
result.tryPutProperty("end", end)
|
|
|
|
|
result.tryPutProperty("font_family", fontFamily)
|
|
|
|
|
result.tryPutProperty("font_feature_settings", fontFeatureSettings)
|
|
|
|
|
result.tryPutProperty("font_size", fontSize)
|
|
|
|
|
result.tryPutProperty("font_size_unit", fontSizeUnit)
|
|
|
|
|
result.tryPutProperty("font_weight", fontWeight)
|
|
|
|
@@ -677,6 +689,7 @@ class Text internal constructor(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -734,6 +747,7 @@ fun DivScope.text(
|
|
|
|
|
focus: Focus? = null,
|
|
|
|
|
focusedTextColor: Color? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -790,6 +804,7 @@ fun DivScope.text(
|
|
|
|
|
focus = valueOrNull(focus),
|
|
|
|
|
focusedTextColor = valueOrNull(focusedTextColor),
|
|
|
|
|
fontFamily = valueOrNull(fontFamily),
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings),
|
|
|
|
|
fontSize = valueOrNull(fontSize),
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit),
|
|
|
|
|
fontWeight = valueOrNull(fontWeight),
|
|
|
|
@@ -848,6 +863,7 @@ fun DivScope.text(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -905,6 +921,7 @@ fun DivScope.textProps(
|
|
|
|
|
focus: Focus? = null,
|
|
|
|
|
focusedTextColor: Color? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -960,6 +977,7 @@ fun DivScope.textProps(
|
|
|
|
|
focus = valueOrNull(focus),
|
|
|
|
|
focusedTextColor = valueOrNull(focusedTextColor),
|
|
|
|
|
fontFamily = valueOrNull(fontFamily),
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings),
|
|
|
|
|
fontSize = valueOrNull(fontSize),
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit),
|
|
|
|
|
fontWeight = valueOrNull(fontWeight),
|
|
|
|
@@ -1017,6 +1035,7 @@ fun DivScope.textProps(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -1074,6 +1093,7 @@ fun TemplateScope.textRefs(
|
|
|
|
|
focus: ReferenceProperty<Focus>? = null,
|
|
|
|
|
focusedTextColor: ReferenceProperty<Color>? = null,
|
|
|
|
|
fontFamily: ReferenceProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ReferenceProperty<String>? = null,
|
|
|
|
|
fontSize: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ReferenceProperty<FontWeight>? = null,
|
|
|
|
@@ -1129,6 +1149,7 @@ fun TemplateScope.textRefs(
|
|
|
|
|
focus = focus,
|
|
|
|
|
focusedTextColor = focusedTextColor,
|
|
|
|
|
fontFamily = fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight,
|
|
|
|
@@ -1186,6 +1207,7 @@ fun TemplateScope.textRefs(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -1243,6 +1265,7 @@ fun Text.override(
|
|
|
|
|
focus: Focus? = null,
|
|
|
|
|
focusedTextColor: Color? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -1299,6 +1322,7 @@ fun Text.override(
|
|
|
|
|
focus = valueOrNull(focus) ?: properties.focus,
|
|
|
|
|
focusedTextColor = valueOrNull(focusedTextColor) ?: properties.focusedTextColor,
|
|
|
|
|
fontFamily = valueOrNull(fontFamily) ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings) ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = valueOrNull(fontSize) ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight,
|
|
|
|
@@ -1357,6 +1381,7 @@ fun Text.override(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -1414,6 +1439,7 @@ fun Text.defer(
|
|
|
|
|
focus: ReferenceProperty<Focus>? = null,
|
|
|
|
|
focusedTextColor: ReferenceProperty<Color>? = null,
|
|
|
|
|
fontFamily: ReferenceProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ReferenceProperty<String>? = null,
|
|
|
|
|
fontSize: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ReferenceProperty<FontWeight>? = null,
|
|
|
|
@@ -1470,6 +1496,7 @@ fun Text.defer(
|
|
|
|
|
focus = focus ?: properties.focus,
|
|
|
|
|
focusedTextColor = focusedTextColor ?: properties.focusedTextColor,
|
|
|
|
|
fontFamily = fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight ?: properties.fontWeight,
|
|
|
|
@@ -1517,6 +1544,7 @@ fun Text.defer(
|
|
|
|
|
* @param columnSpan Merges cells in a column of the [grid](div-grid.md) element.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param letterSpacing Spacing between characters.
|
|
|
|
@@ -1544,6 +1572,7 @@ fun Text.evaluate(
|
|
|
|
|
columnSpan: ExpressionProperty<Int>? = null,
|
|
|
|
|
focusedTextColor: ExpressionProperty<Color>? = null,
|
|
|
|
|
fontFamily: ExpressionProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ExpressionProperty<String>? = null,
|
|
|
|
|
fontSize: ExpressionProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ExpressionProperty<FontWeight>? = null,
|
|
|
|
@@ -1581,6 +1610,7 @@ fun Text.evaluate(
|
|
|
|
|
focus = properties.focus,
|
|
|
|
|
focusedTextColor = focusedTextColor ?: properties.focusedTextColor,
|
|
|
|
|
fontFamily = fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight ?: properties.fontWeight,
|
|
|
|
@@ -1639,6 +1669,7 @@ fun Text.evaluate(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -1696,6 +1727,7 @@ fun Component<Text>.override(
|
|
|
|
|
focus: Focus? = null,
|
|
|
|
|
focusedTextColor: Color? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -1753,6 +1785,7 @@ fun Component<Text>.override(
|
|
|
|
|
focus = valueOrNull(focus),
|
|
|
|
|
focusedTextColor = valueOrNull(focusedTextColor),
|
|
|
|
|
fontFamily = valueOrNull(fontFamily),
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings),
|
|
|
|
|
fontSize = valueOrNull(fontSize),
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit),
|
|
|
|
|
fontWeight = valueOrNull(fontWeight),
|
|
|
|
@@ -1811,6 +1844,7 @@ fun Component<Text>.override(
|
|
|
|
|
* @param focus Parameters when focusing on an element or losing focus.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
|
|
|
|
@@ -1868,6 +1902,7 @@ fun Component<Text>.defer(
|
|
|
|
|
focus: ReferenceProperty<Focus>? = null,
|
|
|
|
|
focusedTextColor: ReferenceProperty<Color>? = null,
|
|
|
|
|
fontFamily: ReferenceProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ReferenceProperty<String>? = null,
|
|
|
|
|
fontSize: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ReferenceProperty<FontWeight>? = null,
|
|
|
|
@@ -1925,6 +1960,7 @@ fun Component<Text>.defer(
|
|
|
|
|
focus = focus,
|
|
|
|
|
focusedTextColor = focusedTextColor,
|
|
|
|
|
fontFamily = fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight,
|
|
|
|
@@ -1972,6 +2008,7 @@ fun Component<Text>.defer(
|
|
|
|
|
* @param columnSpan Merges cells in a column of the [grid](div-grid.md) element.
|
|
|
|
|
* @param focusedTextColor Text color when focusing on the element.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
|
* @param letterSpacing Spacing between characters.
|
|
|
|
@@ -1999,6 +2036,7 @@ fun Component<Text>.evaluate(
|
|
|
|
|
columnSpan: ExpressionProperty<Int>? = null,
|
|
|
|
|
focusedTextColor: ExpressionProperty<Color>? = null,
|
|
|
|
|
fontFamily: ExpressionProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ExpressionProperty<String>? = null,
|
|
|
|
|
fontSize: ExpressionProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ExpressionProperty<FontWeight>? = null,
|
|
|
|
@@ -2037,6 +2075,7 @@ fun Component<Text>.evaluate(
|
|
|
|
|
focus = null,
|
|
|
|
|
focusedTextColor = focusedTextColor,
|
|
|
|
|
fontFamily = fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight,
|
|
|
|
@@ -2396,6 +2435,7 @@ fun Text.Image.asList() = listOf(this)
|
|
|
|
|
* @param border Character range border.
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2416,6 +2456,7 @@ fun DivScope.textRange(
|
|
|
|
|
border: TextRangeBorder? = null,
|
|
|
|
|
end: Int? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -2434,6 +2475,7 @@ fun DivScope.textRange(
|
|
|
|
|
border = valueOrNull(border),
|
|
|
|
|
end = valueOrNull(end),
|
|
|
|
|
fontFamily = valueOrNull(fontFamily),
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings),
|
|
|
|
|
fontSize = valueOrNull(fontSize),
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit),
|
|
|
|
|
fontWeight = valueOrNull(fontWeight),
|
|
|
|
@@ -2454,6 +2496,7 @@ fun DivScope.textRange(
|
|
|
|
|
* @param border Character range border.
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2474,6 +2517,7 @@ fun DivScope.textRangeProps(
|
|
|
|
|
border: TextRangeBorder? = null,
|
|
|
|
|
end: Int? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -2491,6 +2535,7 @@ fun DivScope.textRangeProps(
|
|
|
|
|
border = valueOrNull(border),
|
|
|
|
|
end = valueOrNull(end),
|
|
|
|
|
fontFamily = valueOrNull(fontFamily),
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings),
|
|
|
|
|
fontSize = valueOrNull(fontSize),
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit),
|
|
|
|
|
fontWeight = valueOrNull(fontWeight),
|
|
|
|
@@ -2510,6 +2555,7 @@ fun DivScope.textRangeProps(
|
|
|
|
|
* @param border Character range border.
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2530,6 +2576,7 @@ fun TemplateScope.textRangeRefs(
|
|
|
|
|
border: ReferenceProperty<TextRangeBorder>? = null,
|
|
|
|
|
end: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontFamily: ReferenceProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ReferenceProperty<String>? = null,
|
|
|
|
|
fontSize: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ReferenceProperty<FontWeight>? = null,
|
|
|
|
@@ -2547,6 +2594,7 @@ fun TemplateScope.textRangeRefs(
|
|
|
|
|
border = border,
|
|
|
|
|
end = end,
|
|
|
|
|
fontFamily = fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight,
|
|
|
|
@@ -2566,6 +2614,7 @@ fun TemplateScope.textRangeRefs(
|
|
|
|
|
* @param border Character range border.
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2586,6 +2635,7 @@ fun Text.Range.override(
|
|
|
|
|
border: TextRangeBorder? = null,
|
|
|
|
|
end: Int? = null,
|
|
|
|
|
fontFamily: String? = null,
|
|
|
|
|
fontFeatureSettings: String? = null,
|
|
|
|
|
fontSize: Int? = null,
|
|
|
|
|
fontSizeUnit: SizeUnit? = null,
|
|
|
|
|
fontWeight: FontWeight? = null,
|
|
|
|
@@ -2604,6 +2654,7 @@ fun Text.Range.override(
|
|
|
|
|
border = valueOrNull(border) ?: properties.border,
|
|
|
|
|
end = valueOrNull(end) ?: properties.end,
|
|
|
|
|
fontFamily = valueOrNull(fontFamily) ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = valueOrNull(fontFeatureSettings) ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = valueOrNull(fontSize) ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight,
|
|
|
|
@@ -2624,6 +2675,7 @@ fun Text.Range.override(
|
|
|
|
|
* @param border Character range border.
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2644,6 +2696,7 @@ fun Text.Range.defer(
|
|
|
|
|
border: ReferenceProperty<TextRangeBorder>? = null,
|
|
|
|
|
end: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontFamily: ReferenceProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ReferenceProperty<String>? = null,
|
|
|
|
|
fontSize: ReferenceProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ReferenceProperty<FontWeight>? = null,
|
|
|
|
@@ -2662,6 +2715,7 @@ fun Text.Range.defer(
|
|
|
|
|
border = border ?: properties.border,
|
|
|
|
|
end = end ?: properties.end,
|
|
|
|
|
fontFamily = fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight ?: properties.fontWeight,
|
|
|
|
@@ -2679,6 +2733,7 @@ fun Text.Range.defer(
|
|
|
|
|
/**
|
|
|
|
|
* @param end Ordinal number of the last character to be included in the range.
|
|
|
|
|
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
|
|
|
|
|
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
|
|
|
|
|
* @param fontSize Font size.
|
|
|
|
|
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
|
|
|
|
|
* @param fontWeight Style.
|
|
|
|
@@ -2695,6 +2750,7 @@ fun Text.Range.evaluate(
|
|
|
|
|
`use named arguments`: Guard = Guard.instance,
|
|
|
|
|
end: ExpressionProperty<Int>? = null,
|
|
|
|
|
fontFamily: ExpressionProperty<String>? = null,
|
|
|
|
|
fontFeatureSettings: ExpressionProperty<String>? = null,
|
|
|
|
|
fontSize: ExpressionProperty<Int>? = null,
|
|
|
|
|
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
|
|
|
|
|
fontWeight: ExpressionProperty<FontWeight>? = null,
|
|
|
|
@@ -2712,6 +2768,7 @@ fun Text.Range.evaluate(
|
|
|
|
|
border = properties.border,
|
|
|
|
|
end = end ?: properties.end,
|
|
|
|
|
fontFamily = fontFamily ?: properties.fontFamily,
|
|
|
|
|
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
|
|
|
|
|
fontSize = fontSize ?: properties.fontSize,
|
|
|
|
|
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
|
|
|
|
|
fontWeight = fontWeight ?: properties.fontWeight,
|
|
|
|
|