diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac44b67eb..25c89461a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -296,7 +296,7 @@ android:hardwareAccelerated="true" /> 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 2e193d785..e01100bfd 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 @@ -24,8 +24,8 @@ import io.legado.app.help.AppConfig import io.legado.app.help.BookHelp import io.legado.app.lib.dialogs.alert import io.legado.app.service.help.CacheBook -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.widget.dialog.TextListDialog import io.legado.app.utils.* import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt index 4959a2560..185ba4f23 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt @@ -20,7 +20,7 @@ import io.legado.app.help.AppConfig import io.legado.app.lib.permission.Permissions import io.legado.app.lib.permission.PermissionsCompat import io.legado.app.lib.theme.backgroundColor -import io.legado.app.ui.filepicker.FilePicker +import io.legado.app.ui.document.FilePicker import io.legado.app.ui.widget.SelectActionBar import io.legado.app.utils.* import kotlinx.coroutines.Dispatchers.IO diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt index e3ae1463d..51e288a13 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt @@ -23,8 +23,8 @@ import io.legado.app.lib.theme.bottomBackground import io.legado.app.lib.theme.getPrimaryTextColor import io.legado.app.lib.theme.getSecondaryTextColor import io.legado.app.ui.book.read.ReadBookActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.utils.* import io.legado.app.utils.viewbindingdelegate.viewBinding import rxhttp.wrapper.param.RxHttp diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt index d53b987e1..44af2dd45 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt @@ -26,8 +26,8 @@ import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryColor import io.legado.app.service.help.ReadAloud -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.* import io.legado.app.utils.viewbindingdelegate.viewBinding diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 2a26cacd0..89fa6dc21 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -24,8 +24,8 @@ import io.legado.app.lib.dialogs.selector import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.backgroundColor import io.legado.app.ui.book.source.debug.BookSourceDebugActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.login.SourceLogin import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.widget.KeyboardToolPop diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index b44317e04..f76e4705a 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -30,8 +30,8 @@ import io.legado.app.service.help.CheckSource import io.legado.app.ui.association.ImportBookSourceActivity import io.legado.app.ui.book.source.debug.BookSourceDebugActivity import io.legado.app.ui.book.source.edit.BookSourceEditActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.widget.SelectActionBar import io.legado.app.ui.widget.dialog.TextDialog diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index 7b5aacc31..8359259d4 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -28,7 +28,7 @@ import io.legado.app.lib.permission.Permissions import io.legado.app.lib.permission.PermissionsCompat import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.accentColor -import io.legado.app.ui.filepicker.FilePicker +import io.legado.app.ui.document.FilePicker import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.* import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt b/app/src/main/java/io/legado/app/ui/document/FilePicker.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt rename to app/src/main/java/io/legado/app/ui/document/FilePicker.kt index 92665a7a3..dfc0d5789 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/FilePicker.kt +++ b/app/src/main/java/io/legado/app/ui/document/FilePicker.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker +package io.legado.app.ui.document import android.app.Activity.RESULT_OK import android.content.Context diff --git a/app/src/main/java/io/legado/app/ui/filepicker/FilePickerActivity.kt b/app/src/main/java/io/legado/app/ui/document/FilePickerActivity.kt similarity index 99% rename from app/src/main/java/io/legado/app/ui/filepicker/FilePickerActivity.kt rename to app/src/main/java/io/legado/app/ui/document/FilePickerActivity.kt index 5ebddffb8..bcbf8dce7 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/FilePickerActivity.kt +++ b/app/src/main/java/io/legado/app/ui/document/FilePickerActivity.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker +package io.legado.app.ui.document import android.content.Intent import android.net.Uri diff --git a/app/src/main/java/io/legado/app/ui/filepicker/FilePickerDialog.kt b/app/src/main/java/io/legado/app/ui/document/FilePickerDialog.kt similarity index 96% rename from app/src/main/java/io/legado/app/ui/filepicker/FilePickerDialog.kt rename to app/src/main/java/io/legado/app/ui/document/FilePickerDialog.kt index 666de4cc3..af573efb0 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/FilePickerDialog.kt +++ b/app/src/main/java/io/legado/app/ui/document/FilePickerDialog.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker +package io.legado.app.ui.document import android.content.DialogInterface import android.content.Intent @@ -16,10 +16,10 @@ import androidx.recyclerview.widget.RecyclerView import io.legado.app.R import io.legado.app.databinding.DialogFileChooserBinding import io.legado.app.lib.theme.primaryColor -import io.legado.app.ui.filepicker.FilePicker.Companion.DIRECTORY -import io.legado.app.ui.filepicker.FilePicker.Companion.FILE -import io.legado.app.ui.filepicker.adapter.FileAdapter -import io.legado.app.ui.filepicker.adapter.PathAdapter +import io.legado.app.ui.document.FilePicker.Companion.DIRECTORY +import io.legado.app.ui.document.FilePicker.Companion.FILE +import io.legado.app.ui.document.adapter.FileAdapter +import io.legado.app.ui.document.adapter.PathAdapter import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.* import io.legado.app.utils.viewbindingdelegate.viewBinding diff --git a/app/src/main/java/io/legado/app/ui/filepicker/adapter/FileAdapter.kt b/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt similarity index 96% rename from app/src/main/java/io/legado/app/ui/filepicker/adapter/FileAdapter.kt rename to app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt index e4bedec58..97537753a 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/adapter/FileAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/document/adapter/FileAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.adapter +package io.legado.app.ui.document.adapter import android.content.Context @@ -9,9 +9,9 @@ import io.legado.app.databinding.ItemFileFilepickerBinding import io.legado.app.help.AppConfig import io.legado.app.lib.theme.getPrimaryDisabledTextColor import io.legado.app.lib.theme.getPrimaryTextColor -import io.legado.app.ui.filepicker.entity.FileItem -import io.legado.app.ui.filepicker.utils.ConvertUtils -import io.legado.app.ui.filepicker.utils.FilePickerIcon +import io.legado.app.ui.document.entity.FileItem +import io.legado.app.ui.document.utils.ConvertUtils +import io.legado.app.ui.document.utils.FilePickerIcon import io.legado.app.utils.FileUtils import java.io.File diff --git a/app/src/main/java/io/legado/app/ui/filepicker/adapter/PathAdapter.kt b/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt similarity index 93% rename from app/src/main/java/io/legado/app/ui/filepicker/adapter/PathAdapter.kt rename to app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt index 60ea3f648..65311c13c 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/adapter/PathAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/document/adapter/PathAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.adapter +package io.legado.app.ui.document.adapter import android.content.Context import android.os.Environment @@ -6,8 +6,8 @@ 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.ui.filepicker.utils.ConvertUtils -import io.legado.app.ui.filepicker.utils.FilePickerIcon +import io.legado.app.ui.document.utils.ConvertUtils +import io.legado.app.ui.document.utils.FilePickerIcon import java.util.* diff --git a/app/src/main/java/io/legado/app/ui/filepicker/entity/FileItem.kt b/app/src/main/java/io/legado/app/ui/document/entity/FileItem.kt similarity index 87% rename from app/src/main/java/io/legado/app/ui/filepicker/entity/FileItem.kt rename to app/src/main/java/io/legado/app/ui/document/entity/FileItem.kt index a558fcc80..88cd6b6b2 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/entity/FileItem.kt +++ b/app/src/main/java/io/legado/app/ui/document/entity/FileItem.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.entity +package io.legado.app.ui.document.entity import android.graphics.drawable.Drawable diff --git a/app/src/main/java/io/legado/app/ui/filepicker/entity/JavaBean.kt b/app/src/main/java/io/legado/app/ui/document/entity/JavaBean.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/filepicker/entity/JavaBean.kt rename to app/src/main/java/io/legado/app/ui/document/entity/JavaBean.kt index a6fb0c2bc..eb81f1c71 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/entity/JavaBean.kt +++ b/app/src/main/java/io/legado/app/ui/document/entity/JavaBean.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.entity +package io.legado.app.ui.document.entity import java.io.Serializable import java.lang.reflect.Field diff --git a/app/src/main/java/io/legado/app/ui/filepicker/utils/ConvertUtils.kt b/app/src/main/java/io/legado/app/ui/document/utils/ConvertUtils.kt similarity index 98% rename from app/src/main/java/io/legado/app/ui/filepicker/utils/ConvertUtils.kt rename to app/src/main/java/io/legado/app/ui/document/utils/ConvertUtils.kt index b4f0f0b7e..8844b3f3e 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/utils/ConvertUtils.kt +++ b/app/src/main/java/io/legado/app/ui/document/utils/ConvertUtils.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.utils +package io.legado.app.ui.document.utils import android.content.res.Resources import android.graphics.Bitmap diff --git a/app/src/main/java/io/legado/app/ui/filepicker/utils/FilePickerIcon.java b/app/src/main/java/io/legado/app/ui/document/utils/FilePickerIcon.java similarity index 99% rename from app/src/main/java/io/legado/app/ui/filepicker/utils/FilePickerIcon.java rename to app/src/main/java/io/legado/app/ui/document/utils/FilePickerIcon.java index 238b88c43..0f3447f6a 100644 --- a/app/src/main/java/io/legado/app/ui/filepicker/utils/FilePickerIcon.java +++ b/app/src/main/java/io/legado/app/ui/document/utils/FilePickerIcon.java @@ -1,4 +1,4 @@ -package io.legado.app.ui.filepicker.utils; +package io.legado.app.ui.document.utils; /** * Generated by https://github.com/gzu-liyujiang/Image2ByteVar diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt index 4f69d0ec5..090edd420 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt @@ -27,8 +27,8 @@ import io.legado.app.ui.book.cache.CacheActivity import io.legado.app.ui.book.group.GroupManageDialog import io.legado.app.ui.book.local.ImportBookActivity import io.legado.app.ui.book.search.SearchActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.main.MainViewModel import io.legado.app.ui.main.bookshelf.books.BooksFragment import io.legado.app.utils.* 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 a0b4ab26b..f0097b62b 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 @@ -28,8 +28,8 @@ import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryTextColor import io.legado.app.service.help.ReadBook import io.legado.app.ui.association.ImportReplaceRuleActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.replace.edit.ReplaceEditActivity import io.legado.app.ui.widget.SelectActionBar diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index cee652ca9..05789e00a 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -23,8 +23,8 @@ import io.legado.app.service.help.Download import io.legado.app.ui.association.ImportBookSourceActivity import io.legado.app.ui.association.ImportReplaceRuleActivity import io.legado.app.ui.association.ImportRssSourceActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.utils.* import kotlinx.coroutines.launch import org.apache.commons.text.StringEscapeUtils diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt index 6e9f0e6a1..6565ab242 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt @@ -24,8 +24,8 @@ import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.primaryTextColor import io.legado.app.ui.association.ImportRssSourceActivity -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.rss.source.edit.RssSourceEditActivity import io.legado.app.ui.widget.SelectActionBar diff --git a/app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt b/app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt index de1af18ba..e4b2d6724 100644 --- a/app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt +++ b/app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt @@ -19,8 +19,8 @@ import io.legado.app.lib.dialogs.alert import io.legado.app.lib.permission.Permissions import io.legado.app.lib.permission.PermissionsCompat import io.legado.app.lib.theme.primaryColor -import io.legado.app.ui.filepicker.FilePicker -import io.legado.app.ui.filepicker.FilePickerParam +import io.legado.app.ui.document.FilePicker +import io.legado.app.ui.document.FilePickerParam import io.legado.app.utils.* import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.Dispatchers.Main diff --git a/app/src/main/java/io/legado/app/utils/FileUtils.kt b/app/src/main/java/io/legado/app/utils/FileUtils.kt index 6c88e70e0..40ef4e2b1 100644 --- a/app/src/main/java/io/legado/app/utils/FileUtils.kt +++ b/app/src/main/java/io/legado/app/utils/FileUtils.kt @@ -3,7 +3,7 @@ package io.legado.app.utils import android.os.Environment import android.webkit.MimeTypeMap import androidx.annotation.IntDef -import io.legado.app.ui.filepicker.utils.ConvertUtils +import io.legado.app.ui.document.utils.ConvertUtils import splitties.init.appCtx import java.io.* import java.nio.charset.Charset