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

update Commons, take selected date/time format into consideration

Browse Source
This commit is contained in:
tibbi
2019-02-21 22:15:42 +01:00
parent 22c8bcf9df
commit e7ee126577
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.simplemobiletools.gallery.pro.models
import android.content.Context
import androidx.room.*
import com.simplemobiletools.commons.extensions.formatDate
import com.simplemobiletools.commons.extensions.formatSize
@@ -29,12 +30,12 @@ data class Directory(
constructor() : this(null, "", "", "", 0, 0L, 0L, 0L, 0, 0, 0, 0)
fun getBubbleText(sorting: Int) = when {
fun getBubbleText(sorting: Int, context: Context) = 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_DATE_MODIFIED != 0 -> modified.formatDate()
else -> taken.formatDate()
sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate(context)
else -> taken.formatDate(context)
}
fun areFavorites() = path == FAVORITES

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

@@ -1,5 +1,6 @@
package com.simplemobiletools.gallery.pro.models
import android.content.Context
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.Index
@@ -45,12 +46,12 @@ data class Medium(
fun isHidden() = name.startsWith('.')
fun getBubbleText(sorting: Int) = when {
fun getBubbleText(sorting: Int, context: Context) = 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_DATE_MODIFIED != 0 -> modified.formatDate()
else -> taken.formatDate()
sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate(context)
else -> taken.formatDate(context)
}
fun getGroupingKey(groupBy: Int): String {