Updates to text sizes in Chats header and Space hero

Closes #7476
This commit is contained in:
Benoit Marty
2026-08-24 18:58:54 +02:00
parent 6ab3d7393b
commit 9586478039
4 changed files with 67 additions and 51 deletions
@@ -80,7 +80,6 @@ import io.element.android.libraries.designsystem.modifiers.backgroundVerticalGra
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenu
import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Icon
@@ -141,15 +140,23 @@ fun HomeTopBar(
else -> stringResource(selectedNavigationItem.labelRes) else -> stringResource(selectedNavigationItem.labelRes)
} }
} }
HomeNavigationBarItem.Spaces -> stringResource(selectedNavigationItem.labelRes) HomeNavigationBarItem.Spaces -> null
}
displayTitle?.let {
val style = when (spaceFiltersState) {
// Space name
is SpaceFiltersState.Selected -> ElementTheme.typography.fontHeadingSmMedium
// "Chats"
else -> ElementTheme.typography.fontHeadingLgBold
} }
Text( Text(
modifier = Modifier.semantics { modifier = Modifier.semantics {
heading() heading()
}, },
style = ElementTheme.typography.aliasScreenTitle, style = style,
text = displayTitle, text = displayTitle,
) )
}
}, },
navigationIcon = { navigationIcon = {
NavigationIcon( NavigationIcon(
@@ -179,7 +186,9 @@ fun HomeTopBar(
TopAppBarScrollBehaviorLayout(scrollBehavior = scrollBehavior) { TopAppBarScrollBehaviorLayout(scrollBehavior = scrollBehavior) {
RoomListFiltersView( RoomListFiltersView(
state = filtersState, state = filtersState,
modifier = Modifier.padding(bottom = 16.dp).padding(contentPadding) modifier = Modifier
.padding(bottom = 16.dp)
.padding(contentPadding)
) )
} }
} }
@@ -10,6 +10,7 @@ package io.element.android.libraries.designsystem.atomic.atoms
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import io.element.android.compound.theme.ElementTheme import io.element.android.compound.theme.ElementTheme
@@ -20,11 +21,12 @@ fun RoomPreviewTitleAtom(
title: String, title: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
fontStyle: FontStyle? = null, fontStyle: FontStyle? = null,
style: TextStyle = ElementTheme.typography.fontHeadingLgBold
) { ) {
Text( Text(
modifier = modifier, modifier = modifier,
text = title, text = title,
style = ElementTheme.typography.fontHeadingLgBold, style = style,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
fontStyle = fontStyle, fontStyle = fontStyle,
color = ElementTheme.colors.textPrimary, color = ElementTheme.colors.textPrimary,
@@ -46,7 +46,7 @@ fun SpaceHeaderRootView(
) )
Text( Text(
text = stringResource(CommonStrings.screen_space_list_title), text = stringResource(CommonStrings.screen_space_list_title),
style = ElementTheme.typography.fontHeadingLgBold, style = ElementTheme.typography.fontHeadingMdBold,
color = ElementTheme.colors.textPrimary, color = ElementTheme.colors.textPrimary,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
) )
@@ -19,6 +19,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.tooling.preview.datasource.LoremIpsum import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewAliasAtom import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewAliasAtom
import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewDescriptionAtom import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewDescriptionAtom
import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewTitleAtom import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewTitleAtom
@@ -68,11 +69,15 @@ fun SpaceHeaderView(
}, },
title = { title = {
if (name != null) { if (name != null) {
RoomPreviewTitleAtom(title = name) RoomPreviewTitleAtom(
title = name,
style = ElementTheme.typography.fontHeadingMdBold,
)
} else { } else {
RoomPreviewTitleAtom( RoomPreviewTitleAtom(
title = stringResource(id = CommonStrings.common_no_space_name), title = stringResource(id = CommonStrings.common_no_space_name),
fontStyle = FontStyle.Italic fontStyle = FontStyle.Italic,
style = ElementTheme.typography.fontHeadingMdBold,
) )
} }
}, },