diff --git a/app/src/main/assets/web/help/md/replaceRuleHelp.md b/app/src/main/assets/web/help/md/replaceRuleHelp.md index 2573e54e6..063c8d3a3 100644 --- a/app/src/main/assets/web/help/md/replaceRuleHelp.md +++ b/app/src/main/assets/web/help/md/replaceRuleHelp.md @@ -3,9 +3,4 @@ * 替换规则是用来替换正文内容的一种规则 * 菜单可以新建和导入规则 * 可以拖动排序 - * 可以选择操作 -* 替换规则右上角标志 - * 绿点表示本书启用且生效的作用于正文规则 - * 红点表示本书启用的作用于正文规则 - * 没有标志表示本书不启用的作用于正文规则 - * 本书没有启用替换净化、不是从阅读界面打开的替换净化不显示标志 + * 可以选择操作 \ No newline at end of file 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 b92b006d2..1f1b89eb4 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 @@ -1165,11 +1165,7 @@ class ReadBookActivity : BaseReadBookActivity(), * 替换 */ override fun openReplaceRule() { - val intent = Intent(this, ReplaceRuleActivity::class.java).apply { - val showApplied = ReadBook.book?.getUseReplaceRule() == true - putExtra("showApplied", showApplied) - } - replaceActivity.launch(intent) + replaceActivity.launch(Intent(this, ReplaceRuleActivity::class.java)) } /** 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 826fd3854..6a7692fed 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 @@ -1,6 +1,7 @@ package io.legado.app.ui.replace import android.annotation.SuppressLint +import android.app.Activity import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -121,10 +122,8 @@ class ReplaceRuleActivity : VMBaseActivity { appDb.replaceRuleDao.flowSearch("%$searchKey%") } @@ -224,7 +222,7 @@ class ReplaceRuleActivity : VMBaseActivity editActivity.launch(ReplaceEditActivity.startIntent(this)) - R.id.menu_group_manage -> showDialogFragment() R.id.menu_del_selection -> viewModel.delSelection(adapter.selection) R.id.menu_import_onLine -> showImportDialog() @@ -255,13 +252,11 @@ class ReplaceRuleActivity : VMBaseActivity qrCodeResult.launch() R.id.menu_help -> showHelp("replaceRuleHelp") R.id.menu_group_null -> { searchView.setQuery(getString(R.string.no_group), true) } - else -> if (item.groupId == R.id.replace_group) { searchView.setQuery("group:${item.title}", true) } @@ -348,14 +343,6 @@ class ReplaceRuleActivity : VMBaseActivity() - var appliedForBookRules = emptySet() - - fun initData(intent: Intent, block: () -> Unit) { - execute { - showApplied = intent.getBooleanExtra("showApplied", false) - if (showApplied) { - val book = ReadBook.book ?: return@execute - val textChapter = ReadBook.curTextChapter ?: return@execute - enabledForBookRules = ContentProcessor.get(book).getContentReplaceRules().toSet() - textChapter.effectiveReplaceRules?.let { - appliedForBookRules = it.toSet() - } - } - }.onFinally { - block.invoke() - } - } - - fun isEnabledForBook(rule: ReplaceRule): Boolean { - return showApplied && enabledForBookRules.contains(rule) - } - - fun isAppliedForBook(rule: ReplaceRule): Boolean { - return showApplied && appliedForBookRules.contains(rule) - } - fun update(vararg rule: ReplaceRule) { execute { appDb.replaceRuleDao.update(*rule) diff --git a/app/src/main/res/layout/item_replace_rule.xml b/app/src/main/res/layout/item_replace_rule.xml index e214ca201..7043560f3 100644 --- a/app/src/main/res/layout/item_replace_rule.xml +++ b/app/src/main/res/layout/item_replace_rule.xml @@ -62,16 +62,4 @@ app:layout_constraintTop_toTopOf="parent" tools:ignore="RtlHardcoded" /> - -