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: removed fixed height to adapt to grid view [WPB-5101] #2381

Merged
merged 3 commits into from
Nov 1, 2023
+1 −2
Merged

fix: removed fixed height to adapt to grid view [WPB-5101] #2381

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ddba1
fix: removed fixed height to adapt to grid view
Garzas Oct 27, 2023
456e21e
detekt fix
Garzas Oct 27, 2023
30a6166
Merge branch 'develop' into fix/attachment-fixed-height
ohassine Nov 1, 2023
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
3 changes: 1 addition & 2 deletions app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
Expand Down Expand Up @@ -60,7 +59,6 @@ fun AttachmentButton(
) {
Column(
modifier = modifier
.height(dimensions().spacing100x)
.padding(dimensions().spacing4x)
.clip(RoundedCornerShape(size = MaterialTheme.wireDimensions.buttonSmallCornerSize))
.clickable { onClick() }
Expand Down Expand Up @@ -96,6 +94,7 @@ fun AttachmentButton(
}
}

// This composable has not fixed height to adapt to GridView in [AttachmentOptionsComponent]
@Preview(showBackground = true)
@Composable
fun PreviewAttachmentButton() {
Expand Down
Loading