yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2023-06-16 07:55:22 +08:00
parent 7259ab7f78
commit bd8b17845f
1 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+46 -35
View File
@@ -276,43 +276,46 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
appDb.bookSourceDao.flowSearch(searchKey) appDb.bookSourceDao.flowSearch(searchKey)
} }
}.conflate().map { data -> }.conflate().map { data ->
if (sortAscending) when (sort) { if (sortAscending) {
Sort.Weight -> data.sortedBy { it.weight } when (sort) {
Sort.Name -> data.sortedWith { o1, o2 -> Sort.Weight -> data.sortedBy { it.weight }
o1.bookSourceName.cnCompare(o2.bookSourceName) Sort.Name -> data.sortedWith { o1, o2 ->
} o1.bookSourceName.cnCompare(o2.bookSourceName)
Sort.Url -> data.sortedBy { it.bookSourceUrl }
Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
Sort.Respond -> data.sortedBy { it.respondTime }
Sort.Enable -> data.sortedWith { o1, o2 ->
var sort = -o1.enabled.compareTo(o2.enabled)
if (sort == 0) {
sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
} }
sort
}
else -> data Sort.Url -> data.sortedBy { it.bookSourceUrl }
} Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
else when (sort) { Sort.Respond -> data.sortedBy { it.respondTime }
Sort.Weight -> data.sortedByDescending { it.weight } Sort.Enable -> data.sortedWith { o1, o2 ->
Sort.Name -> data.sortedWith { o1, o2 -> var sort = -o1.enabled.compareTo(o2.enabled)
o2.bookSourceName.cnCompare(o1.bookSourceName) if (sort == 0) {
} sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
}
Sort.Url -> data.sortedByDescending { it.bookSourceUrl } sort
Sort.Update -> data.sortedBy { it.lastUpdateTime }
Sort.Respond -> data.sortedByDescending { it.respondTime }
Sort.Enable -> data.sortedWith { o1, o2 ->
var sort = o1.enabled.compareTo(o2.enabled)
if (sort == 0) {
sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
} }
sort
}
else -> data.reversed() else -> data
}
} else {
when (sort) {
Sort.Weight -> data.sortedByDescending { it.weight }
Sort.Name -> data.sortedWith { o1, o2 ->
o2.bookSourceName.cnCompare(o1.bookSourceName)
}
Sort.Url -> data.sortedByDescending { it.bookSourceUrl }
Sort.Update -> data.sortedBy { it.lastUpdateTime }
Sort.Respond -> data.sortedByDescending { it.respondTime }
Sort.Enable -> data.sortedWith { o1, o2 ->
var sort = o1.enabled.compareTo(o2.enabled)
if (sort == 0) {
sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
}
sort
}
else -> data.reversed()
}
} }
}.catch { }.catch {
AppLog.put("书源界面更新书源出错", it) AppLog.put("书源界面更新书源出错", it)
@@ -653,11 +656,19 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
} }
override fun toTop(bookSource: BookSourcePart) { override fun toTop(bookSource: BookSourcePart) {
viewModel.topSource(bookSource) if (sortAscending) {
viewModel.topSource(bookSource)
} else {
viewModel.bottomSource(bookSource)
}
} }
override fun toBottom(bookSource: BookSourcePart) { override fun toBottom(bookSource: BookSourcePart) {
viewModel.bottomSource(bookSource) if (sortAscending) {
viewModel.bottomSource(bookSource)
} else {
viewModel.topSource(bookSource)
}
} }
override fun searchBook(bookSource: BookSourcePart) { override fun searchBook(bookSource: BookSourcePart) {