From 8add060de89f55778f3c65059d23218db35f2c8f Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Fri, 21 Jul 2023 22:24:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Chip=20=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/common/theme/compose/Theme.kt | 2 +- .../tieba/post/ui/common/theme/compose/ThemeExtensions.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/Theme.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/Theme.kt index 65076240..2f2f6f8a 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/Theme.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/Theme.kt @@ -162,7 +162,7 @@ private fun getThemeColorForTheme(theme: String): ExtendedColors { ), textColor.copy(alpha = ContentAlpha.high), textColor.copy(alpha = ContentAlpha.medium), - textColor.copy(alpha = ContentAlpha.disabled), + Color(App.ThemeDelegate.getColorByAttr(App.INSTANCE, R.attr.colorOnAccent, nowTheme)), Color(App.ThemeDelegate.getColorByAttr(App.INSTANCE, R.attr.color_text_disabled, nowTheme)), Color(App.ThemeDelegate.getColorByAttr(App.INSTANCE, R.attr.colorBackground, nowTheme)), Color(App.ThemeDelegate.getColorByAttr(App.INSTANCE, R.attr.colorChip, nowTheme)), diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/ThemeExtensions.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/ThemeExtensions.kt index 29749029..0becb420 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/ThemeExtensions.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/ThemeExtensions.kt @@ -18,7 +18,7 @@ val ExtendedColors.loadMoreIndicator: Color } val ExtendedColors.invertChipBackground: Color - get() = if (ThemeUtil.isNightMode(theme)) accent else onAccent + get() = if (ThemeUtil.isNightMode(theme)) primary.copy(alpha = 0.3f) else primary val ExtendedColors.invertChipContent: Color - get() = if (ThemeUtil.isNightMode(theme)) accent.copy(alpha = 0.3f) else accent \ No newline at end of file + get() = if (ThemeUtil.isNightMode(theme)) primary else textOnPrimary \ No newline at end of file