From 29d31190dc6567a3ce9ab5ca68bf74870eddc5eb Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Sat, 20 Nov 2021 13:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/book/arrange/ArrangeBookActivity.kt |  2 +-
 .../io/legado/app/ui/book/local/ImportBookActivity.kt |  2 +-
 .../app/ui/book/local/rule/TxtTocRuleActivity.kt      | 11 +++++++++++
 .../app/ui/book/local/rule/TxtTocRuleViewModel.kt     |  4 ++--
 .../app/ui/book/source/manage/BookSourceActivity.kt   |  2 +-
 .../io/legado/app/ui/replace/ReplaceRuleActivity.kt   |  2 +-
 .../app/ui/rss/source/manage/RssSourceActivity.kt     |  5 ++---
 .../app/ui/rss/source/manage/RssSourceViewModel.kt    | 10 ++--------
 .../java/io/legado/app/ui/widget/SelectActionBar.kt   |  4 ++--
 9 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
index 8b05ec3b2..77f9f313a 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
@@ -84,7 +84,7 @@ class ArrangeBookActivity : VMBaseActivity<ActivityArrangeBookBinding, ArrangeBo
         adapter.revertSelection()
     }
 
-    override fun onClickMainAction() {
+    override fun onClickSelectBarMainAction() {
         selectGroup(groupRequestCode, 0)
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
index 5ca79f230..fc4d51c94 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
@@ -98,7 +98,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    override fun onClickMainAction() {
+    override fun onClickSelectBarMainAction() {
         viewModel.addToBookshelf(adapter.selectedUris) {
             adapter.notifyDataSetChanged()
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
index 2e52efcbd..fe95f1597 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
@@ -111,6 +111,10 @@ class TxtTocRuleActivity : VMBaseActivity<ActivityTxtTocRuleBinding, TxtTocRuleV
         }
     }
 
+    override fun onClickSelectBarMainAction() {
+        delSourceDialog()
+    }
+
     override fun revertSelection() {
         adapter.revertSelection()
     }
@@ -144,6 +148,13 @@ class TxtTocRuleActivity : VMBaseActivity<ActivityTxtTocRuleBinding, TxtTocRuleV
             .upCountView(adapter.selection.size, adapter.itemCount)
     }
 
+    private fun delSourceDialog() {
+        alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
+            okButton { viewModel.del(*adapter.selection.toTypedArray()) }
+            noButton()
+        }
+    }
+
     @SuppressLint("InflateParams")
     private fun showImportDialog() {
         val aCache = ACache.get(this, cacheDir = false)
diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
index 14fa91cf0..47c261a16 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
@@ -19,9 +19,9 @@ class TxtTocRuleViewModel(app: Application) : BaseViewModel(app) {
         }
     }
 
-    fun del(txtTocRule: TxtTocRule) {
+    fun del(vararg txtTocRule: TxtTocRule) {
         execute {
-            appDb.txtTocRuleDao.delete(txtTocRule)
+            appDb.txtTocRuleDao.delete(*txtTocRule)
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
index 55b8ed893..7a557774f 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@@ -306,7 +306,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
         adapter.revertSelection()
     }
 
-    override fun onClickMainAction() {
+    override fun onClickSelectBarMainAction() {
         alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
             okButton { viewModel.delSelection(adapter.selection) }
             noButton()
diff --git a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt
index a595b2bd8..a20dd184f 100644
--- a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt
@@ -158,7 +158,7 @@ class ReplaceRuleActivity : VMBaseActivity<ActivityReplaceRuleBinding, ReplaceRu
         adapter.revertSelection()
     }
 
-    override fun onClickMainAction() {
+    override fun onClickSelectBarMainAction() {
         delSourceDialog()
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
index 5242e7e64..59bc10134 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
@@ -130,7 +130,6 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
         when (item?.itemId) {
             R.id.menu_enable_selection -> viewModel.enableSelection(adapter.selection)
             R.id.menu_disable_selection -> viewModel.disableSelection(adapter.selection)
-            R.id.menu_del_selection -> viewModel.delSelection(adapter.selection)
             R.id.menu_top_sel -> viewModel.topSource(*adapter.selection.toTypedArray())
             R.id.menu_bottom_sel -> viewModel.bottomSource(*adapter.selection.toTypedArray())
             R.id.menu_export_selection -> viewModel.saveToFile(adapter.selection) { file ->
@@ -211,13 +210,13 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
         adapter.revertSelection()
     }
 
-    override fun onClickMainAction() {
+    override fun onClickSelectBarMainAction() {
         delSourceDialog()
     }
 
     private fun delSourceDialog() {
         alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
-            okButton { viewModel.delSelection(adapter.selection) }
+            okButton { viewModel.del(*adapter.selection.toTypedArray()) }
             noButton()
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
index e80380762..b3bb3895f 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
@@ -31,8 +31,8 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun del(rssSource: RssSource) {
-        execute { appDb.rssSourceDao.delete(rssSource) }
+    fun del(vararg rssSource: RssSource) {
+        execute { appDb.rssSourceDao.delete(*rssSource) }
     }
 
     fun update(vararg rssSource: RssSource) {
@@ -69,12 +69,6 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun delSelection(sources: List<RssSource>) {
-        execute {
-            appDb.rssSourceDao.delete(*sources.toTypedArray())
-        }
-    }
-
     fun saveToFile(sources: List<RssSource>, success: (file: File) -> Unit) {
         execute {
             val path = "${context.filesDir}/shareRssSource.json"
diff --git a/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt
index 57b926137..c381b391f 100644
--- a/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt
@@ -42,7 +42,7 @@ class SelectActionBar @JvmOverloads constructor(
             }
         }
         binding.btnRevertSelection.setOnClickListener { callBack?.revertSelection() }
-        binding.btnSelectActionMain.setOnClickListener { callBack?.onClickMainAction() }
+        binding.btnSelectActionMain.setOnClickListener { callBack?.onClickSelectBarMainAction() }
         binding.ivMenuMore.setOnClickListener { selMenu?.show() }
     }
 
@@ -108,6 +108,6 @@ class SelectActionBar @JvmOverloads constructor(
 
         fun revertSelection()
 
-        fun onClickMainAction() {}
+        fun onClickSelectBarMainAction() {}
     }
 }
\ No newline at end of file