diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt index 85b26488f..20be1f3dd 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt @@ -73,7 +73,7 @@ fun SearchField( val keyboardController = LocalSoftwareKeyboardController.current val focusRequester = remember { FocusRequester() } - TextField( + TextField( modifier = Modifier .fillMaxWidth() // .padding(vertical = 2.dp) @@ -86,16 +86,18 @@ fun SearchField( placeholder = { Text(text = "Search") }, - leadingIcon = { - IconButton( - onClick = { navController.popBackStack() } - ) { + leadingIcon = { + IconButton( + onClick = { + onSearchTextChanged("") + navController.popBackStack() + }) { Icon( imageVector = androidx.compose.material.icons.Icons.Filled.ArrowBack, contentDescription = "Back" ) } - }, + }, trailingIcon = { AnimatedVisibility( visible = showClearButton, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchView.kt index 5f48004e5..fb2263480 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchView.kt @@ -45,19 +45,6 @@ fun SearchView( topBar = { TopAppBar( title = { Text("") }, -// SearchField(searchText) { libraryViewModel.updateSearchText(it) } -// }, -// navigationIcon = { -// IconButton( -// modifier = Modifier.background(color = Color.Red), -// onClick = { navController.popBackStack() } -// ) { -// Icon( -// imageVector = androidx.compose.material.icons.Icons.Filled.ArrowBack, -// contentDescription = "Back" -// ) -// }, - actions = { Row { SearchField(