chore(fc): move typing indicator _into_ MessageList as a footer

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationMessages.kt

@@ -1,7 +1,17 @@
 package xyz.flipchat.app.features.chat.conversation
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -44,6 +54,7 @@ import com.getcode.ui.components.chat.HostableAvatar
 import com.getcode.ui.components.chat.MessageList
 import com.getcode.ui.components.chat.MessageListEvent
 import com.getcode.ui.components.chat.MessageListPointerResult
+import com.getcode.ui.components.chat.TypingIndicator
 import com.getcode.ui.components.chat.messagecontents.LocalAnnouncementActionResolver
 import com.getcode.ui.components.chat.messagecontents.ResolvedAction
 import com.getcode.ui.components.chat.utils.ChatItem
@@ -116,6 +127,28 @@ internal fun ConversationMessages(
                         current.sender.id == next?.sender?.id
                     )
                 },
+                footer = {
+                    AnimatedContent(
+                        targetState = state.otherUsersTyping.isNotEmpty(),
+                        transitionSpec = {
+                            slideInVertically(
+                                animationSpec = spring(
+                                    dampingRatio = Spring.DampingRatioMediumBouncy,
+                                    stiffness = Spring.StiffnessLow
+                                )
+                            ) { it } + scaleIn() + fadeIn() togetherWith
+                                    fadeOut() + slideOutVertically { it }
+                        }
+                    ) { show ->
+                        if (show) {
+                            TypingIndicator(
+                                modifier = Modifier
+                                    .padding(horizontal = CodeTheme.dimens.inset),
+                                userImages = state.otherUsersTyping
+                            )
+                        }
+                    }
+                },
                 dispatch = { event ->
                     when (event) {
                         is MessageListEvent.AdvancePointer -> {

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationScreen.kt

@@ -257,26 +257,6 @@ private fun ConversationScreenContent(
                     },
                 verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x3),
             ) {
-                AnimatedContent(
-                    targetState = state.otherUsersTyping.isNotEmpty(),
-                    transitionSpec = {
-                        slideInVertically(
-                            animationSpec = spring(
-                                dampingRatio = Spring.DampingRatioMediumBouncy,
-                                stiffness = Spring.StiffnessLow
-                            )
-                        ) { it } + scaleIn() + fadeIn() togetherWith fadeOut() + scaleOut() + slideOutVertically { it }
-                    }
-                ) { show ->
-                    if (show) {
-                        TypingIndicator(
-                            modifier = Modifier
-                                .padding(horizontal = CodeTheme.dimens.grid.x2),
-                            userImages = state.otherUsersTyping
-                        )
-                    }
-                }
-
                 Column(
                     modifier = Modifier
                         .addIf(state.chattableState?.isActiveMember() == true) {

ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt

@@ -78,6 +78,7 @@ fun MessageList(
         val nextGrouped = next?.chatMessageId == current.chatMessageId
         MessageListPointerResult(prevGrouped, nextGrouped)
     },
+    footer: (@Composable () -> Unit)? = null,
     dispatch: (MessageListEvent) -> Unit = { },
 ) {
     var hasSetAtUnread by rememberSaveable(key = "0") { mutableStateOf(false) }
@@ -97,10 +98,16 @@ fun MessageList(
         reverseLayout = true,
         contentPadding = PaddingValues(
             top = CodeTheme.dimens.inset,
-            bottom = CodeTheme.dimens.grid.x2,
+            bottom = CodeTheme.dimens.grid.x1,
         ),
         verticalArrangement = Arrangement.Top,
     ) {
+        if (footer != null) {
+            item {
+                footer.invoke()
+            }
+        }
+
         items(
             count = messages.itemCount,
             key = messages.itemKey { item -> item.key },