|
|
@@ -59,24 +59,13 @@ class ImportBookViewModel(application: Application) : BaseViewModel(application)
|
|
|
}.map { docList ->
|
|
|
when (sort) {
|
|
|
2 -> docList.sortedWith(
|
|
|
- compareBy(
|
|
|
- { !it.isDir },
|
|
|
- { it.date },
|
|
|
- { it.name }
|
|
|
- )
|
|
|
+ compareBy({ !it.isDir }, { it.date }, { it.name })
|
|
|
)
|
|
|
1 -> docList.sortedWith(
|
|
|
- compareBy(
|
|
|
- { !it.isDir },
|
|
|
- { it.size },
|
|
|
- { it.name }
|
|
|
- )
|
|
|
+ compareBy({ !it.isDir }, { it.size }, { it.name })
|
|
|
)
|
|
|
else -> docList.sortedWith(
|
|
|
- compareBy(
|
|
|
- { !it.isDir },
|
|
|
- { it.name }
|
|
|
- )
|
|
|
+ compareBy({ !it.isDir }, { it.name })
|
|
|
)
|
|
|
}
|
|
|
}.flowOn(IO)
|