From a6ab1e18c228471890d8aa97c071e68ab0de8394 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 13 Jun 2023 22:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B7=BB=E5=8A=A0=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E9=80=89=E9=A1=B9,=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/help/DirectLinkUpload.kt | 7 ++++--- .../legado/app/ui/config/DirectLinkUploadConfig.kt | 12 ++++++++++-- .../res/layout/dialog_direct_link_upload_config.xml | 7 +++++++ app/src/main/res/values-es-rES/strings.xml | 1 + 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 + 10 files changed, 28 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt index 18e317d2c..9047b104d 100644 --- a/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt +++ b/app/src/main/java/io/legado/app/help/DirectLinkUpload.kt @@ -68,9 +68,10 @@ object DirectLinkUpload { @Keep data class Rule( - var uploadUrl: String, - var downloadUrlRule: String, - var summary: String + var uploadUrl: String, //上传url + var downloadUrlRule: String, //下载链接规则 + var summary: String, //注释 + var compress: Boolean = true, //是否压缩 ) { override fun toString(): String { diff --git a/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt b/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt index 1e78a49f0..d6f01b751 100644 --- a/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt +++ b/app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt @@ -11,7 +11,13 @@ import io.legado.app.databinding.DialogDirectLinkUploadConfigBinding import io.legado.app.help.DirectLinkUpload import io.legado.app.lib.dialogs.selector import io.legado.app.lib.theme.primaryColor -import io.legado.app.utils.* +import io.legado.app.utils.GSON +import io.legado.app.utils.applyTint +import io.legado.app.utils.fromJsonObject +import io.legado.app.utils.getClipText +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setLayout +import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding import splitties.views.onClick @@ -68,12 +74,14 @@ class DirectLinkUploadConfig : BaseDialogFragment(R.layout.dialog_direct_link_up binding.editUploadUrl.setText(rule.uploadUrl) binding.editDownloadUrlRule.setText(rule.downloadUrlRule) binding.editSummary.setText(rule.summary) + binding.cbCompress.isChecked = rule.compress } private fun getRule(): DirectLinkUpload.Rule? { val uploadUrl = binding.editUploadUrl.text?.toString() val downloadUrlRule = binding.editDownloadUrlRule.text?.toString() val summary = binding.editSummary.text?.toString() + val compress = binding.cbCompress.isChecked if (uploadUrl.isNullOrBlank()) { toastOnUi("上传Url不能为空") return null @@ -86,7 +94,7 @@ class DirectLinkUploadConfig : BaseDialogFragment(R.layout.dialog_direct_link_up toastOnUi("注释不能为空") return null } - return DirectLinkUpload.Rule(uploadUrl, downloadUrlRule, summary) + return DirectLinkUpload.Rule(uploadUrl, downloadUrlRule, summary, compress) } private fun importDefault() { diff --git a/app/src/main/res/layout/dialog_direct_link_upload_config.xml b/app/src/main/res/layout/dialog_direct_link_upload_config.xml index 56bc9d7fd..3941fb868 100644 --- a/app/src/main/res/layout/dialog_direct_link_upload_config.xml +++ b/app/src/main/res/layout/dialog_direct_link_upload_config.xml @@ -68,6 +68,13 @@ + + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 5d22ec44d..e5b4ca809 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1112,4 +1112,5 @@ The section index that needs to be exported 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 7f88a66b0..e2731e105 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1115,4 +1115,5 @@ The section index that needs to be exported 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6e7138950..560dea21a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1115,4 +1115,5 @@ The section index that needs to be exported 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index af5722d6c..25d9dbdb3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1112,4 +1112,5 @@ 需要輸出的章節 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 672ad5236..5d3a7929b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1114,4 +1114,5 @@ 需要輸出的章節 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 9e6de4af0..a57ada17c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1114,4 +1114,5 @@ 需要输出的章节 压缩数据库 减小数据库文件的大小 + 是否压缩 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4bf5f948f..32e163236 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1115,4 +1115,5 @@ The section index that needs to be exported 压缩数据库 减小数据库文件的大小 + 是否压缩