fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

show proper bubble text at sorting by path

Browse Source
This commit is contained in:
tibbi
2017-12-06 21:59:56 +01:00
parent eece8130cf
commit 527edf3914
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
View File

@ -41,9 +41,10 @@ data class Directory(val path: String, val tmb: String, val name: String, var me
} }
fun getBubbleText() = when { fun getBubbleText() = when {
sorting and SORT_BY_NAME != 0 -> name
sorting and SORT_BY_PATH != 0 -> path
sorting and SORT_BY_SIZE != 0 -> size.formatSize() sorting and SORT_BY_SIZE != 0 -> size.formatSize()
sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate() sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate()
sorting and SORT_BY_DATE_TAKEN != 0 -> taken.formatDate() else -> taken.formatDate()
else -> name
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
View File

@ -26,6 +26,7 @@ data class Medium(var name: String, var path: String, val video: Boolean, val mo
var result: Int var result: Int
when { when {
sorting and SORT_BY_NAME != 0 -> result = AlphanumericComparator().compare(name.toLowerCase(), other.name.toLowerCase()) sorting and SORT_BY_NAME != 0 -> result = AlphanumericComparator().compare(name.toLowerCase(), other.name.toLowerCase())
sorting and SORT_BY_PATH != 0 -> result = AlphanumericComparator().compare(path.toLowerCase(), other.path.toLowerCase())
sorting and SORT_BY_SIZE != 0 -> result = when { sorting and SORT_BY_SIZE != 0 -> result = when {
size == other.size -> 0 size == other.size -> 0
size > other.size -> 1 size > other.size -> 1
@ -50,9 +51,10 @@ data class Medium(var name: String, var path: String, val video: Boolean, val mo
} }
fun getBubbleText() = when { fun getBubbleText() = when {
sorting and SORT_BY_NAME != 0 -> name
sorting and SORT_BY_PATH != 0 -> path
sorting and SORT_BY_SIZE != 0 -> size.formatSize() sorting and SORT_BY_SIZE != 0 -> size.formatSize()
sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate() sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate()
sorting and SORT_BY_DATE_TAKEN != 0 -> taken.formatDate() else -> taken.formatDate()
else -> name
} }
} }