Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: FileSharing menu - no gaps #WPB-15276 #3869

Merged
merged 3 commits into from
Feb 10, 2025
Merged

fix: FileSharing menu - no gaps #WPB-15276 #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51a4446
fix: FileSharing menu - no gaps
borichellow Feb 7, 2025
79e33b2
Code style fix
borichellow Feb 7, 2025
a68fae7
Merge develop into fix/file_sharing_menu_no_gaps
borichellow Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.imeAnimationTarget
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.isImeVisible
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.shape.GenericShape
Expand Down Expand Up @@ -384,7 +383,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
Expand All @@ -403,13 +402,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
Expand Down Expand Up @@ -489,7 +481,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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading