nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removing bold titles

Browse Source
This commit is contained in:
Vitor Pamplona
2023-10-18 18:26:31 -04:00
parent d9b0fbe928
commit 27286c7ffe
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+4 -9
View File
@@ -211,7 +211,6 @@ private fun HashTagTopBar(
title = { title = {
Text( Text(
remember(tag) { "#$tag" }, remember(tag) { "#$tag" },
fontWeight = FontWeight.Bold,
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f)
) )
@@ -232,7 +231,7 @@ private fun CommunityTopBar(
if (baseNote != null) { if (baseNote != null) {
FlexibleTopBarWithBackButton( FlexibleTopBarWithBackButton(
title = { title = {
ShortCommunityHeader(baseNote, fontWeight = FontWeight.Medium, accountViewModel, nav) ShortCommunityHeader(baseNote, accountViewModel, nav)
}, },
extendableRow = { extendableRow = {
Column(Modifier.verticalScroll(rememberScrollState())) { Column(Modifier.verticalScroll(rememberScrollState())) {
@@ -299,7 +298,7 @@ private fun RenderRoomTopBar(
Spacer(modifier = DoubleHorzSpacer) Spacer(modifier = DoubleHorzSpacer)
UsernameDisplay(baseUser, Modifier.weight(1f), fontWeight = FontWeight.Medium) UsernameDisplay(baseUser, Modifier.weight(1f), fontWeight = FontWeight.Normal)
} }
} }
}, },
@@ -330,7 +329,7 @@ private fun RenderRoomTopBar(
Modifier Modifier
.padding(start = 10.dp) .padding(start = 10.dp)
.weight(1f), .weight(1f),
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Normal,
accountViewModel.userProfile() accountViewModel.userProfile()
) )
}, },
@@ -355,7 +354,6 @@ private fun ChannelTopBar(
ShortChannelHeader( ShortChannelHeader(
baseChannel = baseChannel, baseChannel = baseChannel,
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
fontWeight = FontWeight.Medium,
nav = nav, nav = nav,
showFlag = true showFlag = true
) )
@@ -829,10 +827,7 @@ fun FlexibleTopBarWithBackButton(
title = title, title = title,
extendableRow = extendableRow, extendableRow = extendableRow,
navigationIcon = { navigationIcon = {
IconButton( IconButton(onClick = popBack) {
onClick = popBack,
modifier = Modifier
) {
ArrowBackIcon() ArrowBackIcon()
} }
}, },
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+1 -2
View File
@@ -723,7 +723,7 @@ fun LongCommunityHeader(
} }
@Composable @Composable
fun ShortCommunityHeader(baseNote: AddressableNote, fontWeight: FontWeight = FontWeight.Bold, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun ShortCommunityHeader(baseNote: AddressableNote, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
val noteState by baseNote.live().metadata.observeAsState() val noteState by baseNote.live().metadata.observeAsState()
val noteEvent = remember(noteState) { noteState?.note?.event as? CommunityDefinitionEvent } ?: return val noteEvent = remember(noteState) { noteState?.note?.event as? CommunityDefinitionEvent } ?: return
@@ -753,7 +753,6 @@ fun ShortCommunityHeader(baseNote: AddressableNote, fontWeight: FontWeight = Fon
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Text( Text(
text = remember(noteState) { noteEvent.dTag() }, text = remember(noteState) { noteEvent.dTag() },
fontWeight = fontWeight,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
-2
View File
@@ -684,7 +684,6 @@ fun ShowVideoStreaming(
fun ShortChannelHeader( fun ShortChannelHeader(
baseChannel: Channel, baseChannel: Channel,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
fontWeight: FontWeight = FontWeight.Bold,
nav: (String) -> Unit, nav: (String) -> Unit,
showFlag: Boolean showFlag: Boolean
) { ) {
@@ -730,7 +729,6 @@ fun ShortChannelHeader(
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Text( Text(
text = remember(channelState) { channel.toBestDisplayName() }, text = remember(channelState) { channel.toBestDisplayName() },
fontWeight = fontWeight,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )