improve font in app bars

This commit is contained in:
2024-12-13 23:45:33 +03:00
parent 518f2bfb1b
commit 077332a27b
6 changed files with 33 additions and 7 deletions
@@ -56,6 +56,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@@ -198,7 +199,14 @@ fun ChatMaterialsScreen(
.fillMaxWidth() .fillMaxWidth()
) { ) {
TopAppBar( TopAppBar(
title = { Text(text = "Chat Materials") }, title = {
Text(
text = "Chat Materials",
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
)
},
colors = TopAppBarDefaults.topAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = Color.Transparent containerColor = Color.Transparent
), ),
@@ -244,7 +244,8 @@ fun ConversationsScreen(
else UiR.string.title_conversations else UiR.string.title_conversations
), ),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
) )
}, },
actions = { actions = {
@@ -242,13 +242,14 @@ fun FriendsScreen(
Text( Text(
text = stringResource(id = UiR.string.title_friends), text = stringResource(id = UiR.string.title_friends),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
) )
}, },
colors = TopAppBarDefaults.topAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = Color.Transparent containerColor = Color.Transparent
), ),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth()
) )
PrimaryTabRow( PrimaryTabRow(
selectedTabIndex = selectedTabIndex, selectedTabIndex = selectedTabIndex,
@@ -108,7 +108,12 @@ fun LanguagePickerScreen(
} }
LargeTopAppBar( LargeTopAppBar(
title = { Text(text = stringResource(id = UiR.string.title_application_language)) }, title = {
Text(
text = stringResource(id = UiR.string.title_application_language),
style = MaterialTheme.typography.headlineSmall
)
},
navigationIcon = { navigationIcon = {
IconButton(onClick = onBack) { IconButton(onClick = onBack) {
Icon( Icon(
@@ -213,7 +213,10 @@ fun MessagesHistoryScreen(
Text( Text(
text = text =
if (screenState.isLoading) stringResource(id = UiR.string.title_loading) if (screenState.isLoading) stringResource(id = UiR.string.title_loading)
else screenState.title else screenState.title,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
) )
}, },
navigationIcon = { navigationIcon = {
@@ -28,6 +28,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.HazeState
@@ -128,7 +129,14 @@ fun SettingsScreen(
contentWindowInsets = WindowInsets.statusBars, contentWindowInsets = WindowInsets.statusBars,
topBar = { topBar = {
TopAppBar( TopAppBar(
title = { Text(text = stringResource(id = UiR.string.title_settings)) }, title = {
Text(
text = stringResource(id = UiR.string.title_settings),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
)
},
navigationIcon = { navigationIcon = {
IconButton(onClick = onBack) { IconButton(onClick = onBack) {
Icon( Icon(