fix: FileSharing menu - no gaps

wireapp · Feb 7, 2025 · 7d52f27 · 7d52f27
1 parent 555b9aa
commit 7d52f27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt
@@ -384,7 +384,7 @@ fun EnabledMessageComposer(
                     offset = if (isImeVisible) {
                         IntOffset(0, 0)
                     } else {
-                        with(density) { IntOffset(0, -dimensions().spacing64x.toPx().roundToInt()) }
+                        with(density) { IntOffset(0, -dimensions().spacing48x.toPx().roundToInt()) }
                     },
                     onDismissRequest = {
                         hideRipple = true
@@ -403,13 +403,6 @@ fun EnabledMessageComposer(
                         modifier = Modifier
                             .fillMaxWidth()
                             .height(inputStateHolder.calculateOptionsMenuHeight(additionalOptionStateHolder.additionalOptionsSubMenuState))
-                            .padding(
-                                horizontal = if (isImeVisible) {
-                                    dimensions().spacing0x
-                                } else {
-                                    dimensions().spacing8x
-                                }
-                            )
                             .background(
                                 color = Color.Transparent,
                                 shape = shape
@@ -489,7 +482,8 @@ private fun calculateOptionsPath(cornerRadiusPx: Float, rippleProgress: Float, i
     shapePath.addRoundRect(
         roundRect = RoundRect(
             rect = size.toRect(),
-            cornerRadius = CornerRadius(cornerRadiusPx, cornerRadiusPx)
+            topRight = CornerRadius(cornerRadiusPx, cornerRadiusPx),
+            topLeft = CornerRadius(cornerRadiusPx, cornerRadiusPx)
         )
     )
     return ripplePath.and(shapePath)

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
@@ -30,8 +30,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.input.TextFieldLineLimits
 import androidx.compose.foundation.text.input.KeyboardActionHandler
+import androidx.compose.foundation.text.input.TextFieldLineLimits
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -258,13 +258,15 @@ private fun InputContent(
                     UsersTypingIndicatorForConversation(conversationId = conversationId)
                 }
             }
-            MessageSendActions(
-                onSendButtonClicked = onSendButtonClicked,
-                sendButtonEnabled = canSendMessage,
-                selfDeletionTimer = viewModel.state(),
-                onChangeSelfDeletionClicked = onChangeSelfDeletionClicked,
-                modifier = Modifier.padding(end = dimensions().spacing8x)
-            )
+            if (canSendMessage || showOptions) {
+                MessageSendActions(
+                    onSendButtonClicked = onSendButtonClicked,
+                    sendButtonEnabled = canSendMessage,
+                    selfDeletionTimer = viewModel.state(),
+                    onChangeSelfDeletionClicked = onChangeSelfDeletionClicked,
+                    modifier = Modifier.padding(end = dimensions().spacing8x)
+                )
+            }
         }
     }
 }