diff --git a/app/src/main/java/io/legado/app/help/book/BookExtensions.kt b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt index cf3c3ae1e..d8d0a9901 100644 --- a/app/src/main/java/io/legado/app/help/book/BookExtensions.kt +++ b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt @@ -340,7 +340,7 @@ fun Book.getExportFileName(suffix: String): String { lastEnd = match.range.last + 1 } - + if (lastEnd < template.length) { result.append(template.substring(lastEnd)) } diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt index 45f7c996f..da6bbd86c 100644 --- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt @@ -141,7 +141,7 @@ class CacheActivity : VMBaseActivity() } override fun onMenuOpened(featureId: Int, menu: Menu): Boolean { - menu.findItem(R.id.menu_enable_replace)?.isChecked = AppConfig.exportUseReplace + menu.findItem(R.id.menu_enable_replace)?.setIcon(if (AppConfig.exportUseReplace) R.drawable.ic_cfg_replace_enable else R.drawable.ic_find_replace) // 菜单打开时读取状态[enableCustomExport] menu.findItem(R.id.menu_enable_custom_export)?.isChecked = AppConfig.enableCustomExport menu.findItem(R.id.menu_export_no_chapter_name)?.isChecked = AppConfig.exportNoChapterName @@ -193,7 +193,16 @@ class CacheActivity : VMBaseActivity() } R.id.menu_export_all -> exportAll() - R.id.menu_enable_replace -> AppConfig.exportUseReplace = !item.isChecked + R.id.menu_enable_replace -> { + AppConfig.exportUseReplace = !AppConfig.exportUseReplace + item.setIcon(if (AppConfig.exportUseReplace) R.drawable.ic_cfg_replace_enable else R.drawable.ic_find_replace) + val message = if (AppConfig.exportUseReplace) { + "替换净化功能已开启" + } else { + "替换净化功能已关闭" + } + toastOnUi(message) + } // 更改菜单状态[enableCustomExport] R.id.menu_enable_custom_export -> AppConfig.enableCustomExport = !item.isChecked R.id.menu_export_no_chapter_name -> AppConfig.exportNoChapterName = !item.isChecked diff --git a/app/src/main/res/drawable/ic_cfg_replace_enable.xml b/app/src/main/res/drawable/ic_cfg_replace_enable.xml new file mode 100644 index 000000000..9aab07418 --- /dev/null +++ b/app/src/main/res/drawable/ic_cfg_replace_enable.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/menu/book_cache.xml b/app/src/main/res/menu/book_cache.xml index 1eae49aba..a5e04f79f 100644 --- a/app/src/main/res/menu/book_cache.xml +++ b/app/src/main/res/menu/book_cache.xml @@ -27,9 +27,9 @@ + android:icon="@drawable/ic_find_replace" + app:showAsAction="always" />