From ea7fa4d3b347a02a95fd6da475cca727522414bf Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 9 Oct 2022 20:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/constant/PreferKey.kt | 1 + .../java/io/legado/app/help/config/AppConfig.kt | 16 ++++++++++++++-- .../ui/book/source/edit/BookSourceEditAdapter.kt | 7 ++++++- .../legado/app/ui/config/OtherConfigFragment.kt | 15 ++++++++++++++- .../ui/rss/source/edit/RssSourceEditAdapter.kt | 7 ++++++- app/src/main/res/layout/item_source_edit.xml | 3 +-- app/src/main/res/values-es-rES/strings.xml | 3 ++- app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_config_other.xml | 4 ++++ 14 files changed, 54 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index de97e0f18..a74c37bfa 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -115,6 +115,7 @@ object PreferKey { const val ignoreAudioFocus = "ignoreAudioFocus" const val parallelExportBook = "parallelExportBook" const val progressBarBehavior = "progressBarBehavior" + const val sourceEditMaxLine = "sourceEditMaxLine" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index f384fdd35..7f71d72ab 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -368,15 +368,27 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { appCtx.putPrefInt(PreferKey.bitmapCacheSize, value) } - var showReadTitleBarAddition : Boolean + var showReadTitleBarAddition: Boolean get() = appCtx.getPrefBoolean(PreferKey.showReadTitleAddition, true) set(value) { appCtx.putPrefBoolean(PreferKey.showReadTitleAddition, value) } - var readBarStyleFollowPage : Boolean + var readBarStyleFollowPage: Boolean get() = appCtx.getPrefBoolean(PreferKey.readBarStyleFollowPage, false) set(value) { appCtx.putPrefBoolean(PreferKey.readBarStyleFollowPage, value) } + + var sourceEditMaxLine: Int + get() { + val maxLine = appCtx.getPrefInt(PreferKey.sourceEditMaxLine, Int.MAX_VALUE) + if (maxLine < 10) { + return 99 + } + return maxLine + } + set(value) { + appCtx.putPrefInt(PreferKey.sourceEditMaxLine, value) + } } diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt index 0b2c7114b..15f780961 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditAdapter.kt @@ -9,12 +9,15 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import io.legado.app.R import io.legado.app.databinding.ItemSourceEditBinding +import io.legado.app.help.config.AppConfig import io.legado.app.ui.widget.code.addJsPattern import io.legado.app.ui.widget.code.addJsonPattern import io.legado.app.ui.widget.code.addLegadoPattern class BookSourceEditAdapter : RecyclerView.Adapter() { + val editEntityMaxLine = AppConfig.sourceEditMaxLine + var editEntities: ArrayList = ArrayList() @SuppressLint("NotifyDataSetChanged") set(value) { @@ -39,10 +42,12 @@ class BookSourceEditAdapter : RecyclerView.Adapter { + NumberPickerDialog(requireContext()) + .setTitle(getString(R.string.source_edit_text_max_line)) + .setMaxValue(99) + .setMinValue(10) + .setValue(AppConfig.sourceEditMaxLine) + .show { + AppConfig.sourceEditMaxLine = it + } + } } return super.onPreferenceTreeClick(preference) } @@ -160,6 +170,9 @@ class OtherConfigFragment : PreferenceFragment(), PreferKey.bitmapCacheSize -> { upPreferenceSummary(key, AppConfig.bitmapCacheSize.toString()) } + PreferKey.sourceEditMaxLine -> { + upPreferenceSummary(key, AppConfig.sourceEditMaxLine.toString()) + } } } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt index 4470421ba..a1f053bd8 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt @@ -9,12 +9,15 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import io.legado.app.R import io.legado.app.databinding.ItemSourceEditBinding +import io.legado.app.help.config.AppConfig import io.legado.app.ui.widget.code.addJsPattern import io.legado.app.ui.widget.code.addJsonPattern import io.legado.app.ui.widget.code.addLegadoPattern class RssSourceEditAdapter : RecyclerView.Adapter() { + val editEntityMaxLine = AppConfig.sourceEditMaxLine + var editEntities: ArrayList = ArrayList() @SuppressLint("NotifyDataSetChanged") set(value) { @@ -39,9 +42,11 @@ class RssSourceEditAdapter : RecyclerView.Adapter + android:inputType="textMultiLine" /> \ No newline at end of file diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 55004a263..a76b40e61 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1023,7 +1023,7 @@ 删除段评URL(deleteUrl) 标志:发现已启用 标志:发现已禁用 - show read title addition area + show read title addition área read bar style follow page Decode Image(imageDecode) @@ -1037,4 +1037,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 448507a49..e790fa5ba 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1040,4 +1040,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e2316f37c..e8ca2756b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1040,4 +1040,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a8cb317f0..0c8c45318 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1037,4 +1037,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index bac10fc7f..7a7267b39 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1039,4 +1039,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 7a706bbc2..7cfdc2463 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1039,4 +1039,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d2d888ec..cd110f332 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1040,4 +1040,5 @@ 本地未分组 多线程导出TXT 进度条行为 + 源编辑框最大行数 diff --git a/app/src/main/res/xml/pref_config_other.xml b/app/src/main/res/xml/pref_config_other.xml index 02aba8f9a..73e3a0113 100644 --- a/app/src/main/res/xml/pref_config_other.xml +++ b/app/src/main/res/xml/pref_config_other.xml @@ -61,6 +61,10 @@ android:summary="@string/book_tree_uri_s" android:title="@string/book_tree_uri_t" /> + +