From ed8a397182fc341c10a8382de119e7cb9cff4cd2 Mon Sep 17 00:00:00 2001 From: oussamah Date: Tue, 8 Aug 2023 14:06:25 +0200 Subject: [PATCH 1/4] fix: attachment options in chat not working on Android 14 --- .../kotlin/com/wire/android/ui/common/KeyboardHelper.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/common/KeyboardHelper.kt b/app/src/main/kotlin/com/wire/android/ui/common/KeyboardHelper.kt index fdf528b0660..d5cc658e8ba 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/KeyboardHelper.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/KeyboardHelper.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.ime -import androidx.compose.foundation.layout.isImeVisible import androidx.compose.foundation.layout.navigationBarsIgnoringVisibility import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalDensity @@ -18,12 +17,7 @@ import androidx.core.view.WindowInsetsCompat object KeyboardHelper { @Composable - fun isKeyboardVisible(): Boolean = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - WindowInsets.isImeVisible - } else { - ViewCompat.getRootWindowInsets(LocalView.current)?.isVisible(WindowInsetsCompat.Type.ime()) ?: false - } + fun isKeyboardVisible(): Boolean = ViewCompat.getRootWindowInsets(LocalView.current)?.isVisible(WindowInsetsCompat.Type.ime()) ?: false @Composable fun getCalculatedKeyboardHeight(): Dp = From aa12d0245fcd29df538cad217d3f17a78a2fa599 Mon Sep 17 00:00:00 2001 From: oussamah Date: Tue, 8 Aug 2023 14:06:39 +0200 Subject: [PATCH 2/4] chore: update kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 70a14ad0133..65460fb4169 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 70a14ad013340f1e9e29be8a5eef372816570f3f +Subproject commit 65460fb416950046d4dfebf5ab87bec96a9a4149 From 7442c570d2b06916f62b52f191f6aeef7f4d6338 Mon Sep 17 00:00:00 2001 From: oussamah Date: Wed, 9 Aug 2023 12:18:16 +0200 Subject: [PATCH 3/4] chore: kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 65460fb4169..36b2c2080a1 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 65460fb416950046d4dfebf5ab87bec96a9a4149 +Subproject commit 36b2c2080a1db1cee5ad7bdd148d699e4a02fb36 From 6276f7fa81ed4d9c2d8b4f5fd865df32c38b1d0f Mon Sep 17 00:00:00 2001 From: oussamah Date: Wed, 9 Aug 2023 12:19:25 +0200 Subject: [PATCH 4/4] chore: fix kalium reference --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 36b2c2080a1..852a2413b57 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 36b2c2080a1db1cee5ad7bdd148d699e4a02fb36 +Subproject commit 852a2413b57de7b24c1fed73c296e6737983c587