chore(fc): room name change tweaks

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

Author: bmc08gt

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

@@ -33,7 +33,9 @@ import com.getcode.ui.components.chat.MessageListPointerResult
 import com.getcode.ui.components.chat.utils.ChatItem
 import com.getcode.ui.components.chat.utils.HandleMessageChanges
 import com.getcode.ui.components.text.markup.Markup
+import com.getcode.ui.utils.animateScrollToItemWithFullVisibility
 import com.getcode.ui.utils.keyboardAsState
+import com.getcode.ui.utils.scrollToItemWithFullVisibility
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import xyz.flipchat.app.R
@@ -118,18 +120,30 @@ internal fun ConversationMessages(
                     is MessageListEvent.ViewOriginalMessage -> {
                         composeScope.launch {
                             val itemIndex = messages.itemSnapshotList
+                                .filterIsInstance<ChatItem.Message>()
+                                .indexOfFirst { it.chatMessageId == event.originalMessageId }
+
+                            val currentItemIndex = messages.itemSnapshotList
                                 .filterIsInstance<ChatItem.Message>()
                                 .indexOfFirst { it.chatMessageId == event.messageId }
+
+                            println("target item is @ $itemIndex")
                             if (itemIndex >= 0) {
-                                val currentIndex = lazyListState.firstVisibleItemIndex
-                                val distance = abs(itemIndex - currentIndex)
+                                val distance = abs(itemIndex - currentItemIndex)
 
+                                println("distance from current ($currentItemIndex) is $distance")
                                 if (distance <= 100) {
-                                    lazyListState.animateScrollToItem(itemIndex)
+                                    // Animate smoothly if within 100 items
+                                    lazyListState.animateScrollToItemWithFullVisibility(
+                                        to = itemIndex,
+                                        from = currentItemIndex
+                                    )
                                 } else {
-                                    lazyListState.scrollToItem(itemIndex)
+                                    // Jump directly if too far
+                                    lazyListState.scrollToItemWithFullVisibility(
+                                        index = itemIndex,
+                                    )
                                 }
-
                             }
                         }
                     }

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt

@@ -79,7 +79,7 @@ class RoomInfoScreen(private val info: RoomInfoArgs) : Screen, Parcelable {
             viewModel.eventFlow
                 .filterIsInstance<ChatInfoViewModel.Event.OnChangeName>()
                 .onEach {
-                    navigator.show(ScreenRegistry.get(NavScreenProvider.Room.ChangeName(it.id, it.title)))
+                    navigator.push(ScreenRegistry.get(NavScreenProvider.Room.ChangeName(it.id, it.title)))
                 }.launchIn(this)
         }
 
@@ -180,15 +180,9 @@ private fun Actions(
                 buttonState = ButtonState.Filled,
                 text = stringResource(R.string.action_customize),
             ) {
-                val roomNameText = if (state.roomInfo.customTitle.isNotEmpty()) {
-                    context.getString(R.string.action_editRoomName)
-                } else {
-                    context.getString(R.string.action_addRoomName)
-                }
-
                 BottomBarManager.showMessage(
                     BottomBarManager.BottomBarMessage(
-                        positiveText = roomNameText,
+                        positiveText = context.getString(R.string.action_changeRoomName),
                         negativeText = context.getString(R.string.action_changeCoverCharge),
                         negativeStyle = BottomBarManager.BottomBarButtonStyle.Filled,
                         tertiaryText = context.getString(R.string.action_cancel),

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/name/RoomNameScreen.kt

@@ -65,33 +65,24 @@ data class RoomNameScreen(val roomId: ID, val customTitle: String) : Screen, Par
         val navigator = LocalCodeNavigator.current
         val keyboardIsVisible by keyboardAsState()
         val keyboard = LocalSoftwareKeyboardController.current
-        val composeScope = rememberCoroutineScope()
 
 
         BackHandler {
             if (keyboardIsVisible) {
                 keyboard?.hide()
             } else {
-                navigator.hide()
+                navigator.pop()
             }
         }
 
         Column(
             modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight(CodeTheme.dimens.modalHeightRatio)
+                .fillMaxSize()
         ) {
             AppBarWithTitle(
-                endContent = {
-                    AppBarDefaults.Close {
-                        composeScope.launch {
-                            if (keyboardIsVisible) {
-                                keyboard?.hide()
-                            }
-                            navigator.hide()
-                        }
-                    }
-                }
+                backButton = true,
+                title = stringResource(R.string.action_changeRoomName),
+                onBackIconClicked = { navigator.pop() },
             )
 
             val viewModel = getViewModel<RoomNameScreenViewModel>()
@@ -110,7 +101,7 @@ data class RoomNameScreen(val roomId: ID, val customTitle: String) : Screen, Par
                     .filterIsInstance<RoomNameScreenViewModel.Event.OnSuccess>()
                     .onEach {
                         delay(2.seconds)
-                        navigator.hide()
+                        navigator.pop()
                     }
                     .launchIn(this)
             }

flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/room/RoomCard.kt

@@ -148,10 +148,10 @@ fun RoomCard(
                         ) { textSize = it },
                         text = roomInfo.title,
                         style = CodeTheme.typography.displaySmall
-                            .copy(fontSize = textSize,)
+                            .copy(fontSize = textSize, lineHeight = 24.sp)
                             .withDropShadow(),
                         color = Color.White,
-                        maxLines = 1
+                        maxLines = 3
                     )
                 }
                 Spacer(Modifier.requiredHeight(geometry.titleBottomPadding))

flipchatApp/src/main/res/values/strings.xml

@@ -194,6 +194,7 @@
     <string name="action_changeCoverCharge">Change Cover Charge</string>
     <string name="action_addRoomName">Add Room Name</string>
     <string name="action_editRoomName">Edit Room Name</string>
+    <string name="action_changeRoomName">Change Room Name</string>
     <string name="action_customize">Customize</string>
     <string name="action_leaveRoom">Leave Room</string>
 

ui/components/src/main/kotlin/com/getcode/ui/utils/TextStyle.kt

@@ -8,7 +8,7 @@ import androidx.compose.ui.text.TextStyle
 fun TextStyle.withDropShadow(
     color: Color = Color.Black.copy(alpha = 0.5f),
     offset: Offset = Offset(4f, 4f),
-    blurRadius: Float = 8f,
+    blurRadius: Float = 4f,
 ): TextStyle = copy(
     shadow = Shadow(
         color = color,