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

fix #1611, removing some portrait related crashes

Browse Source
This commit is contained in:
tibbi
2019-10-06 19:02:09 +02:00
parent 0d8f4f75ab
commit 0d1db78e90
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
View File

@ -482,13 +482,15 @@ class PhotoFragment : ViewPagerFragment() {
setupStripeBottomMargin() setupStripeBottomMargin()
val coverIndex = getCoverImageIndex(paths) val coverIndex = getCoverImageIndex(paths)
mCurrentPortraitPhotoPath = paths[coverIndex] if (coverIndex != -1) {
setupStripeUpListener(adapter, screenWidth, itemWidth) mCurrentPortraitPhotoPath = paths[coverIndex]
setupStripeUpListener(adapter, screenWidth, itemWidth)
mView.photo_portrait_stripe.onGlobalLayout { mView.photo_portrait_stripe.onGlobalLayout {
mView.photo_portrait_stripe.scrollBy((coverIndex - fakeItemsCnt) * itemWidth, 0) mView.photo_portrait_stripe.scrollBy((coverIndex - fakeItemsCnt) * itemWidth, 0)
adapter.setCurrentPhoto(coverIndex) adapter.setCurrentPhoto(coverIndex)
mView.photo_portrait_stripe_wrapper.beVisible() mView.photo_portrait_stripe_wrapper.beVisible()
}
} }
} }
} }

8
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt
View File

@ -245,9 +245,11 @@ class MediaFetcher(val context: Context) {
for (subdir in subdirs) { for (subdir in subdirs) {
val portraitFiles = subdir.listFiles() ?: continue val portraitFiles = subdir.listFiles() ?: continue
val cover = portraitFiles.firstOrNull { it.name.contains("cover", true) } ?: portraitFiles.first() val cover = portraitFiles.firstOrNull { it.name.contains("cover", true) } ?: portraitFiles.firstOrNull()
files.add(cover) if (cover != null) {
covers.add(cover.absolutePath) files.add(cover)
covers.add(cover.absolutePath)
}
} }
for (file in files) { for (file in files) {