订阅源选择分组时只搜索分组

app/src/main/java/io/legado/app/data/dao/RssSourceDao.kt

@@ -25,6 +25,9 @@ interface RssSourceDao {
     @Query("SELECT * FROM rssSources where sourceName like :key or sourceUrl like :key or sourceGroup like :key order by customOrder")
     fun liveSearch(key: String): LiveData<List<RssSource>>
 
+    @Query("SELECT * FROM rssSources where sourceGroup like :key order by customOrder")
+    fun liveGroupSearch(key: String): LiveData<List<RssSource>>
+
     @Query("SELECT * FROM rssSources where enabled = 1 and (sourceName like '%'||:searchKey||'%' or sourceGroup like '%'||:searchKey||'%' or sourceUrl like '%'||:searchKey||'%') order by customOrder")
     fun liveEnabled(searchKey: String): LiveData<List<RssSource>>
 

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -95,7 +95,7 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
             R.id.menu_help -> showHelp()
             else -> if (item.groupId == R.id.source_group) {
                 binding.titleBar.findViewById<SearchView>(R.id.search_view)
-                    .setQuery(item.title, true)
+                    .setQuery("group:${item.title}", true)
             }
         }
         return super.onCompatOptionsItemSelected(item)
@@ -197,13 +197,20 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
         }
     }
 
-    private fun initLiveDataSource(key: String? = null) {
+    private fun initLiveDataSource(searchKey: String? = null) {
         sourceLiveData?.removeObservers(this)
         sourceLiveData =
-            if (key.isNullOrBlank()) {
+            when {
-                App.db.rssSourceDao.liveAll()
+                searchKey.isNullOrBlank() -> {
-            } else {
+                    App.db.rssSourceDao.liveAll()
-                App.db.rssSourceDao.liveSearch("%$key%")
+                }
+                searchKey.startsWith("group:") -> {
+                    val key = searchKey.substringAfter("group:")
+                    App.db.rssSourceDao.liveGroupSearch("%$key%")
+                }
+                else -> {
+                    App.db.rssSourceDao.liveSearch("%$searchKey%")
+                }
             }
         sourceLiveData?.observe(this, {
             adapter.setItems(it, adapter.diffItemCallback)