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

fix(concord): leave room for the FAB in the community channel list

Browse Source 
Same defect the relay-group and Buzz DM lists had: the Scaffold's padding
carries the top/bottom bars but deliberately not the FAB (a FAB overlays
content by design), so the last channel row's manager overflow menu sat
underneath it and couldn't be tapped.

As contentPadding rather than a modifier, so rows scroll *through* the
strip instead of the viewport shrinking and leaving the FAB over dead
space. Gated on canManageChannels because that is what renders the FAB —
a plain member has nothing to clear, and no reason to lose the space.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Vitor Pamplona
2026-07-28 17:08:40 -04:00
co-authored by Claude Opus 5
parent 618ef66e75
commit 39f69de5e6
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/ConcordChannelListScreen.kt
+17 -1
View File
@@ -25,6 +25,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
@@ -321,7 +322,15 @@ fun ConcordChannelListScreen(
)
}
} else {
LazyColumn(Modifier.fillMaxSize().padding(padding)) {
// Bottom room for the FAB, which the Scaffold's `padding` deliberately doesn't account for
// (a FAB overlays content) — without it the last row's manager overflow menu sits under it
// and can't be tapped. As contentPadding so rows scroll *through* the strip rather than the
// viewport shrinking. Gated on [canManageChannels] because that is what renders the FAB:
// a plain member has nothing to clear, and no reason to lose the space.
LazyColumn(
Modifier.fillMaxSize().padding(padding),
contentPadding = PaddingValues(bottom = if (canManageChannels) FAB_CLEARANCE else 0.dp),
) {
items(channels, key = { it.key }) { entry ->
val def = entry.value.definition
val name = def.name.ifBlank { entry.key }
@@ -452,6 +461,13 @@ private fun ConcordChannelListRow(
/** How many recent-poster avatars a channel row's facepile shows at most. */
private const val FACEPILE_MAX = 4
/**
* Bottom room the list leaves for the floating action button: a 56dp FAB + the Scaffold's 16dp margin
* + slack, so the last row's overflow menu stays tappable instead of sitting under the FAB. Matches
* the value `JobBoardScreen` and the relay-group list screens use.
*/
private val FAB_CLEARANCE = 96.dp
/**
* The line under a channel name. When someone is composing it shows a live italic "X is typing…";
* otherwise the last message's author + a snippet ("author: hello"), or a muted "No messages yet"