PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

make sure the proper image is the directory thumbnail

Browse source
This commit is contained in:
tibbi 2016-12-26 20:40:08 +01:00
parent 7bf936339a
commit 6ad748d16a
4 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt
View file

@ -11,6 +11,7 @@ import com.simplemobiletools.gallery.extensions.getLongValue
import com.simplemobiletools.gallery.extensions.getStringValue import com.simplemobiletools.gallery.extensions.getStringValue
import com.simplemobiletools.gallery.helpers.* import com.simplemobiletools.gallery.helpers.*
import com.simplemobiletools.gallery.models.Directory import com.simplemobiletools.gallery.models.Directory
import com.simplemobiletools.gallery.models.Medium
import java.io.File import java.io.File
import java.util.* import java.util.*
@ -24,6 +25,7 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
} }
override fun doInBackground(vararg params: Void): ArrayList<Directory> { override fun doInBackground(vararg params: Void): ArrayList<Directory> {
val media = ArrayList<Medium>()
val directories = LinkedHashMap<String, Directory>() val directories = LinkedHashMap<String, Directory>()
val invalidFiles = ArrayList<File>() val invalidFiles = ArrayList<File>()
val showMedia = mConfig.showMedia val showMedia = mConfig.showMedia
@ -38,7 +40,8 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
} }
val columns = arrayOf(MediaStore.Images.Media.DATA, MediaStore.Images.Media.DATE_MODIFIED, MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.SIZE) val columns = arrayOf(MediaStore.Images.Media.DATA, MediaStore.Images.Media.DISPLAY_NAME, MediaStore.Images.Media.DATE_MODIFIED,
MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.SIZE)
val order = getSortOrder() val order = getSortOrder()
var cursor: Cursor? = null var cursor: Cursor? = null
@ -56,22 +59,10 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
continue continue
} }
val parentDir = file.parent val name = cursor.getStringValue(MediaStore.Images.Media.DISPLAY_NAME) ?: ""
if (directories.containsKey(parentDir)) { val dateModified = cursor.getLongValue(MediaStore.Images.Media.DATE_MODIFIED)
val directory: Directory = directories[parentDir]!! val dateTaken = cursor.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
val newImageCnt = directory.mediaCnt + 1 media.add(Medium(name, fullPath, i == 1, dateModified, dateTaken, size))
directory.mediaCnt = newImageCnt
directory.addSize(size)
} else if (!mToBeDeleted.contains(parentDir)) {
var dirName = context.getHumanizedFilename(parentDir)
if (mConfig.getIsFolderHidden(parentDir)) {
dirName += " ${context.resources.getString(R.string.hidden)}"
}
val dateModified = cursor.getLongValue(MediaStore.Images.Media.DATE_MODIFIED)
val dateTaken = cursor.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
directories.put(parentDir, Directory(parentDir, fullPath, dirName, 1, dateModified, dateTaken, size))
}
} while (cursor.moveToNext()) } while (cursor.moveToNext())
} }
} finally { } finally {
@ -79,6 +70,26 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
} }
} }
Medium.sorting = mConfig.fileSorting
media.sort()
for ((name, path, isVideo, dateModified, dateTaken, size) in media) {
val parentDir = File(path).parent
if (directories.containsKey(parentDir)) {
val directory: Directory = directories[parentDir]!!
val newImageCnt = directory.mediaCnt + 1
directory.mediaCnt = newImageCnt
directory.addSize(size)
} else if (!mToBeDeleted.contains(parentDir)) {
var dirName = context.getHumanizedFilename(parentDir)
if (mConfig.getIsFolderHidden(parentDir)) {
dirName += " ${context.resources.getString(R.string.hidden)}"
}
directories.put(parentDir, Directory(parentDir, path, dirName, 1, dateModified, dateTaken, size))
}
}
context.scanFiles(invalidFiles) {} context.scanFiles(invalidFiles) {}
val dirs = ArrayList(directories.values.filter { File(it.path).exists() }) val dirs = ArrayList(directories.values.filter { File(it.path).exists() })

2
app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
View file

@ -76,7 +76,7 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
} }
context.scanFiles(invalidFiles) {} context.scanFiles(invalidFiles) {}
Medium.sorting = mConfig.sorting Medium.sorting = mConfig.fileSorting
media.sort() media.sort()
return media return media
} }

4
app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt
View file

@ -29,7 +29,7 @@ class ChangeSortingDialog(val activity: SimpleActivity, val isDirectorySorting:
activity.setupDialogStuff(view, this, R.string.sort_by) activity.setupDialogStuff(view, this, R.string.sort_by)
} }
currSorting = if (isDirectorySorting) config.directorySorting else config.sorting currSorting = if (isDirectorySorting) config.directorySorting else config.fileSorting
setupSortRadio() setupSortRadio()
setupOrderRadio() setupOrderRadio()
} }
@ -73,7 +73,7 @@ class ChangeSortingDialog(val activity: SimpleActivity, val isDirectorySorting:
if (isDirectorySorting) { if (isDirectorySorting) {
config.directorySorting = sorting config.directorySorting = sorting
} else { } else {
config.sorting = sorting config.fileSorting = sorting
} }
callback.invoke() callback.invoke()
} }

2
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
View file

@ -21,7 +21,7 @@ class Config(context: Context) : BaseConfig(context) {
get() = mPrefs.getBoolean(IS_SAME_SORTING, true) get() = mPrefs.getBoolean(IS_SAME_SORTING, true)
set(isSameSorting) = mPrefs.edit().putBoolean(IS_SAME_SORTING, isSameSorting).apply() set(isSameSorting) = mPrefs.edit().putBoolean(IS_SAME_SORTING, isSameSorting).apply()
var sorting: Int var fileSorting: Int
get() = if (isSameSorting) directorySorting else mPrefs.getInt(SORT_ORDER, SORT_BY_DATE_MODIFIED or SORT_DESCENDING) get() = if (isSameSorting) directorySorting else mPrefs.getInt(SORT_ORDER, SORT_BY_DATE_MODIFIED or SORT_DESCENDING)
set(order) = if (isSameSorting) directorySorting = order else mPrefs.edit().putInt(SORT_ORDER, order).apply() set(order) = if (isSameSorting) directorySorting = order else mPrefs.edit().putInt(SORT_ORDER, order).apply()