From 6c33dae4985aeb14d9ceaa0bda1c5020b73899f4 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 22 Dec 2023 11:32:54 -0500 Subject: [PATCH] Small refactoring before release. --- .../amethyst/ui/layouts/ChatHeaderLayout.kt | 3 --- .../amethyst/ui/note/ChatroomHeaderCompose.kt | 12 ++---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt index 2e33ee8b8..c03c77916 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt @@ -1,6 +1,5 @@ package com.vitorpamplona.amethyst.ui.layouts -import android.annotation.SuppressLint import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -13,7 +12,6 @@ import androidx.compose.material3.Divider import androidx.compose.material3.ListItem import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -32,7 +30,6 @@ import com.vitorpamplona.amethyst.ui.theme.Size55Modifier import com.vitorpamplona.amethyst.ui.theme.StdTopPadding import com.vitorpamplona.quartz.utils.TimeUtils -@SuppressLint("UnrememberedMutableState") @Composable @Preview fun ChannelNamePreview() { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt index 0b7bdc46b..b995a7321 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt @@ -71,7 +71,7 @@ fun ChatroomHeaderCompose( if (hasEvent) { ChatroomComposeChannelOrUser(baseNote, accountViewModel, nav) } else { - BlankNote(Modifier) + BlankNote() } } @@ -394,7 +394,7 @@ private fun WatchNotificationChanges( accountViewModel: AccountViewModel, onNewStatus: (Boolean) -> Unit ) { - LaunchedEffect(key1 = note, accountViewModel.accountMarkAsReadUpdates.value) { + LaunchedEffect(key1 = note, accountViewModel.accountMarkAsReadUpdates.intValue) { launch(Dispatchers.IO) { note.event?.createdAt()?.let { val lastTime = accountViewModel.account.loadLastRead(route) @@ -495,14 +495,6 @@ fun ChannelName( ) } -@Composable -private fun FirstRow( - channelTitle: @Composable (Modifier) -> Unit, - channelLastTime: Long?, - modifier: Modifier -) { -} - @Composable private fun TimeAgo(channelLastTime: Long?) { if (channelLastTime == null) return