From c2887f4b0a3db8850ccf431c83cf5ee2614051b0 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 28 Sep 2021 18:10:57 +0200 Subject: [PATCH] Don't fire a new search if only the cursor position in the search bar has changed --- .../java/de/mm20/launcher2/ui/component/SearchBar.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt index 9f28efb4..f8e3a8d3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt @@ -45,12 +45,12 @@ fun SearchBar( offScreen: Float, onFocus: () -> Unit = {} ) { - var searchQuery by remember { mutableStateOf(TextFieldValue()) } + var searchQuery by remember { mutableStateOf("") } val viewModel: SearchViewModel = viewModel() LaunchedEffect(searchQuery) { - viewModel.search(searchQuery.text) + viewModel.search(searchQuery) } val pageTransition = (pagerState.currentPage + pagerState.currentPageOffset).coerceIn(0f, 1f) @@ -101,7 +101,7 @@ fun SearchBar( if (it.isFocused) onFocus() } ) - if (searchQuery.text.isEmpty()) { + if (searchQuery.isEmpty()) { BasicText( text = stringResource(id = R.string.edit_text_search_hint), style = textStyle, @@ -113,8 +113,8 @@ fun SearchBar( Box { IconButton( onClick = { - if (searchQuery.text.isNotEmpty()) { - searchQuery = TextFieldValue() + if (searchQuery.isNotEmpty()) { + searchQuery = "" } else { showOverflowMenu = true } @@ -123,7 +123,7 @@ fun SearchBar( ) { val menuClearIcon = animatedVectorResource(R.drawable.anim_ic_menu_clear) Icon( - painter = menuClearIcon.painterFor(atEnd = searchQuery.text.isNotEmpty()), + painter = menuClearIcon.painterFor(atEnd = searchQuery.isNotEmpty()), null ) }