hacker/fast-messenger
1
0
Fork 0
forked from melod1n/fast-messenger
Code Pull Requests Activity

improve font in app bars

Browse Source
This commit is contained in:
Danil Nikolaev
2024-12-13 23:45:33 +03:00
parent 518f2bfb1b
commit 077332a27b
6 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt
+9 -1
View File
@@ -56,6 +56,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
@@ -198,7 +199,14 @@ fun ChatMaterialsScreen(
.fillMaxWidth()
) {
TopAppBar(
title = { Text(text = "Chat Materials") },
title = {
Text(
text = "Chat Materials",
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
)
},
colors = TopAppBarDefaults.topAppBarColors(
containerColor = Color.Transparent
),
feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/presentation/ConversationsScreen.kt
+2 -1
View File
@@ -244,7 +244,8 @@ fun ConversationsScreen(
else UiR.string.title_conversations
),
maxLines = 1,
overflow = TextOverflow.Ellipsis
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
)
},
actions = {
feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendsScreen.kt
+3 -2
View File
@@ -242,13 +242,14 @@ fun FriendsScreen(
Text(
text = stringResource(id = UiR.string.title_friends),
maxLines = 1,
overflow = TextOverflow.Ellipsis
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.headlineSmall
)
},
colors = TopAppBarDefaults.topAppBarColors(
containerColor = Color.Transparent
),
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.fillMaxWidth()
)
PrimaryTabRow(
selectedTabIndex = selectedTabIndex,
feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt
+6 -1
View File
@@ -108,7 +108,12 @@ fun LanguagePickerScreen(
}
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 = {
IconButton(onClick = onBack) {
Icon(
feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryScreen.kt
+4 -1
View File
@@ -213,7 +213,10 @@ fun MessagesHistoryScreen(
Text(
text =
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 = {
feature/settings/src/main/kotlin/dev/meloda/fast/settings/presentation/SettingsScreen.kt
+9 -1
View File
@@ -28,6 +28,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.LayoutDirection
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dev.chrisbanes.haze.HazeState
@@ -128,7 +129,14 @@ fun SettingsScreen(
contentWindowInsets = WindowInsets.statusBars,
topBar = {
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 = {
IconButton(onClick = onBack) {
Icon(