mirror of
https://github.com/gedoor/legado.git
synced 2024-08-30 09:23:26 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
4003fba54e
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,7 +1 @@
|
||||
{
|
||||
"arm64-v8a": "4c4c8dc090d4a1173fe564bb784a9249",
|
||||
"armeabi-v7a": "e9e1b735e07c6a0dd15a353f73728d07",
|
||||
"x86": "7dfab670462d91692685b653cf605217",
|
||||
"x86_64": "59d5d3e669ed981fb9c33bca33e79021",
|
||||
"version": "109.0.5414.117"
|
||||
}
|
||||
{"arm64-v8a":"2b818ddff61241043109d2c8cc1eabbc","x86":"aa24a41e58b1baa42c4fe6879ba71a23","x86_64":"f5123aab5ad23856f617a45cbdcc88e3","armeabi-v7a":"d5fb5109dcf0c08edb3acb61d0763d05","version":"110.0.5481.65"}
|
@ -13,6 +13,7 @@
|
||||
|
||||
**2023/02/12**
|
||||
|
||||
* 更新cronet: 110.0.5481.65
|
||||
* 添加清除 WebView 数据 by Horis
|
||||
*
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,3 +1,3 @@
|
||||
<!DOCTYPE html><html lang="zh-CN" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.78a74084.css" rel="prefetch"><link href="css/detail.a52390c0.css" rel="prefetch"><link href="js/about.098470f0.js" rel="prefetch"><link href="js/detail.49778394.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.57f380c8.css" rel="preload" as="style"><link href="js/app.6608cc19.js" rel="preload" as="script"><link href="js/chunk-vendors.7c711c9e.js" rel="preload" as="script"><link href="css/chunk-vendors.57f380c8.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
|
||||
<!DOCTYPE html><html lang="zh-CN" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.78a74084.css" rel="prefetch"><link href="css/detail.a93229e3.css" rel="prefetch"><link href="js/about.f0a7cd33.js" rel="prefetch"><link href="js/detail.9796c358.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.57f380c8.css" rel="preload" as="style"><link href="js/app.15779c82.js" rel="preload" as="script"><link href="js/chunk-vendors.ba449a74.js" rel="preload" as="script"><link href="css/chunk-vendors.57f380c8.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
|
||||
display: none;
|
||||
}</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.7c711c9e.js"></script><script src="js/app.6608cc19.js"></script></body></html>
|
||||
}</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.ba449a74.js"></script><script src="js/app.15779c82.js"></script></body></html>
|
File diff suppressed because one or more lines are too long
1
app/src/main/assets/web/bookshelf/js/about.f0a7cd33.js
Normal file
1
app/src/main/assets/web/bookshelf/js/about.f0a7cd33.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
app/src/main/assets/web/bookshelf/js/detail.9796c358.js
Normal file
1
app/src/main/assets/web/bookshelf/js/detail.9796c358.js
Normal file
File diff suppressed because one or more lines are too long
@ -75,7 +75,6 @@ class SearchContentActivity :
|
||||
searchView.onActionViewExpanded()
|
||||
searchView.isSubmitButtonEnabled = true
|
||||
searchView.queryHint = getString(R.string.search)
|
||||
searchView.clearFocus()
|
||||
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
|
||||
override fun onQueryTextSubmit(query: String): Boolean {
|
||||
startContentSearch(query.trim())
|
||||
@ -153,12 +152,12 @@ class SearchContentActivity :
|
||||
viewModel.lastQuery = query
|
||||
searchJob = launch {
|
||||
kotlin.runCatching {
|
||||
binding.refreshProgressBar.isAutoLoading = true
|
||||
binding.fbStop.visible()
|
||||
withContext(IO) {
|
||||
appDb.bookChapterDao.getChapterList(viewModel.bookUrl)
|
||||
}.forEach { bookChapter ->
|
||||
ensureActive()
|
||||
binding.refreshProgressBar.isAutoLoading = true
|
||||
binding.fbStop.visible()
|
||||
val searchResults = withContext(IO) {
|
||||
if (isLocalBook || viewModel.cacheChapterNames.contains(bookChapter.getFileName())) {
|
||||
viewModel.searchChapter(query, bookChapter)
|
||||
@ -171,24 +170,19 @@ class SearchContentActivity :
|
||||
ensureActive()
|
||||
if (searchResults != null && searchResults.isNotEmpty()) {
|
||||
viewModel.searchResultList.addAll(searchResults)
|
||||
binding.refreshProgressBar.isAutoLoading = false
|
||||
adapter.addItems(searchResults)
|
||||
}
|
||||
}
|
||||
binding.refreshProgressBar.isAutoLoading = false
|
||||
if (viewModel.searchResultCounts == 0) {
|
||||
val noSearchResult =
|
||||
SearchResult(resultText = getString(R.string.search_content_empty))
|
||||
adapter.addItem(noSearchResult)
|
||||
}
|
||||
}.onFailure {
|
||||
binding.fbStop.invisible()
|
||||
binding.refreshProgressBar.isAutoLoading = false
|
||||
AppLog.put("全文搜索出错\n${it.localizedMessage}", it)
|
||||
}.onSuccess {
|
||||
binding.fbStop.invisible()
|
||||
binding.refreshProgressBar.isAutoLoading = false
|
||||
}
|
||||
binding.fbStop.invisible()
|
||||
binding.refreshProgressBar.isAutoLoading = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -37,6 +37,6 @@ android.defaults.buildfeatures.shaders=false
|
||||
# and none from the library's dependencies, thereby reducing the size of the R class for that library.
|
||||
android.nonTransitiveRClass=true
|
||||
# https://chromiumdash.appspot.com/releases?platform=Android
|
||||
CronetVersion=109.0.5414.117
|
||||
CronetMainVersion=109.0.0.0
|
||||
CronetVersion=110.0.5481.65
|
||||
CronetMainVersion=110.0.0.0
|
||||
android.injected.testOnly=false
|
||||
|
Loading…
Reference in New Issue
Block a user