Add search tool for profiles

shadowsocks · Feb 25, 2021 · fb8649e · fb8649e
1 parent 49f3891
commit fb8649e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
@@ -37,6 +37,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.widget.PopupMenu
+import androidx.appcompat.widget.SearchView 
 import androidx.appcompat.widget.Toolbar
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.os.bundleOf
@@ -64,7 +65,7 @@ import com.google.zxing.WriterException
 import timber.log.Timber
 import java.nio.charset.StandardCharsets
 
-class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
+class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener, SearchView.OnQueryTextListener {
     companion object {
         /**
          * used for callback from stateChanged from MainActivity
@@ -237,6 +238,17 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
             notifyItemInserted(pos)
         }
 
+        fun filter(name: String) {
+            val active = ProfileManager.getActiveProfiles()?.toMutableList() ?: mutableListOf()
+            profiles.clear()
+            active.forEach { 
+                if ((it.name?.contains(name, true) ?: false) || it.host.contains(name, true)) {
+                    profiles.add(it)
+                }
+            }
+            notifyDataSetChanged()
+        }
+
         fun move(from: Int, to: Int) {
             undoManager.flush()
             val first = profiles[from]
@@ -322,6 +334,15 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
         startActivity(Intent(context, ProfileConfigActivity::class.java).putExtra(Action.EXTRA_PROFILE_ID, profile.id))
     }
 
+    override fun onQueryTextChange(query: String): Boolean {
+        profilesAdapter.filter(query)
+        return false
+    }
+
+    override fun onQueryTextSubmit(query: String): Boolean {
+        return false
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.layout_list, container, false)
 
@@ -331,6 +352,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
         toolbar.setTitle(R.string.profiles)
         toolbar.inflateMenu(R.menu.profile_manager_menu)
         toolbar.setOnMenuItemClickListener(this)
+        val searchView = toolbar.findViewById<SearchView>(R.id.action_search)
+        searchView.setOnQueryTextListener(this)
+        searchView.setQueryHint(getString(android.R.string.search_go))
+
         ProfileManager.ensureNotEmpty()
         profilesList = view.findViewById(R.id.list)
         ViewCompat.setOnApplyWindowInsetsListener(profilesList, MainListListener)

diff --git a/mobile/src/main/res/menu/profile_manager_menu.xml b/mobile/src/main/res/menu/profile_manager_menu.xml
@@ -47,4 +47,7 @@
                 app:alphabeticModifiers="CTRL|SHIFT"/>
         </menu>
     </item>
+    <item android:id="@+id/action_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always"/>
 </menu>