Refactors horizontal dividers

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt

@@ -46,6 +46,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalTextStyle
@@ -98,6 +99,7 @@ import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
@@ -448,6 +450,9 @@ fun ShowUserSuggestionListForEdit(
                 key = { _, item -> item.pubkeyHex },
             ) { _, item ->
                 UserLine(item, accountViewModel) { editPostViewModel.autocompleteWithUser(item) }
+                HorizontalDivider(
+                    thickness = DividerThickness,
+                )
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt

@@ -357,6 +357,10 @@ private fun RenderSearchResults(
 
                         searchBarViewModel.clear()
                     }
+
+                    HorizontalDivider(
+                        thickness = DividerThickness,
+                    )
                 }
 
                 itemsIndexed(
@@ -367,6 +371,10 @@ private fun RenderSearchResults(
                         nav("Channel/${item.idHex}")
                         searchBarViewModel.clear()
                     }
+
+                    HorizontalDivider(
+                        thickness = DividerThickness,
+                    )
                 }
             }
         }
@@ -404,18 +412,15 @@ fun UserComposeForChat(
     accountViewModel: AccountViewModel,
     onClick: () -> Unit,
 ) {
-    Column(
+    Row(
         modifier =
             Modifier.clickable(
                 onClick = onClick,
-            ),
+            ).padding(
-    ) {
-        Row(
-            modifier =
-                Modifier.padding(
                 start = 12.dp,
                 end = 12.dp,
                 top = 10.dp,
+                bottom = 10.dp,
             ),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -432,12 +437,6 @@ fun UserComposeForChat(
             DisplayUserAboutInfo(baseUser)
         }
     }
-
-        HorizontalDivider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = DividerThickness,
-        )
-    }
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt

@@ -294,7 +294,6 @@ private fun DisplayOwnerInformation(
                 UserCompose(
                     baseUser = it,
                     accountViewModel = accountViewModel,
-                    showDiviser = false,
                     nav = nav,
                 )
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt

@@ -197,7 +197,7 @@ fun InnerChannelCardWithReactions(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    when (remember { baseNote.event }) {
+    when (baseNote.event) {
         is LiveActivitiesEvent -> {
             InnerCardRow(baseNote, accountViewModel, nav)
         }
@@ -496,12 +496,11 @@ fun RenderLiveActivityThumb(
         Spacer(modifier = DoubleVertSpacer)
 
         ChannelHeader(
-            channelHex = remember { baseNote.idHex },
+            channelHex = baseNote.idHex,
             showVideo = false,
-            showBottomDiviser = false,
             showFlag = false,
             sendToChannel = true,
-            modifier = remember { Modifier.padding(start = 0.dp, end = 0.dp, top = 5.dp, bottom = 5.dp) },
+            modifier = Modifier,
             accountViewModel = accountViewModel,
             nav = nav,
         )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -233,7 +233,6 @@ fun AcceptableNote(
                 ChannelHeader(
                     channelNote = baseNote,
                     showVideo = !makeItShort,
-                    showBottomDiviser = true,
                     sendToChannel = true,
                     accountViewModel = accountViewModel,
                     nav = nav,
@@ -267,7 +266,6 @@ fun AcceptableNote(
                 ChannelHeader(
                     channelNote = baseNote,
                     showVideo = !makeItShort,
-                    showBottomDiviser = true,
                     sendToChannel = true,
                     accountViewModel = accountViewModel,
                     nav = nav,
@@ -742,7 +740,6 @@ private fun ReplyRow(
         ChannelHeader(
             channelHex = it,
             showVideo = false,
-            showBottomDiviser = false,
             sendToChannel = true,
             modifier = MaterialTheme.colorScheme.replyModifier.padding(10.dp),
             accountViewModel = accountViewModel,

app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt

@@ -20,13 +20,13 @@
  */
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -47,7 +47,7 @@ import com.vitorpamplona.amethyst.model.RelayInfo
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.StdPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import java.time.Instant
 import java.time.ZoneId
@@ -62,12 +62,13 @@ fun RelayCompose(
 ) {
     val context = LocalContext.current
 
-    Column {
     Row(
-            modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp),
+        modifier = StdPadding,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Column(
-                modifier = Modifier.padding(start = 10.dp).weight(1f),
+            modifier = Modifier.weight(1f),
+            verticalArrangement = Arrangement.Center,
         ) {
             Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
                 Text(
@@ -100,12 +101,6 @@ fun RelayCompose(
             RelayOptions(accountViewModel, relay, onAddRelay, onRemoveRelay)
         }
     }
-
-        HorizontalDivider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = DividerThickness,
-        )
-    }
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt

@@ -24,7 +24,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -32,7 +31,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
 
@@ -40,18 +38,14 @@ import com.vitorpamplona.amethyst.ui.theme.StdPadding
 fun UserCompose(
     baseUser: User,
     overallModifier: Modifier = StdPadding,
-    showDiviser: Boolean = true,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    Column(
+    Row(
         modifier =
-            Modifier.clickable(
+            overallModifier.clickable(
                 onClick = { nav("User/${baseUser.pubkeyHex}") },
             ),
-    ) {
-        Row(
-            modifier = overallModifier,
         verticalAlignment = Alignment.CenterVertically,
     ) {
         UserPicture(baseUser, Size55dp, accountViewModel = accountViewModel, nav = nav)
@@ -66,11 +60,4 @@ fun UserCompose(
             UserActionOptions(baseUser, accountViewModel)
         }
     }
-
-        if (showDiviser) {
-            HorizontalDivider(
-                thickness = DividerThickness,
-            )
-        }
-    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt

@@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -68,7 +67,6 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.JoinCommunityButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LeaveCommunityButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.NormalTimeAgo
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
@@ -88,7 +86,6 @@ import java.util.Locale
 @Composable
 fun CommunityHeader(
     baseNote: AddressableNote,
-    showBottomDiviser: Boolean,
     sendToCommunity: Boolean,
     modifier: Modifier = StdPadding,
     accountViewModel: AccountViewModel,
@@ -125,12 +122,6 @@ fun CommunityHeader(
                 }
             }
         }
-
-        if (showBottomDiviser) {
-            HorizontalDivider(
-                thickness = DividerThickness,
-            )
-        }
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PeopleList.kt

@@ -23,11 +23,13 @@ package com.vitorpamplona.amethyst.ui.note.types
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -50,6 +52,7 @@ import com.vitorpamplona.amethyst.ui.components.ShowMoreButton
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -98,13 +101,16 @@ fun DisplayPeopleList(
     Box {
         FlowRow(modifier = Modifier.padding(top = 5.dp)) {
             toMembersShow.forEach { user ->
-                Row(modifier = Modifier.fillMaxWidth()) {
+                Column(modifier = Modifier.fillMaxWidth()) {
                     UserCompose(
                         user,
-                        overallModifier = Modifier,
                         accountViewModel = accountViewModel,
                         nav = nav,
                     )
+
+                    HorizontalDivider(
+                        thickness = DividerThickness,
+                    )
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RenderPostApproval.kt

@@ -60,7 +60,6 @@ fun RenderPostApproval(
                 baseNote?.let {
                     CommunityHeader(
                         baseNote = it,
-                        showBottomDiviser = false,
                         sendToCommunity = true,
                         accountViewModel = accountViewModel,
                         nav = nav,

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt

@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.pullrefresh.PullRefreshIndicator
 import androidx.compose.material3.pullrefresh.pullRefresh
 import androidx.compose.material3.pullrefresh.rememberPullRefreshState
@@ -47,6 +48,7 @@ import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.RelayCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -169,6 +171,9 @@ fun RelayFeedView(
                     onAddRelay = { wantsToAddRelay = item.url },
                     onRemoveRelay = { wantsToAddRelay = item.url },
                 )
+                HorizontalDivider(
+                    thickness = DividerThickness,
+                )
             }
         }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedView.kt

@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -37,17 +38,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 
-@Composable
-fun RefreshingFeedStringFeedView(
-    viewModel: StringFeedViewModel,
-    enablePullRefresh: Boolean = true,
-    inner: @Composable (String) -> Unit,
-) {
-    RefresheableBox(viewModel, enablePullRefresh) { StringFeedView(viewModel, inner = inner) }
-}
-
 @Composable
 fun StringFeedView(
     viewModel: StringFeedViewModel,
@@ -112,7 +105,13 @@ private fun FeedLoaded(
     ) {
         item { pre?.let { it() } }
 
-        itemsIndexed(state.feed.value, key = { _, item -> item }) { _, item -> inner(item) }
+        itemsIndexed(state.feed.value, key = { _, item -> item }) { _, item ->
+            inner(item)
+
+            HorizontalDivider(
+                thickness = DividerThickness,
+            )
+        }
 
         item { post?.let { it() } }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt

@@ -20,13 +20,10 @@
  */
 package com.vitorpamplona.amethyst.ui.screen
 
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -35,6 +32,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.KeyboardOptions
@@ -49,9 +47,6 @@ import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
-import androidx.compose.material3.pullrefresh.PullRefreshIndicator
-import androidx.compose.material3.pullrefresh.pullRefresh
-import androidx.compose.material3.pullrefresh.rememberPullRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -80,7 +75,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -147,7 +141,6 @@ import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
-import com.vitorpamplona.amethyst.ui.theme.StdTopPadding
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
 import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -195,36 +188,31 @@ fun ThreadFeedView(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
-
     val listState = rememberLazyListState()
 
-    var refreshing by remember { mutableStateOf(false) }
+    RefresheableBox(viewModel) {
-    val refresh = {
+        RenderFeedState(
-        refreshing = true
+            viewModel = viewModel,
-        viewModel.invalidateData()
+            accountViewModel = accountViewModel,
-        refreshing = false
+            listState = listState,
+            nav = nav,
+            routeForLastRead = null,
+            onLoaded = {
+                RenderThreadFeed(noteId, it, listState, accountViewModel, nav)
+            },
+        )
     }
-    val pullRefreshState = rememberPullRefreshState(refreshing, onRefresh = refresh)
+}
 
-    Box(Modifier.pullRefresh(pullRefreshState)) {
+@Composable
-        Column {
+fun RenderThreadFeed(
-            Crossfade(
+    noteId: String,
-                targetState = feedState,
+    state: FeedState.Loaded,
-                animationSpec = tween(durationMillis = 100),
+    listState: LazyListState,
-                label = "ThreadViewMainState",
+    accountViewModel: AccountViewModel,
-            ) { state ->
+    nav: (String) -> Unit,
-                when (state) {
+) {
-                    is FeedState.Empty -> {
-                        FeedEmpty { refreshing = true }
-                    }
-                    is FeedState.FeedError -> {
-                        FeedError(state.errorMessage) { refreshing = true }
-                    }
-                    is FeedState.Loaded -> {
-                        refreshing = false
     LaunchedEffect(noteId) {
-                            launch(Dispatchers.IO) {
         // waits to load the thread to scroll to item.
         delay(100)
         val noteForPosition = state.feed.value.filter { it.idHex == noteId }.firstOrNull()
@@ -235,8 +223,7 @@ fun ThreadFeedView(
                 position-- // show the replying note
             }
 
-                                    withContext(Dispatchers.Main) { listState.scrollToItem(position) }
+            listState.scrollToItem(position)
-                                }
         }
     }
 
@@ -292,21 +279,10 @@ fun ThreadFeedView(
             }
 
             HorizontalDivider(
-                                    modifier = StdTopPadding,
                 thickness = DividerThickness,
             )
         }
     }
-                    }
-                    FeedState.Loading -> {
-                        LoadingFeed()
-                    }
-                }
-            }
-        }
-
-        PullRefreshIndicator(refreshing, pullRefreshState, Modifier.align(Alignment.TopCenter))
-    }
 }
 
 // Creates a Zebra pattern where each bar is a reply level.
@@ -504,7 +480,6 @@ fun NoteMaster(
                         ChannelHeader(
                             channelHex = note.channelHex()!!,
                             showVideo = true,
-                            showBottomDiviser = false,
                             sendToChannel = true,
                             accountViewModel = accountViewModel,
                             nav = nav,

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt

@@ -25,11 +25,13 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 
 @Composable
@@ -82,6 +84,9 @@ private fun FeedLoaded(
     ) {
         itemsIndexed(state.feed.value, key = { _, item -> item.pubkeyHex }) { _, item ->
             UserCompose(item, accountViewModel = accountViewModel, nav = nav)
+            HorizontalDivider(
+                thickness = DividerThickness,
+            )
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt

@@ -53,7 +53,6 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalTextStyle
@@ -139,7 +138,6 @@ import com.vitorpamplona.amethyst.ui.screen.RefreshingChatroomFeedView
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.EditFieldBorder
@@ -557,7 +555,6 @@ fun MyTextField(
 fun ChannelHeader(
     channelNote: Note,
     showVideo: Boolean,
-    showBottomDiviser: Boolean,
     sendToChannel: Boolean,
     modifier: Modifier = StdPadding,
     accountViewModel: AccountViewModel,
@@ -568,8 +565,8 @@ fun ChannelHeader(
         ChannelHeader(
             channelHex = it,
             showVideo = showVideo,
-            showBottomDiviser = showBottomDiviser,
             sendToChannel = sendToChannel,
+            modifier = modifier,
             accountViewModel = accountViewModel,
             nav = nav,
         )
@@ -580,7 +577,6 @@ fun ChannelHeader(
 fun ChannelHeader(
     channelHex: String,
     showVideo: Boolean,
-    showBottomDiviser: Boolean,
     showFlag: Boolean = true,
     sendToChannel: Boolean = false,
     modifier: Modifier = StdPadding,
@@ -591,7 +587,6 @@ fun ChannelHeader(
         ChannelHeader(
             it,
             showVideo,
-            showBottomDiviser,
             showFlag,
             sendToChannel,
             modifier,
@@ -605,7 +600,6 @@ fun ChannelHeader(
 fun ChannelHeader(
     baseChannel: Channel,
     showVideo: Boolean,
-    showBottomDiviser: Boolean,
     showFlag: Boolean = true,
     sendToChannel: Boolean = false,
     modifier: Modifier = StdPadding,
@@ -641,12 +635,6 @@ fun ChannelHeader(
                 LongChannelHeader(baseChannel = baseChannel, accountViewModel = accountViewModel, nav = nav)
             }
         }
-
-        if (showBottomDiviser) {
-            HorizontalDivider(
-                thickness = DividerThickness,
-            )
-        }
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt

@@ -491,6 +491,9 @@ fun ShowUserSuggestionList(
                 key = { _, item -> item.pubkeyHex },
             ) { _, item ->
                 UserLine(item, accountViewModel) { channelScreenModel.autocompleteWithUser(item) }
+                HorizontalDivider(
+                    thickness = DividerThickness,
+                )
             }
         }
     }
@@ -807,6 +810,9 @@ fun LongRoomHeader(
                         accountViewModel = accountViewModel,
                         nav = nav,
                     )
+                    HorizontalDivider(
+                        thickness = DividerThickness,
+                    )
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt

@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -47,7 +46,6 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.ui.screen.NostrHashtagFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
 
 @Composable
@@ -142,11 +140,8 @@ fun HashtagHeader(
     account: AccountViewModel,
     onClick: () -> Unit = {},
 ) {
-    Column(
-        Modifier.fillMaxWidth().clickable { onClick() },
-    ) {
-        Column(modifier = modifier) {
     Row(
+        modifier = Modifier.fillMaxWidth().clickable { onClick() }.then(modifier),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Center,
     ) {
@@ -158,12 +153,6 @@ fun HashtagHeader(
 
         HashtagActionOptions(tag, account)
     }
-        }
-
-        HorizontalDivider(
-            thickness = DividerThickness,
-        )
-    }
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -312,10 +312,6 @@ fun MutedWordHeader(
                 MutedWordActionOptions(tag, account)
             }
         }
-
-        HorizontalDivider(
-            thickness = DividerThickness,
-        )
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt

@@ -120,7 +120,9 @@ fun NotificationScreen(
         SummaryBar(
             model = userReactionsStatsModel,
         )
-
+        HorizontalDivider(
+            thickness = DividerThickness,
+        )
         RefreshableCardView(
             viewModel = notifFeedViewModel,
             accountViewModel = accountViewModel,
@@ -229,10 +231,6 @@ fun SummaryBar(model: UserReactionsViewModel) {
             }
         }
     }
-
-    HorizontalDivider(
-        thickness = DividerThickness,
-    )
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -1547,10 +1547,7 @@ fun TabFollowedTags(
     account: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    Column(Modifier.fillMaxHeight()) {
+    Column(Modifier.fillMaxHeight().padding(vertical = 0.dp)) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp),
-        ) {
         baseUser.latestContactList?.let {
             it.unverifiedFollowTagSet().forEach { hashtag ->
                 HashtagHeader(
@@ -1558,7 +1555,9 @@ fun TabFollowedTags(
                     account = account,
                     onClick = { nav("Hashtag/$hashtag") },
                 )
-                }
+                HorizontalDivider(
+                    thickness = DividerThickness,
+                )
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt

@@ -374,6 +374,11 @@ private fun DisplaySearchResults(
             key = { _, item -> "#$item" },
         ) { _, item ->
             HashtagLine(item) { nav("Hashtag/$item") }
+
+            HorizontalDivider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = DividerThickness,
+            )
         }
 
         itemsIndexed(
@@ -381,6 +386,10 @@ private fun DisplaySearchResults(
             key = { _, item -> "u" + item.pubkeyHex },
         ) { _, item ->
             UserCompose(item, accountViewModel = accountViewModel, nav = nav)
+
+            HorizontalDivider(
+                thickness = DividerThickness,
+            )
         }
 
         itemsIndexed(
@@ -432,12 +441,9 @@ fun HashtagLine(
     tag: String,
     onClick: () -> Unit,
 ) {
-    Column(
-        modifier = Modifier.fillMaxWidth().clickable(onClick = onClick),
-    ) {
     Row(
         modifier =
-                Modifier.padding(
+            Modifier.fillMaxWidth().clickable(onClick = onClick).padding(
                 start = 12.dp,
                 end = 12.dp,
                 top = 10.dp,
@@ -454,12 +460,6 @@ fun HashtagLine(
             )
         }
     }
-
-        HorizontalDivider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = DividerThickness,
-        )
-    }
 }
 
 @Composable
@@ -468,15 +468,13 @@ fun UserLine(
     accountViewModel: AccountViewModel,
     onClick: () -> Unit,
 ) {
-    Column(
-        modifier = Modifier.fillMaxWidth().clickable(onClick = onClick),
-    ) {
     Row(
         modifier =
-                Modifier.padding(
+            Modifier.fillMaxWidth().clickable(onClick = onClick).padding(
                 start = 12.dp,
                 end = 12.dp,
                 top = 10.dp,
+                bottom = 10.dp,
             ),
     ) {
         ClickableUserPicture(baseUser, 55.dp, accountViewModel, Modifier, null)
@@ -489,10 +487,4 @@ fun UserLine(
             AboutDisplay(baseUser)
         }
     }
-
-        HorizontalDivider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = DividerThickness,
-        )
-    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt

@@ -20,11 +20,8 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
@@ -79,7 +76,5 @@ fun ThreadScreen(
         onDispose { lifeCycleOwner.lifecycle.removeObserver(observer) }
     }
 
-    Column(Modifier.fillMaxHeight()) {
+    ThreadFeedView(noteId, feedViewModel, accountViewModel, nav)
-        Column { ThreadFeedView(noteId, feedViewModel, accountViewModel, nav) }
-    }
 }