From f00a79ebc311a3bccd202475d1bc5878f5334b5c Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:11:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Compose=20Text=20=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huanchengfly/tieba/post/ui/widgets/compose/Texts.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Texts.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Texts.kt index 6ac9a400..198bf261 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Texts.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Texts.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.unit.sp import com.huanchengfly.tieba.post.R import com.huanchengfly.tieba.post.pxToDp import com.huanchengfly.tieba.post.pxToSp +import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme import com.huanchengfly.tieba.post.utils.EmoticonManager import com.huanchengfly.tieba.post.utils.EmoticonManager.getEmoticonHeightPx import com.huanchengfly.tieba.post.utils.EmoticonUtil.emoticonString @@ -180,7 +181,7 @@ fun IconText( letterSpacing = letterSpacing ) ) - val sizePx = getEmoticonHeightPx(mergedStyle) + val sizePx = getEmoticonHeightPx(mergedStyle) * 9 / 10 val sizeSp = sizePx.pxToSp().sp val sizeDp = sizePx.pxToDp().dp val iconInlineContent = @@ -196,7 +197,8 @@ fun IconText( Icon( Icons.Rounded.Link, contentDescription = stringResource(id = R.string.link), - modifier = Modifier.size(sizeDp) + modifier = Modifier.size(sizeDp), + tint = ExtendedTheme.colors.accent, ) } ), @@ -210,7 +212,8 @@ fun IconText( Icon( Icons.Rounded.AccountCircle, contentDescription = stringResource(id = R.string.user), - modifier = Modifier.size(sizeDp) + modifier = Modifier.size(sizeDp), + tint = ExtendedTheme.colors.accent, ) } ),