From 47be9909da096a8fe01e97ff9ca7867389f19de7 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 28 Jul 2026 18:27:16 +0000 Subject: [PATCH] fix: normalize bold top nav bar titles to default weight MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Buzz relay group (community) top bar and its sub-screens (members, threads, browse, channel list), the Buzz canvas, geohash chat/new/teleport screens, the single-URL and single-geohash viewers, and the Marmot group chat all forced FontWeight.Bold (geohash chat also titleMedium) on their top-bar titles, while every sibling channel header — DM rooms, public chats, ephemeral chats, live activities — and the shared TopBar wrappers render the Material3 titleLarge default at normal weight. Drop the bold (and size) overrides so all top nav bar titles share one consistent treatment. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_019N7b8D4vBvafhG9eU7M9iJ --- .../amethyst/ui/screen/loggedIn/buzz/BuzzCanvasScreen.kt | 2 -- .../screen/loggedIn/chats/geohashChat/GeohashChatScreen.kt | 5 ++--- .../loggedIn/chats/geohashChat/GeohashTeleportScreen.kt | 3 +-- .../loggedIn/chats/geohashChat/NewGeohashChatScreen.kt | 2 +- .../loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt | 2 ++ .../publicChannels/relayGroup/RelayGroupBrowseScreen.kt | 1 - .../publicChannels/relayGroup/RelayGroupChannelListScreen.kt | 1 - .../publicChannels/relayGroup/RelayGroupMembersScreen.kt | 1 - .../publicChannels/relayGroup/RelayGroupThreadsScreen.kt | 1 - .../chats/publicChannels/relayGroup/RelayGroupTopBar.kt | 3 --- .../amethyst/ui/screen/loggedIn/geohash/GeoHashScreen.kt | 2 -- .../amethyst/ui/screen/loggedIn/url/UrlScreen.kt | 2 -- 12 files changed, 6 insertions(+), 19 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/buzz/BuzzCanvasScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/buzz/BuzzCanvasScreen.kt index 61790f520b..7ef10f5276 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/buzz/BuzzCanvasScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/buzz/BuzzCanvasScreen.kt @@ -46,7 +46,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -134,7 +133,6 @@ fun BuzzCanvasScreen( Column { Text( text = stringRes(R.string.buzz_canvas_title), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashChatScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashChatScreen.kt index 4c2ee851b5..faedef1d95 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashChatScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashChatScreen.kt @@ -54,7 +54,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -427,10 +426,10 @@ private fun GeohashChatTopBar( LoadCityName( geohashStr = geohash, onLoading = { - Text("#$geohash", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold) + Text("#$geohash") }, ) { cityName -> - Text(cityName, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold) + Text(cityName) } Row( verticalAlignment = Alignment.CenterVertically, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashTeleportScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashTeleportScreen.kt index 2f3f4d8db2..aeef4582f6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashTeleportScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/GeohashTeleportScreen.kt @@ -26,7 +26,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.ui.navigation.navs.INav import com.vitorpamplona.amethyst.ui.navigation.routes.Route @@ -52,7 +51,7 @@ fun GeohashTeleportScreen( Scaffold( topBar = { TopBarExtensibleWithBackButton( - title = { Text(stringRes(R.string.geohash_teleport_title), fontWeight = FontWeight.Bold) }, + title = { Text(stringRes(R.string.geohash_teleport_title)) }, popBack = nav::popBack, ) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/NewGeohashChatScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/NewGeohashChatScreen.kt index ebf206147a..5d6eae85c0 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/NewGeohashChatScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/geohashChat/NewGeohashChatScreen.kt @@ -96,7 +96,7 @@ fun NewGeohashChatScreen( Scaffold( topBar = { TopBarExtensibleWithBackButton( - title = { Text("New location channel", fontWeight = FontWeight.Bold) }, + title = { Text("New location channel") }, popBack = nav::popBack, ) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt index 7175395138..ef4245ad6e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt @@ -36,6 +36,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.vitorpamplona.amethyst.R @@ -103,6 +104,7 @@ fun MarmotGroupChatScreen( DisplayUserSetAsSubject( userList = memberPubkeys, accountViewModel = accountViewModel, + fontWeight = FontWeight.Normal, ) } else { Text(stringRes(R.string.marmot_group_default_name)) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupBrowseScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupBrowseScreen.kt index fbbb7cbe18..470a9f4cb1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupBrowseScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupBrowseScreen.kt @@ -109,7 +109,6 @@ fun RelayGroupBrowseScreen( title = { Text( text = stringRes(R.string.relay_group_browse_title), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupChannelListScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupChannelListScreen.kt index d41cc2aed0..40bf7b5810 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupChannelListScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupChannelListScreen.kt @@ -280,7 +280,6 @@ fun RelayGroupChannelListScreen( title = { Text( text = relay.displayUrl(), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.MiddleEllipsis, ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupMembersScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupMembersScreen.kt index 7c2101d041..3b4a391900 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupMembersScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupMembersScreen.kt @@ -178,7 +178,6 @@ private fun RelayGroupMembers( Column { Text( text = stringRes(R.string.relay_group_members_title), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupThreadsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupThreadsScreen.kt index 560003d92c..e015e48a7b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupThreadsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupThreadsScreen.kt @@ -154,7 +154,6 @@ private fun RelayGroupThreads( Column { Text( text = stringRes(R.string.relay_group_threads_title), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupTopBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupTopBar.kt index a4c9c159be..c5c6a70be5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupTopBar.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupTopBar.kt @@ -45,7 +45,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -128,7 +127,6 @@ fun RelayGroupTopBar( } else { Text( text = channel.toBestDisplayName(), - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false), @@ -340,7 +338,6 @@ private fun DmParticipantTitle( val name by observeUserName(user, accountViewModel) Text( text = name.ifBlank { channel.toBestDisplayName() }, - fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = modifier, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/GeoHashScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/GeoHashScreen.kt index ab0299ca54..a452842c4b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/GeoHashScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/GeoHashScreen.kt @@ -26,7 +26,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols @@ -124,7 +123,6 @@ fun DisplayGeoTagHeader( LoadCityName(geohashStr = geohash) { cityName -> Text( cityName, - fontWeight = FontWeight.Bold, modifier = modifier, ) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/UrlScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/UrlScreen.kt index 55e103051d..ef8ba1d120 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/UrlScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/UrlScreen.kt @@ -24,7 +24,6 @@ import android.annotation.SuppressLint import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.ui.feeds.WatchLifecycleAndUpdateModel @@ -114,7 +113,6 @@ fun DisplayUrlHeader( ) { Text( url, - fontWeight = FontWeight.Bold, modifier = modifier, maxLines = 1, overflow = TextOverflow.Ellipsis,