From 81515315c9953d0163934186b69cb095b9da6617 Mon Sep 17 00:00:00 2001 From: Arnaud Rajon Date: Sat, 3 May 2025 00:07:52 +0200 Subject: [PATCH] fix AssociationSearch queried associations now reset each time the screen is loaded --- .../main/java/com/android/unio/model/search/SearchViewModel.kt | 2 +- app/src/main/java/com/android/unio/ui/components/SearchBar.kt | 1 + app/src/main/java/com/android/unio/ui/event/EventCreation.kt | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/android/unio/model/search/SearchViewModel.kt b/app/src/main/java/com/android/unio/model/search/SearchViewModel.kt index 78e7e69b..a7bfb007 100644 --- a/app/src/main/java/com/android/unio/model/search/SearchViewModel.kt +++ b/app/src/main/java/com/android/unio/model/search/SearchViewModel.kt @@ -120,7 +120,7 @@ class SearchViewModel @Inject constructor(private val repository: SearchReposito } /** Clears the list of associations and sets the search status to [Status.IDLE]. */ - private fun clearAssociations() { + fun clearAssociations() { _associations.value = emptyList() status.value = Status.IDLE } diff --git a/app/src/main/java/com/android/unio/ui/components/SearchBar.kt b/app/src/main/java/com/android/unio/ui/components/SearchBar.kt index e194a9a7..7c361e87 100644 --- a/app/src/main/java/com/android/unio/ui/components/SearchBar.kt +++ b/app/src/main/java/com/android/unio/ui/components/SearchBar.kt @@ -155,6 +155,7 @@ fun AssociationSearchBar( var searchQuery by remember { mutableStateOf("") } var isExpanded by rememberSaveable { mutableStateOf(false) } val associationResults by searchViewModel.associations.collectAsState() + searchViewModel.clearAssociations() val searchState by searchViewModel.status.collectAsState() val context = LocalContext.current diff --git a/app/src/main/java/com/android/unio/ui/event/EventCreation.kt b/app/src/main/java/com/android/unio/ui/event/EventCreation.kt index 59945014..86f0b6a5 100644 --- a/app/src/main/java/com/android/unio/ui/event/EventCreation.kt +++ b/app/src/main/java/com/android/unio/ui/event/EventCreation.kt @@ -16,7 +16,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.outlined.Clear -import androidx.compose.material.icons.rounded.Clear import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.IconButton