Fix roomlist filter back

2022-11-23 10:39:40 +01:00 · 2022-11-23 10:39:40 +01:00 · ae6b6fe1f3
commit ae6b6fe1f3
parent d9d87e4d2f
1 changed files with 10 additions and 5 deletions
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
@ -35,19 +35,24 @@ fun RoomListTopBar(
    onLogoutClicked: () -> Unit,
    scrollBehavior: TopAppBarScrollBehavior
 ) {
+
    LogCompositions(tag = "RoomListScreen", msg = "TopBar")
    var searchWidgetStateIsOpened by rememberSaveable { mutableStateOf(false) }
-    BackHandler(enabled = searchWidgetStateIsOpened) {
+
+    fun closeFilter() {
+        onFilterChanged("")
        searchWidgetStateIsOpened = false
    }
+
+    BackHandler(enabled = searchWidgetStateIsOpened) {
+        closeFilter()
+    }
+
    if (searchWidgetStateIsOpened) {
        SearchRoomListTopBar(
            text = filter,
            onFilterChanged = onFilterChanged,
-            onCloseClicked = {
-                onFilterChanged("")
-                searchWidgetStateIsOpened = false
-            },
+            onCloseClicked = ::closeFilter,
            scrollBehavior = scrollBehavior,
        )
    } else {