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: search can not be closed in android 8.1 (WPB-14885) #3800

Merged
merged 2 commits into from
Jan 14, 2025
+5 −1
Merged

fix: search can not be closed in android 8.1 (WPB-14885) #3800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3154267
fix: search can not be closed in android
ohassine Jan 14, 2025
4b0c8bf
Merge branch 'develop' into search-can-not-be-closed-in-android-8.1
ohassine Jan 14, 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
2 changes: 2 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/common/topappbar/search/SearchTopBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package com.wire.android.ui.common.topappbar.search
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -144,6 +145,7 @@ fun SearchTopBar(
interactionSource = interactionSource,
modifier = Modifier
.padding(dimensions().spacing8x)
.focusable(true)
.focusRequester(focusRequester)
.onFocusEvent { onActiveChanged(it.isFocused) }
)
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -20,6 +20,7 @@ package com.wire.android.ui.home.messagecomposer

import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -292,6 +293,7 @@ private fun MessageComposerTextInput(
state = WireTextFieldState.Default,
keyboardOptions = KeyboardOptions.DefaultText.copy(imeAction = ImeAction.None),
modifier = modifier
.focusable(true)
.focusRequester(focusRequester)
.onFocusChanged { focusState ->
if (focusState.isFocused) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ compose-qr = "1.0.1"
amplituda = "2.2.2"

# Compose
composeBom = "2024.11.00"
composeBom = "2024.12.01"
compose-activity = "1.9.3"
compose-compiler = "1.5.13"
compose-constraint = "1.1.0"
Expand Down
Loading