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

Jump to bottom

fix: attachment options in chat not working on android 14 (WPB-1846) #2073

Merged
merged 6 commits into from
Aug 9, 2023
Merged

fix: attachment options in chat not working on android 14 (WPB-1846) #2073

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed8a397
fix: attachment options in chat not working on Android 14
ohassine Aug 8, 2023
aa12d02
chore: update kalium reference
ohassine Aug 8, 2023
7442c57
chore: kalium reference
ohassine Aug 9, 2023
6276f7f
chore: fix kalium reference
ohassine Aug 9, 2023
5ee7f19
Merge branch 'release/candidate' into attachment_options_in_chat_not_…
trOnk12 Aug 9, 2023
04785e6
Merge branch 'release/candidate' into attachment_options_in_chat_not_…
tmspzz Aug 9, 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
8 changes: 1 addition & 7 deletions app/src/main/kotlin/com/wire/android/ui/common/KeyboardHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 6 files
+1 −1 cryptography/src/commonTest/kotlin/com/wire/kalium/cryptography/E2EIClientTest.kt
+4 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/Event.kt
+42 −8 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/EventMapper.kt
+1 −2 .../commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/ConversationMessageTimerEventHandler.kt
+16 −1 ...monTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/ConversationMessageTimerEventHandlerTest.kt
+3 −1 network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/notification/EventContentDTO.kt
Loading