ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change text style of VisualList.

Browse Source 
Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2001-140
This commit is contained in:
Benoit Marty
2026-07-02 14:57:11 +02:00
parent d8b1a41f56
commit f35546b473
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
+3 -4
View File
@@ -65,9 +65,9 @@ fun AnalyticsOptInView(
BackHandler(onBack = ::onDeclineTerms) BackHandler(onBack = ::onDeclineTerms)
HeaderFooterPage( HeaderFooterPage(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.systemBarsPadding() .systemBarsPadding()
.imePadding(), .imePadding(),
background = { OnboardingBackground() }, background = { OnboardingBackground() },
header = { AnalyticsOptInHeader(state, onClickTerms) }, header = { AnalyticsOptInHeader(state, onClickTerms) },
content = { AnalyticsOptInContent() }, content = { AnalyticsOptInContent() },
@@ -144,7 +144,6 @@ private fun AnalyticsOptInContent() {
iconVector = CompoundIcons.CheckCircle(), iconVector = CompoundIcons.CheckCircle(),
), ),
), ),
textStyle = ElementTheme.typography.fontBodyLgMedium,
iconTint = ElementTheme.colors.iconSuccessPrimary, iconTint = ElementTheme.colors.iconSuccessPrimary,
) )
} }
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
-2
View File
@@ -137,8 +137,6 @@ private fun FullscreenAnnouncementContent(
VisualList( VisualList(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
items = announcement.items(), items = announcement.items(),
textStyle = ElementTheme.typography.fontBodyLgMedium,
iconTint = ElementTheme.colors.iconSecondary,
iconSize = 24.dp iconSize = 24.dp
) )
announcement.notice()?.let { notice -> announcement.notice()?.let { notice ->
features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
+3 -6
View File
@@ -21,7 +21,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
@@ -43,9 +42,9 @@ fun SignedOutView(
BackHandler(onBack = { state.eventSink(SignedOutEvents.SignInAgain) }) BackHandler(onBack = { state.eventSink(SignedOutEvents.SignInAgain) })
HeaderFooterPage( HeaderFooterPage(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.systemBarsPadding() .systemBarsPadding()
.imePadding(), .imePadding(),
header = { SignedOutHeader(state) }, header = { SignedOutHeader(state) },
content = { SignedOutContent() }, content = { SignedOutContent() },
footer = { footer = {
@@ -90,8 +89,6 @@ private fun SignedOutContent() {
iconVector = CompoundIcons.Block(), iconVector = CompoundIcons.Block(),
), ),
), ),
textStyle = ElementTheme.typography.fontBodyMdMedium,
iconTint = ElementTheme.colors.iconSecondary,
) )
} }
} }
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualList.kt
+2 -4
View File
@@ -11,8 +11,6 @@ package io.element.android.libraries.designsystem.components.visuallist
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalTextStyle
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@@ -36,9 +34,9 @@ fun VisualList(
items: ImmutableList<VisualListItemData>, items: ImmutableList<VisualListItemData>,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
backgroundColor: Color = ElementTheme.colors.bgSubtleSecondary, backgroundColor: Color = ElementTheme.colors.bgSubtleSecondary,
iconTint: Color = LocalContentColor.current, iconTint: Color = ElementTheme.colors.iconSecondary,
iconSize: Dp = 20.dp, iconSize: Dp = 20.dp,
textStyle: TextStyle = LocalTextStyle.current, textStyle: TextStyle = ElementTheme.typography.fontBodyMdMedium,
textColor: Color = ElementTheme.colors.textPrimary, textColor: Color = ElementTheme.colors.textPrimary,
verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(4.dp), verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(4.dp),
) { ) {