laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-09 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3785 from vitorpamplona/fix/buzz-channel-row-background

Browse Source 
fix(buzz): drop the grey slab behind the community Channels section
This commit is contained in:
Vitor Pamplona
2026-07-28 18:48:08 -04:00
committed by GitHub
parent 0373032339 15a389b155
commit ddbee398ca
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/buzz/BuzzImportRow.kt
+7 -3
View File
@@ -21,6 +21,7 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn.buzz
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -31,7 +32,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Card
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.IconButton
@@ -174,10 +174,14 @@ fun BuzzImportRow(
accountViewModel = accountViewModel,
)
}
// A plain row on the screen background, not a filled Card. Each row used to be its own Card, and
// because they stack with no gaps their container colour merged into one grey slab behind the
// whole Channels section — reading as a box around the channels that the Direct Messages rows
// right below (plain rows) didn't have. Matches [BuzzDmInlineRow] and the Concord server list.
if (onOpen != null) {
Card(onClick = onOpen, modifier = Modifier.fillMaxWidth()) { content() }
Box(Modifier.fillMaxWidth().clickable(onClick = onOpen)) { content() }
} else {
Card(modifier = Modifier.fillMaxWidth()) { content() }
Box(Modifier.fillMaxWidth()) { content() }
}
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/RelayGroupChannelListScreen.kt
+20 -8
View File
@@ -32,7 +32,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Card
@@ -411,7 +410,8 @@ fun RelayGroupChannelListScreen(
)
}
if (!channelsCollapsed) {
items(buzzChatChannels, key = { "chat-${it.id}" }) { groupId ->
itemsIndexed(buzzChatChannels, key = { _, it -> "chat-${it.id}" }) { index, groupId ->
RowHairline(index)
BuzzImportRow(
groupId = groupId,
isAdded = groupId.id in buzzAdded,
@@ -437,7 +437,8 @@ fun RelayGroupChannelListScreen(
)
}
if (!forumsCollapsed) {
items(buzzForumChannels, key = { "forum-${it.id}" }) { groupId ->
itemsIndexed(buzzForumChannels, key = { _, it -> "forum-${it.id}" }) { index, groupId ->
RowHairline(index)
BuzzImportRow(
groupId = groupId,
isAdded = groupId.id in buzzAdded,
@@ -481,7 +482,8 @@ fun RelayGroupChannelListScreen(
}
} else {
val shown = dmRows.take(INLINE_DM_LIMIT)
items(shown, key = { "dm-${it.channelId}" }) { row ->
itemsIndexed(shown, key = { _, it -> "dm-${it.channelId}" }) { index, row ->
RowHairline(index)
BuzzDmInlineRow(
row = row,
myPubkey = myPubkey,
@@ -512,7 +514,8 @@ fun RelayGroupChannelListScreen(
)
}
if (showHiddenDms) {
items(hiddenDmRows, key = { "dm-hidden-${it.channelId}" }) { row ->
itemsIndexed(hiddenDmRows, key = { _, it -> "dm-hidden-${it.channelId}" }) { index, row ->
RowHairline(index)
BuzzDmInlineRow(
row = row,
myPubkey = myPubkey,
@@ -530,9 +533,7 @@ fun RelayGroupChannelListScreen(
} else {
// Vanilla NIP-29 relay: flat channel directory (no forums/DMs/console).
itemsIndexed(channels, key = { _, channel -> channel.groupId.id }) { index, channel ->
if (index > 0) {
HorizontalDivider(thickness = 0.25.dp, color = MaterialTheme.colorScheme.outlineVariant)
}
RowHairline(index)
RelayGroupChannelRow(channel, myPubkey, accountViewModel) { nav.nav(routeFor(channel)) }
}
}
@@ -551,6 +552,17 @@ fun RelayGroupChannelListScreen(
}
}
/**
* The hairline separating two adjacent rows within a section. Drawn *before* row [index], and never
* before the first one, so a section's own header keeps providing the separation at its boundaries.
*/
@Composable
private fun RowHairline(index: Int) {
if (index > 0) {
HorizontalDivider(thickness = 0.25.dp, color = MaterialTheme.colorScheme.outlineVariant)
}
}
/** A first screen's worth of a community's DMs shown inline; the rest live behind the See-all row. */
private const val INLINE_DM_LIMIT = 6