From a15aace1b40ecdcc4afc078f03f554c81048334a Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 30 Mar 2023 20:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8,=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/document/FileManageActivity.kt | 39 ++++++++++++++++++- .../app/ui/document/adapter/FileAdapter.kt | 12 +++--- .../app/ui/document/adapter/PathAdapter.kt | 12 +++--- ...item_file_filepicker.xml => item_file.xml} | 0 app/src/main/res/layout/item_file_picker.xml | 22 +++++++++++ ...th_filepicker.xml => item_path_picker.xml} | 0 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 + 13 files changed, 79 insertions(+), 13 deletions(-) rename app/src/main/res/layout/{item_file_filepicker.xml => item_file.xml} (100%) create mode 100644 app/src/main/res/layout/item_file_picker.xml rename app/src/main/res/layout/{item_path_filepicker.xml => item_path_picker.xml} (100%) diff --git a/app/src/main/java/io/legado/app/ui/document/FileManageActivity.kt b/app/src/main/java/io/legado/app/ui/document/FileManageActivity.kt index f048a491f..d205cfff2 100644 --- a/app/src/main/java/io/legado/app/ui/document/FileManageActivity.kt +++ b/app/src/main/java/io/legado/app/ui/document/FileManageActivity.kt @@ -1,12 +1,19 @@ package io.legado.app.ui.document import android.os.Bundle +import android.view.ViewGroup import androidx.activity.viewModels import androidx.appcompat.widget.SearchView +import androidx.recyclerview.widget.LinearLayoutManager import io.legado.app.R import io.legado.app.base.VMBaseActivity +import io.legado.app.base.adapter.ItemViewHolder +import io.legado.app.base.adapter.RecyclerAdapter import io.legado.app.databinding.ActivityFileManageBinding +import io.legado.app.databinding.ItemFileBinding +import io.legado.app.lib.theme.backgroundColor import io.legado.app.lib.theme.primaryTextColor +import io.legado.app.utils.FileDoc import io.legado.app.utils.applyTint import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -18,6 +25,9 @@ class FileManageActivity : VMBaseActivity(this@FileManageActivity) { + + + override fun getViewBinding(parent: ViewGroup): ItemFileBinding { + TODO("Not yet implemented") + } + + override fun registerListener(holder: ItemViewHolder, binding: ItemFileBinding) { + TODO("Not yet implemented") + } + + override fun convert( + holder: ItemViewHolder, + binding: ItemFileBinding, + item: FileDoc, + payloads: MutableList + ) { + TODO("Not yet implemented") + } + + + } + } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt b/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt index c17fb5bba..f2ac9e8f6 100644 --- a/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt @@ -5,7 +5,7 @@ import android.content.Context import android.view.ViewGroup import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.base.adapter.RecyclerAdapter -import io.legado.app.databinding.ItemFileFilepickerBinding +import io.legado.app.databinding.ItemFilePickerBinding import io.legado.app.help.config.AppConfig import io.legado.app.lib.theme.getPrimaryDisabledTextColor import io.legado.app.lib.theme.getPrimaryTextColor @@ -17,7 +17,7 @@ import java.io.File class FileAdapter(context: Context, val callBack: CallBack) : - RecyclerAdapter(context) { + RecyclerAdapter(context) { private var rootPath: String? = null var currentPath: String? = null private set @@ -84,13 +84,13 @@ class FileAdapter(context: Context, val callBack: CallBack) : } - override fun getViewBinding(parent: ViewGroup): ItemFileFilepickerBinding { - return ItemFileFilepickerBinding.inflate(inflater, parent, false) + override fun getViewBinding(parent: ViewGroup): ItemFilePickerBinding { + return ItemFilePickerBinding.inflate(inflater, parent, false) } override fun convert( holder: ItemViewHolder, - binding: ItemFileFilepickerBinding, + binding: ItemFilePickerBinding, item: FileItem, payloads: MutableList ) { @@ -115,7 +115,7 @@ class FileAdapter(context: Context, val callBack: CallBack) : } } - override fun registerListener(holder: ItemViewHolder, binding: ItemFileFilepickerBinding) { + override fun registerListener(holder: ItemViewHolder, binding: ItemFilePickerBinding) { holder.itemView.setOnClickListener { callBack.onFileClick(holder.layoutPosition) } diff --git a/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt b/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt index bc8ecd4e5..5a085c683 100644 --- a/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt @@ -5,14 +5,14 @@ import android.os.Environment import android.view.ViewGroup import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.base.adapter.RecyclerAdapter -import io.legado.app.databinding.ItemPathFilepickerBinding +import io.legado.app.databinding.ItemPathPickerBinding import io.legado.app.ui.document.utils.FilePickerIcon import io.legado.app.utils.ConvertUtils import java.util.* class PathAdapter(context: Context, val callBack: CallBack) : - RecyclerAdapter(context) { + RecyclerAdapter(context) { private val paths = LinkedList() private val arrowIcon = ConvertUtils.toDrawable(FilePickerIcon.getArrow()) @@ -43,13 +43,13 @@ class PathAdapter(context: Context, val callBack: CallBack) : setItems(paths) } - override fun getViewBinding(parent: ViewGroup): ItemPathFilepickerBinding { - return ItemPathFilepickerBinding.inflate(inflater, parent, false) + override fun getViewBinding(parent: ViewGroup): ItemPathPickerBinding { + return ItemPathPickerBinding.inflate(inflater, parent, false) } override fun convert( holder: ItemViewHolder, - binding: ItemPathFilepickerBinding, + binding: ItemPathPickerBinding, item: String, payloads: MutableList ) { @@ -59,7 +59,7 @@ class PathAdapter(context: Context, val callBack: CallBack) : } } - override fun registerListener(holder: ItemViewHolder, binding: ItemPathFilepickerBinding) { + override fun registerListener(holder: ItemViewHolder, binding: ItemPathPickerBinding) { holder.itemView.setOnClickListener { callBack.onPathClick(holder.layoutPosition) } diff --git a/app/src/main/res/layout/item_file_filepicker.xml b/app/src/main/res/layout/item_file.xml similarity index 100% rename from app/src/main/res/layout/item_file_filepicker.xml rename to app/src/main/res/layout/item_file.xml diff --git a/app/src/main/res/layout/item_file_picker.xml b/app/src/main/res/layout/item_file_picker.xml new file mode 100644 index 000000000..fb4626dac --- /dev/null +++ b/app/src/main/res/layout/item_file_picker.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_path_filepicker.xml b/app/src/main/res/layout/item_path_picker.xml similarity index 100% rename from app/src/main/res/layout/item_path_filepicker.xml rename to app/src/main/res/layout/item_path_picker.xml diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 7f7c6bce9..dcddfafdc 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1087,4 +1087,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 13ecca532..3b6e80d1e 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1090,4 +1090,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index cce4dfc4f..b1a5c919c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1090,4 +1090,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index df680a68a..b79f955f1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1087,4 +1087,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1689b7535..5dbe9c3f9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1089,4 +1089,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 865b5419c..66c82ca46 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1089,4 +1089,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 192dc3bcf..428fb91a1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1090,4 +1090,5 @@ 用户隐私与协议 同意 拒绝 + 文件管理