mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Merge pull request #7820 from element-hq/fix/fix-textblock-style-after-headers-pr
Remove the hardcoded text style in `TextBlock`
This commit is contained in:
+2
-1
@@ -31,6 +31,7 @@ import androidx.compose.foundation.layout.widthIn
|
|||||||
import androidx.compose.foundation.rememberScrollState
|
import androidx.compose.foundation.rememberScrollState
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.foundation.text.InlineTextContent
|
import androidx.compose.foundation.text.InlineTextContent
|
||||||
|
import androidx.compose.material3.LocalTextStyle
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.Immutable
|
import androidx.compose.runtime.Immutable
|
||||||
import androidx.compose.runtime.SideEffect
|
import androidx.compose.runtime.SideEffect
|
||||||
@@ -218,7 +219,7 @@ private fun ParagraphView(
|
|||||||
TextBlock(
|
TextBlock(
|
||||||
text = node.text,
|
text = node.text,
|
||||||
inlineContent = node.inlineContent,
|
inlineContent = node.inlineContent,
|
||||||
textStyle = ElementTheme.typography.fontBodyMdRegular,
|
textStyle = LocalTextStyle.current,
|
||||||
context = context,
|
context = context,
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
onTextLayout = { measureLastLine?.invoke(it) },
|
onTextLayout = { measureLastLine?.invoke(it) },
|
||||||
|
|||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Reference in New Issue
Block a user