chore(fc): make spectator footer a consistent unit when room is closed

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

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

@@ -34,6 +34,7 @@ import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.chat.ChatInput
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
+import com.getcode.ui.utils.addIf
 import com.getcode.ui.utils.keyboardAsState
 import com.getcode.ui.utils.withTopBorder
 import com.getcode.util.resources.LocalResources
@@ -109,17 +110,21 @@ fun ConversationChatInput(
             }
 
             is ChattableState.Spectator -> {
-                Column {
+                Column(
+                    modifier = Modifier.addIf(
+                        !state.isRoomOpen && state.isOpenCloseEnabled
+                    ) {
+                        Modifier.background(CodeTheme.colors.secondary)
+                    }.navigationBarsPadding(),
+                ) {
                     if (!state.isRoomOpen && state.isOpenCloseEnabled) {
                         Text(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .background(CodeTheme.colors.secondary)
                                 .padding(
                                     top = CodeTheme.dimens.grid.x1,
-                                    bottom = CodeTheme.dimens.grid.x3
-                                )
-                                .navigationBarsPadding(),
+                                    bottom = CodeTheme.dimens.grid.x2
+                                ),
                             textAlign = TextAlign.Center,
                             text = stringResource(R.string.title_roomIsClosed),
                             style = CodeTheme.typography.textSmall,
@@ -133,8 +138,7 @@ fun ConversationChatInput(
                             .padding(
                                 start = CodeTheme.dimens.inset,
                                 end = CodeTheme.dimens.inset
-                            )
-                            .navigationBarsPadding(),
+                            ),
                         buttonState = ButtonState.Filled,
                         text = stringResource(
                             R.string.action_joinRoomWithCost,

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

@@ -20,10 +20,7 @@ import com.getcode.model.chat.MessageContent
 import com.getcode.model.chat.MessageStatus
 import com.getcode.model.chat.Sender
 import com.getcode.model.uuid
-import com.getcode.models.ConfirmationState
 import com.getcode.navigation.RoomInfoArgs
-import com.getcode.network.BalanceController
-import com.getcode.network.BalanceDisplay
 import com.getcode.services.model.ExtendedMetadata
 import com.getcode.ui.components.chat.messagecontents.MessageControlAction
 import com.getcode.ui.components.chat.messagecontents.MessageControls
@@ -306,13 +303,13 @@ class ConversationViewModel @Inject constructor(
                 val chattableState = if (selfMember != null) {
                     val isMuted = selfMember.isMuted
                     val isSpectator = !selfMember.isFullMember
-                    val isRoomClosed = !conversation.isOpen && !selfMember.isHost
+                    val isRoomClosedAsMember = !conversation.isOpen && !selfMember.isHost
 
                     when {
                         isSpectator -> ChattableState.Spectator(
                             Kin.fromQuarks(it.conversation.coverChargeQuarks ?: 0)
                         )
-                        isRoomClosed -> ChattableState.DisabledByClosedRoom
+                        isRoomClosedAsMember -> ChattableState.DisabledByClosedRoom
                         isMuted -> ChattableState.DisabledByMute
                         else -> ChattableState.Enabled
                     }