refactor: remove storage setting request

pull/2386/head
Xwite 3 years ago
parent ca2381e8b6
commit 9cf0be1031
  1. 2
      app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
  2. 2
      app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
  3. 2
      app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
  4. 2
      app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
  5. 2
      app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleActivity.kt
  6. 2
      app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleAdapter.kt
  7. 2
      app/src/main/java/io/legado/app/ui/book/local/rule/TxtTocRuleViewModel.kt
  8. 2
      app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
  9. 2
      app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
  10. 2
      app/src/main/java/io/legado/app/ui/book/remote/RemoteBookSort.kt
  11. 2
      app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
  12. 31
      app/src/main/java/io/legado/app/ui/main/MainActivity.kt
  13. 4
      app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt

@ -172,7 +172,7 @@ class FileAssociationActivity :
}.onFailure { }.onFailure {
when (it) { when (it) {
is SecurityException -> localBookTreeSelect.launch { is SecurityException -> localBookTreeSelect.launch {
title = "选择保存书籍的文件夹" title = getString(R.string.select_book_folder)
mode = HandleFileContract.DIR_SYS mode = HandleFileContract.DIR_SYS
} }
else -> { else -> {

@ -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.annotation.SuppressLint
import android.net.Uri import android.net.Uri

@ -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.annotation.SuppressLint
import android.content.Context import android.content.Context

@ -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.app.Application
import android.net.Uri import android.net.Uri

@ -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.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle

@ -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.content.Context
import android.os.Bundle import android.os.Bundle

@ -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 android.app.Application
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel

@ -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.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle

@ -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.annotation.SuppressLint
import android.content.Context import android.content.Context

@ -1,4 +1,4 @@
package io.legado.app.ui.book.remote package io.legado.app.ui.book.import.remote
enum class RemoteBookSort { enum class RemoteBookSort {
Default, Name Default, Name

@ -1,4 +1,4 @@
package io.legado.app.ui.book.remote package io.legado.app.ui.book.import.remote
import android.app.Application import android.app.Application
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel

@ -31,7 +31,6 @@ import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.theme.elevation import io.legado.app.lib.theme.elevation
import io.legado.app.lib.theme.primaryColor import io.legado.app.lib.theme.primaryColor
import io.legado.app.service.BaseReadAloudService 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.BaseBookshelfFragment
import io.legado.app.ui.main.bookshelf.style1.BookshelfFragment1 import io.legado.app.ui.main.bookshelf.style1.BookshelfFragment1
import io.legado.app.ui.main.bookshelf.style2.BookshelfFragment2 import io.legado.app.ui.main.bookshelf.style2.BookshelfFragment2
@ -73,12 +72,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
private var bottomMenuCount = 4 private var bottomMenuCount = 4
private val realPositions = arrayOf(idBookshelf, idExplore, idRss, idMy) 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?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
upBottomMenu() upBottomMenu()
binding.run { binding.run {
@ -99,8 +92,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
if (!privacyPolicy()) return@launch if (!privacyPolicy()) return@launch
//版本更新 //版本更新
upVersion() upVersion()
//请求设置书籍保存位置
setBookStorage()
//自动更新书籍 //自动更新书籍
val isAutoRefreshedBook = savedInstanceState?.getBoolean("isAutoRefreshedBook") ?: false val isAutoRefreshedBook = savedInstanceState?.getBoolean("isAutoRefreshedBook") ?: false
if (AppConfig.autoRefreshBook && !isAutoRefreshedBook) { if (AppConfig.autoRefreshBook && !isAutoRefreshedBook) {
@ -219,28 +210,6 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
} }
} }
/**
* 设置书籍保存位置
*/
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 { override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
event?.let { event?.let {
when (keyCode) { when (keyCode) {

@ -21,9 +21,9 @@ import io.legado.app.lib.dialogs.alert
import io.legado.app.ui.about.AppLogDialog import io.legado.app.ui.about.AppLogDialog
import io.legado.app.ui.book.cache.CacheActivity import io.legado.app.ui.book.cache.CacheActivity
import io.legado.app.ui.book.group.GroupManageDialog 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.manage.BookshelfManageActivity
import io.legado.app.ui.book.remote.RemoteBookActivity
import io.legado.app.ui.book.search.SearchActivity import io.legado.app.ui.book.search.SearchActivity
import io.legado.app.ui.document.HandleFileContract import io.legado.app.ui.document.HandleFileContract
import io.legado.app.ui.main.MainViewModel import io.legado.app.ui.main.MainViewModel

Loading…
Cancel
Save