From e3ddba115194bc4c87e98627579fc4b0a9ebb6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BBerko?= Date: Fri, 27 Oct 2023 16:17:25 +0200 Subject: [PATCH 1/2] fix: removed fixed height to adapt to grid view --- .../main/kotlin/com/wire/android/ui/common/AttachmentButton.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt b/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt index e296dd0b1dc..d5788b9d627 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt @@ -60,7 +60,6 @@ fun AttachmentButton( ) { Column( modifier = modifier - .height(dimensions().spacing100x) .padding(dimensions().spacing4x) .clip(RoundedCornerShape(size = MaterialTheme.wireDimensions.buttonSmallCornerSize)) .clickable { onClick() } @@ -96,6 +95,7 @@ fun AttachmentButton( } } +// This composable has not fixed height to adapt to GridView in [AttachmentOptionsComponent] @Preview(showBackground = true) @Composable fun PreviewAttachmentButton() { From 456e21e9c82840282eff73cd16ca13c46bb1a769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BBerko?= Date: Fri, 27 Oct 2023 16:22:01 +0200 Subject: [PATCH 2/2] detekt fix --- .../main/kotlin/com/wire/android/ui/common/AttachmentButton.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt b/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt index d5788b9d627..64ee3f0a08d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/AttachmentButton.kt @@ -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