From 6a47f5aa3b0cb8fa42e7ca2bf685af1f95693d90 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 7 Jun 2023 12:06:18 -0400
Subject: [PATCH] Moves notification's scroll to top animation to an IO thread.

---
 .../amethyst/ui/screen/CardFeedView.kt        | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
index 47f8d0264..96420862c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
@@ -34,6 +34,7 @@ import com.vitorpamplona.amethyst.ui.note.MultiSetCompose
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.ZapUserSetCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -100,9 +101,11 @@ private fun WatchScrollToTop(
     val scrollToTop by viewModel.scrollToTop.collectAsState()
 
     LaunchedEffect(scrollToTop) {
-        if (scrollToTop > 0 && viewModel.scrolltoTopPending) {
-            listState.scrollToItem(index = 0)
-            viewModel.sentToTop()
+        launch {
+            if (scrollToTop > 0 && viewModel.scrolltoTopPending) {
+                listState.scrollToItem(index = 0)
+                viewModel.sentToTop()
+            }
         }
     }
 }
@@ -118,11 +121,10 @@ fun RenderCardFeed(
     val feedState by viewModel.feedContent.collectAsState()
 
     Crossfade(
-        modifier = Modifier.fillMaxSize(),
+        modifier = remember { Modifier.fillMaxSize() },
         targetState = feedState,
         animationSpec = tween(durationMillis = 100)
     ) { state ->
-
         when (state) {
             is CardFeedState.Empty -> {
                 FeedEmpty {
@@ -176,49 +178,59 @@ private fun FeedLoaded(
     ) {
         itemsIndexed(state.feed.value, key = { _, item -> item.id() }) { _, item ->
             Row(defaultModifier) {
-                when (item) {
-                    is NoteCard -> NoteCompose(
-                        item,
-                        isBoostedNote = false,
-                        accountViewModel = accountViewModel,
-                        nav = nav,
-                        routeForLastRead = routeForLastRead
-                    )
-
-                    is ZapUserSetCard -> ZapUserSetCompose(
-                        item,
-                        isInnerNote = false,
-                        accountViewModel = accountViewModel,
-                        nav = nav,
-                        routeForLastRead = routeForLastRead
-                    )
-
-                    is MultiSetCard -> MultiSetCompose(
-                        item,
-                        accountViewModel = accountViewModel,
-                        nav = nav,
-                        routeForLastRead = routeForLastRead
-                    )
-
-                    is BadgeCard -> BadgeCompose(
-                        item,
-                        accountViewModel = accountViewModel,
-                        nav = nav,
-                        routeForLastRead = routeForLastRead
-                    )
-
-                    is MessageSetCard -> MessageSetCompose(
-                        messageSetCard = item,
-                        routeForLastRead = routeForLastRead,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
-                }
+                RenderCardItem(item, accountViewModel, nav, routeForLastRead)
             }
         }
     }
 }
 
+@Composable
+private fun RenderCardItem(
+    item: Card,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    routeForLastRead: String
+) {
+    when (item) {
+        is NoteCard -> NoteCompose(
+            item,
+            isBoostedNote = false,
+            accountViewModel = accountViewModel,
+            nav = nav,
+            routeForLastRead = routeForLastRead
+        )
+
+        is ZapUserSetCard -> ZapUserSetCompose(
+            item,
+            isInnerNote = false,
+            accountViewModel = accountViewModel,
+            nav = nav,
+            routeForLastRead = routeForLastRead
+        )
+
+        is MultiSetCard -> MultiSetCompose(
+            item,
+            accountViewModel = accountViewModel,
+            nav = nav,
+            routeForLastRead = routeForLastRead
+        )
+
+        is BadgeCard -> BadgeCompose(
+            item,
+            accountViewModel = accountViewModel,
+            nav = nav,
+            routeForLastRead = routeForLastRead
+        )
+
+        is MessageSetCard -> MessageSetCompose(
+            messageSetCard = item,
+            routeForLastRead = routeForLastRead,
+            accountViewModel = accountViewModel,
+            nav = nav
+        )
+    }
+}
+
 @Composable
 fun NoteCompose(
     baseNote: NoteCard,