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

fixing some grid spacing related glitches

Browse source
This commit is contained in:
tibbi 2021-01-19 23:18:13 +01:00
parent b5c993ed51
commit 8bd9ee1c95
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
View file

@ -418,10 +418,11 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
media_grid.adapter = this media_grid.adapter = this
} }
setupLayoutManager() setupLayoutManager()
measureRecyclerViewContent(mMedia)
handleGridSpacing() handleGridSpacing()
measureRecyclerViewContent(mMedia)
} else if (mLastSearchedText.isEmpty()) { } else if (mLastSearchedText.isEmpty()) {
(currAdapter as MediaAdapter).updateMedia(mMedia) (currAdapter as MediaAdapter).updateMedia(mMedia)
handleGridSpacing()
measureRecyclerViewContent(mMedia) measureRecyclerViewContent(mMedia)
} else { } else {
searchQueryChanged(mLastSearchedText) searchQueryChanged(mLastSearchedText)

9
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt
View file

@ -635,15 +635,12 @@ class MediaFetcher(val context: Context) {
return thumbnailItems return thumbnailItems
} }
var currentGridPosition = 0
val mediumGroups = LinkedHashMap<String, ArrayList<Medium>>() val mediumGroups = LinkedHashMap<String, ArrayList<Medium>>()
media.forEach { media.forEach {
val key = it.getGroupingKey(currentGrouping) val key = it.getGroupingKey(currentGrouping)
if (!mediumGroups.containsKey(key)) { if (!mediumGroups.containsKey(key)) {
mediumGroups[key] = ArrayList() mediumGroups[key] = ArrayList()
currentGridPosition = 0
} }
it.gridPosition = currentGridPosition++
mediumGroups[key]!!.add(it) mediumGroups[key]!!.add(it)
} }
@ -667,8 +664,14 @@ class MediaFetcher(val context: Context) {
val today = formatDate(System.currentTimeMillis().toString(), true) val today = formatDate(System.currentTimeMillis().toString(), true)
val yesterday = formatDate((System.currentTimeMillis() - DAY_SECONDS * 1000).toString(), true) val yesterday = formatDate((System.currentTimeMillis() - DAY_SECONDS * 1000).toString(), true)
for ((key, value) in mediumGroups) { for ((key, value) in mediumGroups) {
var currentGridPosition = 0
val sectionKey = getFormattedKey(key, currentGrouping, today, yesterday) val sectionKey = getFormattedKey(key, currentGrouping, today, yesterday)
thumbnailItems.add(ThumbnailSection(sectionKey)) thumbnailItems.add(ThumbnailSection(sectionKey))
value.forEach {
it.gridPosition = currentGridPosition++
}
thumbnailItems.addAll(value) thumbnailItems.addAll(value)
} }