Add search to per-app proxy menu

app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt

@@ -18,6 +18,7 @@ import android.view.MenuItem
 import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.widget.SearchView
 import androidx.core.content.getSystemService
 import androidx.core.view.isGone
 import androidx.lifecycle.lifecycleScope
@@ -46,6 +47,7 @@ class PerAppProxyActivity : AbstractActivity() {
     private val appList = mutableListOf<AppItem>()
 
     private var hideSystem = false
+    private var searchKeyword = ""
     private val filteredAppList = mutableListOf<AppItem>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -147,23 +149,35 @@ class PerAppProxyActivity : AbstractActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.per_app_menu, menu)
+
+        if (menu != null) {
+            val searchView = menu.findItem(R.id.action_search).actionView as SearchView
+            searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    searchKeyword = newText
+                    filterApps()
+                    return true
+                }
+            })
+        }
+
         return super.onCreateOptionsMenu(menu)
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_hide_system -> {
                 hideSystem = !hideSystem
-                filteredAppList.clear()
                 if (hideSystem) {
-                    filteredAppList.addAll(appList.filter { !it.isSystemApp })
                     item.setTitle(R.string.menu_show_system)
                 } else {
-                    filteredAppList.addAll(appList)
                     item.setTitle(R.string.menu_hide_system)
                 }
-                adapter.notifyDataSetChanged()
+                filterApps()
                 return true
             }
 
@@ -192,6 +206,24 @@ class PerAppProxyActivity : AbstractActivity() {
         return super.onOptionsItemSelected(item)
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    private fun filterApps() {
+        filteredAppList.clear()
+        if (searchKeyword.isNotEmpty()) {
+            filteredAppList.addAll(appList.filter {
+                (!hideSystem || !it.isSystemApp) &&
+                        (it.name.contains(searchKeyword, true)
+                                || it.packageName.contains(searchKeyword, true))
+            })
+            adapter.notifyDataSetChanged()
+        } else if (hideSystem) {
+            filteredAppList.addAll(appList.filter { !it.isSystemApp })
+        } else {
+            filteredAppList.addAll(appList)
+        }
+        adapter.notifyDataSetChanged()
+    }
+
     private fun importFromClipboard() {
         val clipboardManager = getSystemService<ClipboardManager>()!!
         if (!clipboardManager.hasPrimaryClip()) {

app/src/main/res/drawable/ic_find_in_page_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>

app/src/main/res/menu/per_app_menu.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_find_in_page_24"
+        android:title="@string/search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="collapseActionView|always" />
 
     <item
         android:id="@+id/action_hide_system"

app/src/main/res/values/strings.xml

@@ -124,4 +124,5 @@
     <string name="import_profile">Import profile</string>
     <string name="import_profile_message">Are you sure to import profile %s?</string>
     <string name="icloud_profile_unsupported">iCloud profile is not support on current platform</string>
+    <string name="search">Search</string>
 </resources>