diff --git a/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt b/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt index a938b3584..3c640f384 100644 --- a/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AlertBuilder.kt @@ -1,19 +1,3 @@ -/* - * Copyright 2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - @file:Suppress("NOTHING_TO_INLINE", "unused") package io.legado.app.lib.dialogs diff --git a/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt b/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt index 9bfcab298..b03fe17f6 100644 --- a/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt +++ b/app/src/main/java/io/legado/app/lib/dialogs/AndroidAlertBuilder.kt @@ -1,19 +1,3 @@ -/* - * Copyright 2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package io.legado.app.lib.dialogs import android.content.Context @@ -22,12 +6,11 @@ import android.graphics.drawable.Drawable import android.view.KeyEvent import android.view.View import androidx.appcompat.app.AlertDialog +import io.legado.app.utils.applyTint import org.jetbrains.anko.internals.AnkoInternals import org.jetbrains.anko.internals.AnkoInternals.NO_GETTER import kotlin.DeprecationLevel.ERROR -val Android: AlertBuilderFactory = ::AndroidAlertBuilder - internal class AndroidAlertBuilder(override val ctx: Context) : AlertBuilder { private val builder = AlertDialog.Builder(ctx) @@ -136,5 +119,5 @@ internal class AndroidAlertBuilder(override val ctx: Context) : AlertBuilder( private fun errorDialog(msg: String) { alert(getString(R.string.error), msg) { okButton { } - }.show().applyTint().setOnDismissListener { + }.show().setOnDismissListener { 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 c33174f0c..4b36480e6 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 @@ -22,7 +22,6 @@ import io.legado.app.lib.dialogs.customView import io.legado.app.lib.dialogs.noButton import io.legado.app.lib.dialogs.okButton import io.legado.app.ui.widget.text.AutoCompleteTextView -import io.legado.app.utils.applyTint import io.legado.app.utils.getViewModelOfActivity import io.legado.app.utils.putPrefBoolean import io.legado.app.utils.visible @@ -99,7 +98,7 @@ class ImportBookSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickList } } noButton { } - }.show().applyTint() + }.show() } R.id.menu_select_all -> { viewModel.selectStatus.forEachIndexed { index, b -> 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 12ae447d1..a7683b010 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 @@ -10,7 +10,6 @@ import io.legado.app.help.IntentDataHelp import io.legado.app.lib.dialogs.alert import io.legado.app.lib.dialogs.noButton import io.legado.app.lib.dialogs.okButton -import io.legado.app.utils.applyTint import io.legado.app.utils.getViewModel import kotlinx.android.synthetic.main.activity_translucence.* import org.jetbrains.anko.toast @@ -76,7 +75,7 @@ class ImportReplaceRuleActivity : VMBaseActivity( private fun errorDialog(msg: String) { alert("导入出错", msg) { okButton { } - }.show().applyTint().setOnDismissListener { + }.show().setOnDismissListener { finish() } } @@ -89,7 +88,7 @@ class ImportReplaceRuleActivity : VMBaseActivity( noButton { } - }.show().applyTint().setOnDismissListener { + }.show().setOnDismissListener { finish() } } diff --git a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt index d69a4dad9..5e2c448d5 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt @@ -7,7 +7,6 @@ import io.legado.app.constant.Theme import io.legado.app.help.IntentDataHelp import io.legado.app.lib.dialogs.alert import io.legado.app.lib.dialogs.okButton -import io.legado.app.utils.applyTint import io.legado.app.utils.getViewModel import kotlinx.android.synthetic.main.activity_translucence.* import org.jetbrains.anko.toast @@ -73,7 +72,7 @@ class ImportRssSourceActivity : VMBaseActivity( private fun errorDialog(msg: String) { alert(getString(R.string.error), msg) { okButton { } - }.show().applyTint().setOnDismissListener { + }.show().setOnDismissListener { 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 493524ec7..0eaef40c6 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 @@ -22,7 +22,6 @@ import io.legado.app.lib.dialogs.customView import io.legado.app.lib.dialogs.noButton import io.legado.app.lib.dialogs.okButton import io.legado.app.ui.widget.text.AutoCompleteTextView -import io.legado.app.utils.applyTint import io.legado.app.utils.getViewModelOfActivity import io.legado.app.utils.putPrefBoolean import io.legado.app.utils.visible @@ -99,7 +98,7 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe } } noButton { } - }.show().applyTint() + }.show() } R.id.menu_select_all -> { viewModel.selectStatus.forEachIndexed { index, b -> diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt index 4e890ca35..4345dab8c 100644 --- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt +++ b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt @@ -150,14 +150,14 @@ class AudioPlayActivity : override fun finish() { AudioPlay.book?.let { if (!AudioPlay.inBookshelf) { - this.alert(title = getString(R.string.add_to_shelf)) { + alert(title = getString(R.string.add_to_shelf)) { message = getString(R.string.check_add_bookshelf, it.name) okButton { AudioPlay.inBookshelf = true setResult(Activity.RESULT_OK) } noButton { viewModel.removeFromBookshelf { super.finish() } } - }.show().applyTint() + }.show() } else { super.finish() } 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 a1f64b9a4..cf6e4ab2b 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 @@ -24,7 +24,6 @@ import io.legado.app.ui.widget.SelectActionBar import io.legado.app.ui.widget.recycler.DragSelectTouchHelper import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider -import io.legado.app.utils.applyTint import io.legado.app.utils.getPrefInt import io.legado.app.utils.getViewModel import kotlinx.android.synthetic.main.activity_arrange_book.* @@ -150,7 +149,7 @@ class ArrangeBookActivity : VMBaseActivity(R.layout.activi alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.deleteBook(*adapter.selectedBooks()) } noButton { } - }.show().applyTint() + }.show() R.id.menu_update_enable -> viewModel.upCanUpdate(adapter.selectedBooks(), true) R.id.menu_update_disable -> @@ -210,7 +209,7 @@ class ArrangeBookActivity : VMBaseActivity(R.layout.activi okButton { viewModel.deleteBook(book) } - }.show().applyTint() + }.show() } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt index 19d5c973e..3fa1e9f45 100644 --- a/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt @@ -114,7 +114,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -133,7 +133,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener viewModel.upGroup(bookGroup.copy(groupName = editText?.text?.toString() ?: "")) } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } private fun deleteGroup(bookGroup: BookGroup) { @@ -142,7 +142,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener viewModel.delGroup(bookGroup) } noButton() - }.show().applyTint() + }.show() } private class GroupDiffCallBack( diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt index ab9e9829a..7c498b129 100644 --- a/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt @@ -139,7 +139,7 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -158,7 +158,7 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener viewModel.upGroup(bookGroup.copy(groupName = editText?.text?.toString() ?: "")) } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } private inner class GroupAdapter(context: Context) : diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 91d6afb66..ea2e8b9a6 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -784,14 +784,14 @@ class ReadBookActivity : ReadBookBaseActivity(), override fun finish() { ReadBook.book?.let { if (!ReadBook.inBookshelf) { - this.alert(title = getString(R.string.add_to_shelf)) { + alert(title = getString(R.string.add_to_shelf)) { message = getString(R.string.check_add_bookshelf, it.name) okButton { ReadBook.inBookshelf = true setResult(Activity.RESULT_OK) } noButton { viewModel.removeFromBookshelf { super.finish() } } - }.show().applyTint() + }.show() } else { super.finish() } diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt index 702b8ce9e..dbfdc8807 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt @@ -33,7 +33,6 @@ import io.legado.app.ui.book.read.config.ClickActionConfigDialog import io.legado.app.ui.book.read.config.PaddingConfigDialog import io.legado.app.ui.book.source.edit.BookSourceEditActivity import io.legado.app.ui.widget.text.AutoCompleteTextView -import io.legado.app.utils.applyTint import io.legado.app.utils.getPrefString import io.legado.app.utils.getViewModel import io.legado.app.utils.requestInputMethod @@ -240,7 +239,7 @@ abstract class ReadBookBaseActivity : } } noButton() - }.show().applyTint() + }.show() } } @@ -274,7 +273,7 @@ abstract class ReadBookBaseActivity : } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -297,7 +296,7 @@ abstract class ReadBookBaseActivity : } } cancelButton() - }.show().applyTint() + }.show() } fun showPageAnimConfig(success: () -> Unit) { 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 7da612063..80a5e77c1 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 @@ -133,7 +133,7 @@ class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack { } } cancelButton() - }.show().applyTint() + }.show() } sw_dark_status_icon.onCheckedChange { buttonView, isChecked -> if (buttonView?.isPressed == true) { @@ -286,7 +286,7 @@ class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack { } } noButton { } - }.show().applyTint() + }.show() } private fun importNetConfig(url: String) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ChineseConverter.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ChineseConverter.kt index af8408284..dc8f36d67 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ChineseConverter.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ChineseConverter.kt @@ -10,7 +10,6 @@ import io.legado.app.help.AppConfig import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.accentColor import io.legado.app.ui.widget.text.StrokeTextView -import io.legado.app.utils.applyTint import org.jetbrains.anko.sdk27.listeners.onClick class ChineseConverter(context: Context, attrs: AttributeSet?) : StrokeTextView(context, attrs) { @@ -45,7 +44,7 @@ class ChineseConverter(context: Context, attrs: AttributeSet?) : StrokeTextView( upUi(i) onChanged?.invoke() } - }.show().applyTint() + }.show() } fun onChanged(unit: () -> Unit) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt index 62d629a5f..7184c9384 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt @@ -192,7 +192,7 @@ class ReadStyleDialog : BaseDialogFragment(), FontSelectDialog.CallBack { } } customView = rootView - }.show().applyTint() + }.show() } private fun changeBg(index: Int) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt index a0fc51d4e..37ffd26cc 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt @@ -131,7 +131,7 @@ class SpeakEngineDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener ) TextDialog.show(childFragmentManager, helpStr, TextDialog.MD) } - }.show().applyTint() + }.show() } inner class Adapter(context: Context) : diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/TextFontWeightConverter.kt b/app/src/main/java/io/legado/app/ui/book/read/config/TextFontWeightConverter.kt index fbff59f3e..ae240846d 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/TextFontWeightConverter.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/TextFontWeightConverter.kt @@ -10,7 +10,6 @@ import io.legado.app.help.ReadBookConfig import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.accentColor import io.legado.app.ui.widget.text.StrokeTextView -import io.legado.app.utils.applyTint import org.jetbrains.anko.sdk27.listeners.onClick class TextFontWeightConverter(context: Context, attrs: AttributeSet?) : StrokeTextView(context, attrs) { @@ -46,7 +45,7 @@ class TextFontWeightConverter(context: Context, attrs: AttributeSet?) : StrokeTe upUi(i) onChanged?.invoke() } - }.show().applyTint() + }.show() } fun onChanged(unit: () -> Unit) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt index fb2055729..a5229e036 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt @@ -167,7 +167,7 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { } } cancelButton() - }.show().applyTint() + }.show() } @SuppressLint("InflateParams") @@ -191,7 +191,7 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { } } cancelButton() - }.show().applyTint() + }.show() } inner class TocRegexAdapter(context: Context) : diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 62f902e2f..74d399d14 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -142,7 +142,7 @@ class BookSourceEditActivity : negativeButton(R.string.no) { super.finish() } - }.show().applyTint() + }.show() } else { super.finish() } 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 852f1ccf2..24e168cb9 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 @@ -261,7 +261,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } noButton { } - }.show().applyTint() + }.show() } private fun initSelectActionBar() { @@ -306,7 +306,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity CheckSource.start(this@BookSourceActivity, adapter.getSelection()) } noButton { } - }.show().applyTint() + }.show() } @SuppressLint("InflateParams") @@ -327,7 +327,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } noButton { } - }.show().applyTint() + }.show() } @SuppressLint("InflateParams") @@ -348,7 +348,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } noButton { } - }.show().applyTint() + }.show() } private fun upGroupMenu() { @@ -389,7 +389,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } cancelButton() - }.show().applyTint() + }.show() } override fun observeLiveBus() { diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt index 74777b264..08448ae82 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt @@ -99,7 +99,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener { } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -118,7 +118,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener { viewModel.upGroup(group, editText?.text?.toString()) } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } private inner class GroupAdapter(context: Context) : diff --git a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt index 3b5682f5e..d5644608f 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt @@ -20,7 +20,6 @@ import io.legado.app.lib.dialogs.noButton import io.legado.app.lib.dialogs.yesButton import io.legado.app.lib.theme.ATH import io.legado.app.ui.widget.recycler.VerticalDivider -import io.legado.app.utils.applyTint import io.legado.app.utils.getViewModelOfActivity import io.legado.app.utils.requestInputMethod import kotlinx.android.synthetic.main.dialog_edit_text.view.* @@ -109,7 +108,7 @@ class BookmarkFragment : VMBaseFragment(R.layout.fragment_ neutralButton(R.string.delete) { App.db.bookmarkDao().delete(bookmark) } - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index a3815d297..bc5257cef 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -153,11 +153,9 @@ class BackupConfigFragment : BasePreferenceFragment(), multiChoiceItems(Restore.ignoreTitle, checkedItems) { _, which, isChecked -> Restore.ignoreConfig[Restore.ignoreKeys[which]] = isChecked } - }.show() - .applyTint() - .setOnDismissListener { - Restore.saveIgnoreConfig() - } + }.show().setOnDismissListener { + Restore.saveIgnoreConfig() + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt index 1a30c9267..8b59a59a6 100644 --- a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt @@ -149,15 +149,17 @@ class OtherConfigFragment : BasePreferenceFragment(), } private fun clearCache() { - requireContext().alert(titleResource = R.string.clear_cache, - messageResource = R.string.sure_del) { + requireContext().alert( + titleResource = R.string.clear_cache, + messageResource = R.string.sure_del + ) { okButton { BookHelp.clearCache() FileUtils.deleteFile(requireActivity().cacheDir.absolutePath) toast(R.string.clear_cache_success) } noButton() - }.show().applyTint() + }.show() } private fun selectDefaultCover() { 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 31ddeae8b..4964766fa 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 @@ -196,7 +196,7 @@ class ThemeConfigFragment : BasePreferenceFragment(), } } noButton { } - }.show().applyTint() + }.show() } private fun upTheme(isNightTheme: Boolean) { 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 60a5486f7..8afdd8887 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 @@ -88,7 +88,7 @@ class ThemeListDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { initData() } noButton() - }.show().applyTint() + }.show() } fun share(index: Int) { diff --git a/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt b/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt index d84706d0c..ada36f5ff 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt +++ b/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt @@ -9,7 +9,6 @@ import io.legado.app.base.BaseActivity import io.legado.app.help.permission.Permissions import io.legado.app.help.permission.PermissionsCompat import io.legado.app.lib.dialogs.alert -import io.legado.app.utils.applyTint @Suppress("unused") object FilePicker { @@ -62,7 +61,7 @@ object FilePicker { } } } - }.show().applyTint() + }.show() } fun selectFolder( @@ -113,7 +112,7 @@ object FilePicker { } } } - }.show().applyTint() + }.show() } fun selectFile( @@ -171,7 +170,7 @@ object FilePicker { } } } - }.show().applyTint() + }.show() } fun selectFile( @@ -229,7 +228,7 @@ object FilePicker { } } } - }.show().applyTint() + }.show() } private fun createSelectFileIntent(): Intent { 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 e1b37f31e..1b97a04d8 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 @@ -171,7 +171,7 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b } } noButton() - }.show().applyTint() + }.show() } @SuppressLint("InflateParams") @@ -187,9 +187,9 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b editText?.text?.toString()?.let { viewModel.addBookByUrl(it) } - } - noButton { } - }.show().applyTint() + } + noButton { } + }.show() } override fun onTabReselected(tab: TabLayout.Tab) { diff --git a/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt index 53e5d96a0..8bcd481d8 100644 --- a/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt @@ -99,7 +99,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener { } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -118,7 +118,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener { viewModel.upGroup(group, editText?.text?.toString()) } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } private inner class GroupAdapter(context: Context) : 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 e81b2dd4e..1f2dacf62 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 @@ -135,8 +135,7 @@ class ReplaceRuleActivity : alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } noButton { } - } - .show().applyTint() + }.show() } private fun observeReplaceRuleData(key: String? = null) { @@ -233,7 +232,7 @@ class ReplaceRuleActivity : } } cancelButton() - }.show().applyTint() + }.show() } override fun onQueryTextChange(newText: String?): Boolean { diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index a7cff6603..94396919d 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -57,7 +57,7 @@ class RssSourceEditActivity : negativeButton(R.string.no) { super.finish() } - }.show().applyTint() + }.show() } else { super.finish() } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt index 0aeafc5f1..2de36474b 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt @@ -96,7 +96,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener } } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } @SuppressLint("InflateParams") @@ -115,7 +115,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener viewModel.upGroup(group, editText?.text?.toString()) } noButton() - }.show().applyTint().requestInputMethod() + }.show().requestInputMethod() } private inner class GroupAdapter(context: Context) : 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 72241a105..4685ba125 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 @@ -181,8 +181,7 @@ class RssSourceActivity : VMBaseActivity(R.layout.activity_r alert(titleResource = R.string.draw, messageResource = R.string.sure_del) { okButton { viewModel.delSelection(adapter.getSelection()) } noButton { } - } - .show().applyTint() + }.show() } private fun upGroupMenu() { @@ -243,7 +242,7 @@ class RssSourceActivity : VMBaseActivity(R.layout.activity_r } } cancelButton() - }.show().applyTint() + }.show() } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {