pull/475/head
gedoor 5 years ago
parent 784f18dec5
commit d765ae0198
  1. 2
      app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
  2. 4
      app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt
  3. 2
      app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt
  4. 2
      app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
  5. 4
      app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
  6. 10
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
  7. 2
      app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
  8. 2
      app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
  9. 4
      app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt
  10. 4
      app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@ -94,7 +94,7 @@ class ImportBookSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickList
item.title = getString(R.string.diy_edit_source_group_title, group) item.title = getString(R.string.diy_edit_source_group_title, group)
} }
} }
noButton { } noButton()
}.show() }.show()
} }
R.id.menu_select_all -> { R.id.menu_select_all -> {

@ -84,9 +84,7 @@ class ImportReplaceRuleActivity : VMBaseActivity<ImportReplaceRuleViewModel>(
okButton { okButton {
App.db.replaceRuleDao().insert(*allSource.toTypedArray()) App.db.replaceRuleDao().insert(*allSource.toTypedArray())
} }
noButton { noButton()
}
onDismiss { onDismiss {
finish() finish()
} }

@ -94,7 +94,7 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe
item.title = getString(R.string.diy_edit_source_group_title, group) item.title = getString(R.string.diy_edit_source_group_title, group)
} }
} }
noButton { } noButton()
}.show() }.show()
} }
R.id.menu_select_all -> { R.id.menu_select_all -> {

@ -146,7 +146,7 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
R.id.menu_del_selection -> R.id.menu_del_selection ->
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
okButton { viewModel.deleteBook(*adapter.selectedBooks()) } okButton { viewModel.deleteBook(*adapter.selectedBooks()) }
noButton { } noButton()
}.show() }.show()
R.id.menu_update_enable -> R.id.menu_update_enable ->
viewModel.upCanUpdate(adapter.selectedBooks(), true) viewModel.upCanUpdate(adapter.selectedBooks(), true)

@ -17,7 +17,7 @@ import io.legado.app.help.ReadBookConfig
import io.legado.app.help.http.HttpHelper import io.legado.app.help.http.HttpHelper
import io.legado.app.help.permission.Permissions import io.legado.app.help.permission.Permissions
import io.legado.app.help.permission.PermissionsCompat 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.bottomBackground
import io.legado.app.lib.theme.getPrimaryTextColor import io.legado.app.lib.theme.getPrimaryTextColor
import io.legado.app.lib.theme.getSecondaryTextColor import io.legado.app.lib.theme.getSecondaryTextColor
@ -285,7 +285,7 @@ class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack {
importNetConfig(url) importNetConfig(url)
} }
} }
noButton { } noButton()
}.show() }.show()
} }

@ -25,7 +25,7 @@ import io.legado.app.constant.AppPattern
import io.legado.app.constant.EventBus import io.legado.app.constant.EventBus
import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.BookSource
import io.legado.app.help.IntentDataHelp 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.ATH
import io.legado.app.lib.theme.primaryTextColor import io.legado.app.lib.theme.primaryTextColor
import io.legado.app.service.help.CheckSource import io.legado.app.service.help.CheckSource
@ -260,7 +260,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
override fun onClickMainAction() { override fun onClickMainAction() {
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
okButton { viewModel.delSelection(adapter.getSelection()) } okButton { viewModel.delSelection(adapter.getSelection()) }
noButton { } noButton()
}.show() }.show()
} }
@ -305,7 +305,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
} }
CheckSource.start(this@BookSourceActivity, adapter.getSelection()) CheckSource.start(this@BookSourceActivity, adapter.getSelection())
} }
noButton { } noButton()
}.show() }.show()
} }
@ -326,7 +326,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
} }
} }
} }
noButton { } noButton()
}.show() }.show()
} }
@ -347,7 +347,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
} }
} }
} }
noButton { } noButton()
}.show() }.show()
} }

@ -192,7 +192,7 @@ class ThemeConfigFragment : BasePreferenceFragment(),
} }
} }
} }
noButton { } noButton()
}.show() }.show()
} }

@ -185,7 +185,7 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
viewModel.addBookByUrl(it) viewModel.addBookByUrl(it)
} }
} }
noButton { } noButton()
}.show() }.show()
} }

@ -22,7 +22,7 @@ import io.legado.app.data.entities.ReplaceRule
import io.legado.app.help.BookHelp import io.legado.app.help.BookHelp
import io.legado.app.help.IntentDataHelp import io.legado.app.help.IntentDataHelp
import io.legado.app.help.coroutine.Coroutine 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.ATH
import io.legado.app.lib.theme.primaryTextColor import io.legado.app.lib.theme.primaryTextColor
import io.legado.app.ui.association.ImportReplaceRuleActivity import io.legado.app.ui.association.ImportReplaceRuleActivity
@ -134,7 +134,7 @@ class ReplaceRuleActivity :
private fun delSourceDialog() { private fun delSourceDialog() {
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
okButton { viewModel.delSelection(adapter.getSelection()) } okButton { viewModel.delSelection(adapter.getSelection()) }
noButton { } noButton()
}.show() }.show()
} }

@ -20,7 +20,7 @@ import io.legado.app.base.VMBaseActivity
import io.legado.app.constant.AppPattern import io.legado.app.constant.AppPattern
import io.legado.app.data.entities.RssSource import io.legado.app.data.entities.RssSource
import io.legado.app.help.IntentDataHelp 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.ATH
import io.legado.app.lib.theme.primaryTextColor import io.legado.app.lib.theme.primaryTextColor
import io.legado.app.ui.association.ImportRssSourceActivity import io.legado.app.ui.association.ImportRssSourceActivity
@ -180,7 +180,7 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
private fun delSourceDialog() { private fun delSourceDialog() {
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
okButton { viewModel.delSelection(adapter.getSelection()) } okButton { viewModel.delSelection(adapter.getSelection()) }
noButton { } noButton()
}.show() }.show()
} }

Loading…
Cancel
Save