From 9cf0be10314dd035f64f79325f1fb96b6566aafa Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 8 Oct 2022 06:47:02 +0800 Subject: [PATCH] refactor: remove storage setting request --- .../ui/association/FileAssociationActivity.kt | 2 +- .../app/ui/book/local/ImportBookActivity.kt | 2 +- .../app/ui/book/local/ImportBookAdapter.kt | 2 +- .../app/ui/book/local/ImportBookViewModel.kt | 2 +- .../ui/book/local/rule/TxtTocRuleActivity.kt | 2 +- .../ui/book/local/rule/TxtTocRuleAdapter.kt | 2 +- .../ui/book/local/rule/TxtTocRuleViewModel.kt | 2 +- .../app/ui/book/remote/RemoteBookActivity.kt | 2 +- .../app/ui/book/remote/RemoteBookAdapter.kt | 2 +- .../app/ui/book/remote/RemoteBookSort.kt | 2 +- .../app/ui/book/remote/RemoteBookViewModel.kt | 2 +- .../io/legado/app/ui/main/MainActivity.kt | 31 ------------------- .../main/bookshelf/BaseBookshelfFragment.kt | 4 +-- 13 files changed, 13 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt index 47000187a..69ef308bb 100644 --- a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt @@ -172,7 +172,7 @@ class FileAssociationActivity : }.onFailure { when (it) { is SecurityException -> localBookTreeSelect.launch { - title = "选择保存书籍的文件夹" + title = getString(R.string.select_book_folder) mode = HandleFileContract.DIR_SYS } else -> { 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 113fb5f25..af2a5c4f1 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 @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local +package io.legado.app.ui.book.import.local import android.annotation.SuppressLint import android.net.Uri diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt index b310d5fc2..552d267f8 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local +package io.legado.app.ui.book.import.local import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt index c4f760850..3a64d7d26 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local +package io.legado.app.ui.book.import.local import android.app.Application import android.net.Uri diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt index 1aa6791a1..a75478343 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local.rule +package io.legado.app.ui.book.import.local.rule import android.annotation.SuppressLint import android.os.Bundle diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt index 652ae5b94..76b014d5a 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local.rule +package io.legado.app.ui.book.import.local.rule import android.content.Context import android.os.Bundle diff --git a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt index 2c4cf0028..edc29a395 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.local.rule +package io.legado.app.ui.book.import.local.rule import android.app.Application import io.legado.app.base.BaseViewModel diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt index a6714d8b4..5a85c8f8d 100644 --- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.remote +package io.legado.app.ui.book.import.remote import android.annotation.SuppressLint import android.os.Bundle diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt index 16f4b37a1..25b9d98f2 100644 --- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.remote +package io.legado.app.ui.book.import.remote import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt index 8e8786bc2..41964035e 100644 --- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt +++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.remote +package io.legado.app.ui.book.import.remote enum class RemoteBookSort { Default, Name diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt index 902fa5ad2..725038532 100644 --- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.remote +package io.legado.app.ui.book.import.remote import android.app.Application import io.legado.app.base.BaseViewModel diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 6b6ed9c71..dfb6ea19b 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -31,7 +31,6 @@ import io.legado.app.lib.dialogs.alert import io.legado.app.lib.theme.elevation import io.legado.app.lib.theme.primaryColor import io.legado.app.service.BaseReadAloudService -import io.legado.app.ui.document.HandleFileContract import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment import io.legado.app.ui.main.bookshelf.style1.BookshelfFragment1 import io.legado.app.ui.main.bookshelf.style2.BookshelfFragment2 @@ -73,12 +72,6 @@ class MainActivity : VMBaseActivity(), private var bottomMenuCount = 4 private val realPositions = arrayOf(idBookshelf, idExplore, idRss, idMy) - private val localBookTreeSelect = registerForActivityResult(HandleFileContract()) { - it.uri?.let { treeUri -> - AppConfig.defaultBookTreeUri = treeUri.toString() - } - } - override fun onActivityCreated(savedInstanceState: Bundle?) { upBottomMenu() binding.run { @@ -99,8 +92,6 @@ class MainActivity : VMBaseActivity(), if (!privacyPolicy()) return@launch //版本更新 upVersion() - //请求设置书籍保存位置 - setBookStorage() //自动更新书籍 val isAutoRefreshedBook = savedInstanceState?.getBoolean("isAutoRefreshedBook") ?: false if (AppConfig.autoRefreshBook && !isAutoRefreshedBook) { @@ -219,28 +210,6 @@ class MainActivity : VMBaseActivity(), } } - /** - * 设置书籍保存位置 - */ - private fun setBookStorage() { - //测试书籍保存位置是否设置 - if (!AppConfig.defaultBookTreeUri.isNullOrBlank()) return - //测试读写?? - val storageHelp = String(assets.open("storageHelp.md").readBytes()) - alert("设置书籍保存位置", storageHelp) { - yesButton { - localBookTreeSelect.launch { - title = getString(R.string.select_book_folder) - mode = HandleFileContract.DIR_SYS - } - } - neutralButton("不想设置") { - AppConfig.defaultBookTreeUri = "null" - } - noButton() - } - } - override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean { event?.let { when (keyCode) { diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt index 85f19c0e5..1e04585e9 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt @@ -21,9 +21,9 @@ import io.legado.app.lib.dialogs.alert import io.legado.app.ui.about.AppLogDialog 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.import.local.ImportBookActivity +import io.legado.app.ui.book.import.remote.RemoteBookActivity import io.legado.app.ui.book.manage.BookshelfManageActivity -import io.legado.app.ui.book.remote.RemoteBookActivity import io.legado.app.ui.book.search.SearchActivity import io.legado.app.ui.document.HandleFileContract import io.legado.app.ui.main.MainViewModel