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(composer) : use HideKeyboardWhenDisposed only in MessagesView #3993

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix(composer) : use HideKeyboardWhenDisposed only in MessagesView #3993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions ...s/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ import io.element.android.libraries.designsystem.theme.components.BottomSheetDra
import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.designsystem.utils.HideKeyboardWhenDisposed
import io.element.android.libraries.designsystem.utils.KeepScreenOn
import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
Expand Down Expand Up @@ -124,6 +125,8 @@ fun MessagesView(

KeepScreenOn(state.voiceMessageComposerState.keepScreenOn)

HideKeyboardWhenDisposed()

val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)

// This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose
Expand Down
2 changes: 0 additions & 2 deletions ...xtcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.utils.HideKeyboardWhenDisposed
import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
Expand Down Expand Up @@ -324,7 +323,6 @@ fun TextComposer(
}
}
}
HideKeyboardWhenDisposed()
}

@Composable
Expand Down
Loading