From 69c32bb6ff667f40a20b76f619940f1fec7b0cd7 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 21 May 2022 20:06:08 +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

---
 .../main/java/io/legado/app/ui/about/ReadRecordActivity.kt    | 4 ++--
 .../io/legado/app/ui/association/FileAssociationActivity.kt   | 4 ++--
 .../io/legado/app/ui/association/ImportBookSourceDialog.kt    | 2 +-
 .../io/legado/app/ui/association/ImportRssSourceDialog.kt     | 2 +-
 .../app/ui/book/changesource/ChangeChapterSourceDialog.kt     | 4 ++--
 .../main/java/io/legado/app/ui/book/group/GroupEditDialog.kt  | 2 +-
 .../main/java/io/legado/app/ui/book/search/SearchActivity.kt  | 4 ++--
 app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt  | 2 +-
 .../io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt  | 3 +--
 .../io/legado/app/ui/rss/source/manage/RssSourceActivity.kt   | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt
index a2c84b0db..9a4c6433a 100644
--- a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt
@@ -68,7 +68,7 @@ class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() {
         recyclerView.adapter = adapter
         readRecord.tvRemove.setOnClickListener {
             alert(R.string.delete, R.string.sure_del) {
-                okButton {
+                yesButton {
                     appDb.readRecordDao.clear()
                     initData()
                 }
@@ -144,7 +144,7 @@ class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() {
         private fun sureDelAlert(item: ReadRecordShow) {
             alert(R.string.delete) {
                 setMessage(getString(R.string.sure_del_any, item.bookName))
-                okButton {
+                yesButton {
                     appDb.readRecordDao.deleteByName(item.bookName)
                     initData()
                 }
diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
index 3c9edac98..d8bf85a1f 100644
--- a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
@@ -94,10 +94,10 @@ class FileAssociationActivity :
                 title = appCtx.getString(R.string.draw),
                 message = appCtx.getString(R.string.file_not_supported, data.second)
             ) {
-                okButton {
+                yesButton {
                     importBook(data.first)
                 }
-                cancelButton {
+                noButton {
                     finish()
                 }
             }
diff --git a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
index a6aacbfd3..3b463ab2d 100644
--- a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
@@ -183,7 +183,7 @@ class ImportBookSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie
                     }
                 }
             }
-            noButton()
+            cancelButton()
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt
index 830f0941d..a664f142c 100644
--- a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt
@@ -182,7 +182,7 @@ class ImportRssSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_view
                     }
                 }
             }
-            noButton()
+            cancelButton()
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
index fef913c26..aeafb27ba 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
@@ -79,8 +79,8 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
                 launch {
                     alert("搜索结果为空") {
                         setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
-                        cancelButton()
-                        okButton {
+                        noButton()
+                        yesButton {
                             AppConfig.searchGroup = ""
                             viewModel.startSearch()
                         }
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
index 4ce3075c1..a187f7a6f 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
@@ -93,7 +93,7 @@ class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
 
     private fun deleteGroup(ok: () -> Unit) {
         alert(R.string.delete, R.string.sure_del) {
-            okButton {
+            yesButton {
                 ok.invoke()
             }
             noButton()
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index bb6463608..58fdccdef 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -72,8 +72,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 launch {
                     alert("搜索结果为空") {
                         setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
-                        cancelButton()
-                        okButton {
+                        noButton()
+                        yesButton {
                             AppConfig.searchGroup = ""
                             viewModel.searchKey = ""
                             viewModel.search(searchView.query.toString())
diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
index e5322cdaa..c6817338f 100644
--- a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt
@@ -72,7 +72,7 @@ class ThemeListDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
 
     fun delete(index: Int) {
         alert(R.string.delete, R.string.sure_del) {
-            okButton {
+            yesButton {
                 ThemeConfig.delConfig(index)
                 initData()
             }
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 1d1ca0b51..85f19c0e5 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -1,7 +1,6 @@
 package io.legado.app.ui.main.bookshelf
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
 import androidx.fragment.app.activityViewModels
@@ -166,7 +165,7 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
                     }
                 }
             }
-            noButton()
+            cancelButton()
         }
     }
 
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 071efd119..4129513d5 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
@@ -219,7 +219,7 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
 
     private fun delSourceDialog() {
         alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
-            okButton { viewModel.del(*adapter.selection.toTypedArray()) }
+            yesButton { viewModel.del(*adapter.selection.toTypedArray()) }
             noButton()
         }
     }