This commit is contained in:
Horis
2025-12-20 22:45:58 +08:00
parent 60d9d1d7e5
commit 4d2bc46caf
4 changed files with 12 additions and 6 deletions
@@ -223,7 +223,7 @@ data class Book(
fun getPageAnim(): Int {
var pageAnim = config.pageAnim
?: if (type and BookType.image > 0) PageAnim.scrollPageAnim else ReadBookConfig.pageAnim
?: if (isImage) PageAnim.scrollPageAnim else ReadBookConfig.pageAnim
if (pageAnim < 0) {
pageAnim = ReadBookConfig.pageAnim
}
@@ -3,6 +3,7 @@
package io.legado.app.help.book
import android.net.Uri
import androidx.core.net.toUri
import com.script.buildScriptBindings
import com.script.rhino.RhinoScriptEngine
import io.legado.app.constant.AppLog
@@ -114,7 +115,7 @@ fun Book.getLocalUri(): Uri {
return uri
}
uri = if (bookUrl.isUri()) {
Uri.parse(bookUrl)
bookUrl.toUri()
} else {
Uri.fromFile(File(bookUrl))
}
@@ -130,7 +131,7 @@ fun Book.getLocalUri(): Uri {
// 查找书籍保存目录
if (!defaultBookDir.isNullOrBlank()) {
val treeUri = Uri.parse(defaultBookDir)
val treeUri = defaultBookDir.toUri()
val treeFileDoc = FileDoc.fromUri(treeUri, true)
if (!treeFileDoc.exists()) {
appCtx.toastOnUi("书籍保存目录失效,请重新设置!")
@@ -149,7 +150,7 @@ fun Book.getLocalUri(): Uri {
// 查找添加本地选择的目录
if (!importBookDir.isNullOrBlank() && defaultBookDir != importBookDir) {
val treeUri = if (importBookDir.isUri()) {
Uri.parse(importBookDir)
importBookDir.toUri()
} else {
Uri.fromFile(File(importBookDir))
}
@@ -171,7 +172,7 @@ fun Book.getLocalUri(): Uri {
fun Book.getArchiveUri(): Uri? {
val defaultBookDir = AppConfig.defaultBookTreeUri
return if (isArchive && !defaultBookDir.isNullOrBlank()) {
FileDoc.fromUri(Uri.parse(defaultBookDir), true)
FileDoc.fromUri(defaultBookDir.toUri(), true)
.find(archiveName)?.uri
} else {
null
@@ -112,16 +112,19 @@ class BackupConfigFragment : PreferenceFragment(),
it.setOnBindEditTextListener { editText ->
editText.inputType =
InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT
editText.setSelection(editText.text.length)
}
}
findPreference<EditTextPreference>(PreferKey.webDavDir)?.let {
it.setOnBindEditTextListener { editText ->
editText.text = AppConfig.webDavDir?.toEditable()
editText.setSelection(editText.text.length)
}
}
findPreference<EditTextPreference>(PreferKey.webDavDeviceName)?.let {
it.setOnBindEditTextListener { editText ->
editText.text = AppConfig.webDavDeviceName?.toEditable()
editText.setSelection(editText.text.length)
}
}
upPreferenceSummary(PreferKey.webDavUrl, getPrefString(PreferKey.webDavUrl))