ok no it works the way we want!

- updates list in real time as you type in search - arrow back lets you keep search - x button in search bar clears search - physical back button clears search
williscool · Sep 27, 2024 · 9bc0c2f · 9bc0c2f
1 parent 43ea9bb
commit 9bc0c2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt
@@ -387,8 +387,10 @@ class EventListAdapter(
           events = newEvents;
         }
 
-        if (searchString != null && searchString != ""){
+        if (!searchString.isNullOrEmpty()){
           events = allEvents.filter { ev -> searchString?.let { ev.title.lowercase().contains(it.lowercase()) } == true }.toTypedArray()
+        } else {
+          events = allEvents
         }
 
         eventsPendingRemoval.clear()

diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivity.kt
@@ -414,6 +414,16 @@ class MainActivity : AppCompatActivity(), EventListCallback {
           }
         })
 
+        val closebutton: View = searchView.findViewById(androidx.appcompat.R.id.search_close_btn)
+
+        closebutton.setOnClickListener {
+          searchView.setQuery("",false)
+          searchView.clearFocus()
+          adapter.setSearchText(null)
+          adapter.setEventsToDisplay()
+          true
+        }
+
         val menuItem = menu.findItem(R.id.action_snooze_all)
         if (menuItem != null) {
             menuItem.isEnabled = adapter.itemCount > 0