diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt index a5de2baac..42104094e 100644 --- a/app/src/main/java/io/legado/app/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -162,14 +162,6 @@ data class Book( config().reSegment = reSegment } - fun getLimitContentLength(): Boolean { - return config().limitContentLength - } - - fun setLimitContentLength(limitContentLength: Boolean) { - config().limitContentLength = limitContentLength - } - fun getPageAnim(): Int { var pageAnim = config().pageAnim ?: ReadBookConfig.pageAnim if (pageAnim < 0) { @@ -292,7 +284,6 @@ data class Book( var reverseToc: Boolean = false, var pageAnim: Int? = null, var reSegment: Boolean = false, - var limitContentLength: Boolean = true, //txt规则解析目录时超过规定的最大字数时均分txt var imageStyle: String? = null, var useReplaceRule: Boolean? = null,// 正文使用净化替换规则 var delTag: Long = 0L,//去除标签 diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 3b6bf793e..9c32c9cb7 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -119,8 +119,6 @@ class BookInfoActivity : override fun onMenuOpened(featureId: Int, menu: Menu): Boolean { menu.findItem(R.id.menu_can_update)?.isChecked = viewModel.bookData.value?.canUpdate ?: true - menu.findItem(R.id.menu_limit_content_length)?.isChecked = - viewModel.bookData.value?.getLimitContentLength() ?: false menu.findItem(R.id.menu_login)?.isVisible = !viewModel.bookSource?.loginUrl.isNullOrBlank() menu.findItem(R.id.menu_set_source_variable)?.isVisible = @@ -129,8 +127,6 @@ class BookInfoActivity : viewModel.bookSource != null menu.findItem(R.id.menu_can_update)?.isVisible = viewModel.bookSource != null - menu.findItem(R.id.menu_limit_content_length)?.isVisible = - viewModel.bookData.value?.isLocalTxt() ?: false return super.onMenuOpened(featureId, menu) } @@ -190,16 +186,6 @@ class BookInfoActivity : } R.id.menu_clear_cache -> viewModel.clearCache() R.id.menu_log -> showDialogFragment() - R.id.menu_limit_content_length -> { - upLoading(true) - tocChanged = true - viewModel.bookData.value?.let { - it.setLimitContentLength(!item.isChecked) - viewModel.loadBookInfo(it, false) - } - item.isChecked = !item.isChecked - if (!item.isChecked) longToastOnUi(R.string.need_more_time_load_content) - } } return super.onCompatOptionsItemSelected(item) } 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 78c157280..9fd994bde 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 @@ -24,7 +24,6 @@ import io.legado.app.databinding.ItemTocRegexBinding import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.backgroundColor import io.legado.app.lib.theme.primaryColor -import io.legado.app.model.ReadBook import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.* @@ -59,8 +58,6 @@ class TocRegexDialog() : BaseDialogFragment(R.layout.dialog_toc_regex), binding.toolBar.setTitle(R.string.txt_toc_regex) binding.toolBar.inflateMenu(R.menu.txt_toc_regex) binding.toolBar.menu.applyTint(requireContext()) - binding.toolBar.menu.findItem(R.id.menu_limit_content_length) - ?.isChecked = ReadBook.book?.getLimitContentLength() == true binding.toolBar.setOnMenuItemClickListener(this) initView() initData() @@ -115,11 +112,6 @@ class TocRegexDialog() : BaseDialogFragment(R.layout.dialog_toc_regex), R.id.menu_add -> editRule() R.id.menu_default -> viewModel.importDefault() R.id.menu_import -> showImportDialog() - R.id.menu_limit_content_length -> { - ReadBook.book?.setLimitContentLength(!item.isChecked) - item.isChecked = !item.isChecked - if (!item.isChecked) context?.longToastOnUi(R.string.need_more_time_load_content) - } } return false } diff --git a/app/src/main/res/menu/book_info.xml b/app/src/main/res/menu/book_info.xml index d324786f8..99b8c39ca 100644 --- a/app/src/main/res/menu/book_info.xml +++ b/app/src/main/res/menu/book_info.xml @@ -55,12 +55,6 @@ android:checkable="true" app:showAsAction="never" /> - - - - \ No newline at end of file