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 509be7ae3..ab667ffe2 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 @@ -94,7 +94,7 @@ class ImportBookSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickList item.title = getString(R.string.diy_edit_source_group_title, group) } } - noButton { } + noButton() }.show() } R.id.menu_select_all -> { diff --git a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt index c38810987..df4056854 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt @@ -84,9 +84,7 @@ class ImportReplaceRuleActivity : VMBaseActivity( okButton { App.db.replaceRuleDao().insert(*allSource.toTypedArray()) } - noButton { - - } + noButton() onDismiss { finish() } 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 b2f8a35f5..b3c53e5d5 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 @@ -94,7 +94,7 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe item.title = getString(R.string.diy_edit_source_group_title, group) } } - noButton { } + noButton() }.show() } R.id.menu_select_all -> { 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 1e2c4b0de..41288e054 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 @@ -146,7 +146,7 @@ class ArrangeBookActivity : VMBaseActivity(R.layout.activi R.id.menu_del_selection -> alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.deleteBook(*adapter.selectedBooks()) } - noButton { } + noButton() }.show() R.id.menu_update_enable -> viewModel.upCanUpdate(adapter.selectedBooks(), true) diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt index 80a5e77c1..99b8db65d 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt @@ -17,7 +17,7 @@ import io.legado.app.help.ReadBookConfig import io.legado.app.help.http.HttpHelper import io.legado.app.help.permission.Permissions import io.legado.app.help.permission.PermissionsCompat -import io.legado.app.lib.dialogs.* +import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.bottomBackground import io.legado.app.lib.theme.getPrimaryTextColor import io.legado.app.lib.theme.getSecondaryTextColor @@ -285,7 +285,7 @@ class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack { importNetConfig(url) } } - noButton { } + noButton() }.show() } 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 24e168cb9..a50a1712f 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 @@ -25,7 +25,7 @@ import io.legado.app.constant.AppPattern import io.legado.app.constant.EventBus import io.legado.app.data.entities.BookSource import io.legado.app.help.IntentDataHelp -import io.legado.app.lib.dialogs.* +import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryTextColor import io.legado.app.service.help.CheckSource @@ -260,7 +260,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity override fun onClickMainAction() { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } - noButton { } + noButton() }.show() } @@ -305,7 +305,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } CheckSource.start(this@BookSourceActivity, adapter.getSelection()) } - noButton { } + noButton() }.show() } @@ -326,7 +326,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } } - noButton { } + noButton() }.show() } @@ -347,7 +347,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } } - noButton { } + noButton() }.show() } diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt index 79db7cba2..045ddee39 100644 --- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt @@ -192,7 +192,7 @@ class ThemeConfigFragment : BasePreferenceFragment(), } } } - noButton { } + noButton() }.show() } diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt index 6e78ab6f4..3a8d7138f 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt @@ -185,7 +185,7 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b viewModel.addBookByUrl(it) } } - noButton { } + noButton() }.show() } 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 1f2dacf62..1507f163e 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 @@ -22,7 +22,7 @@ import io.legado.app.data.entities.ReplaceRule import io.legado.app.help.BookHelp import io.legado.app.help.IntentDataHelp import io.legado.app.help.coroutine.Coroutine -import io.legado.app.lib.dialogs.* +import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryTextColor import io.legado.app.ui.association.ImportReplaceRuleActivity @@ -134,7 +134,7 @@ class ReplaceRuleActivity : private fun delSourceDialog() { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } - noButton { } + noButton() }.show() } 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 4685ba125..98cebc35a 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 @@ -20,7 +20,7 @@ import io.legado.app.base.VMBaseActivity import io.legado.app.constant.AppPattern import io.legado.app.data.entities.RssSource import io.legado.app.help.IntentDataHelp -import io.legado.app.lib.dialogs.* +import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryTextColor import io.legado.app.ui.association.ImportRssSourceActivity @@ -180,7 +180,7 @@ class RssSourceActivity : VMBaseActivity(R.layout.activity_r private fun delSourceDialog() { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } - noButton { } + noButton() }.show() }