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

let's try using GlideDecoder at fullscreen media

Browse Source
This commit is contained in:
tibbi
2017-11-08 20:35:35 +01:00
parent d0f7eb9fb1
commit 19a0621cab
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -46,7 +46,7 @@ ext {
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.37.6' compile 'com.simplemobiletools:commons:2.37.6'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.7.2'
compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0' compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
compile 'com.google.code.gson:gson:2.8.2' compile 'com.google.code.gson:gson:2.8.2'

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

@@ -27,6 +27,7 @@ import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.activities.PhotoActivity import com.simplemobiletools.gallery.activities.PhotoActivity
import com.simplemobiletools.gallery.activities.ViewPagerActivity import com.simplemobiletools.gallery.activities.ViewPagerActivity
import com.simplemobiletools.gallery.extensions.* import com.simplemobiletools.gallery.extensions.*
import com.simplemobiletools.gallery.helpers.GlideDecoder
import com.simplemobiletools.gallery.helpers.GlideRotateTransformation import com.simplemobiletools.gallery.helpers.GlideRotateTransformation
import com.simplemobiletools.gallery.helpers.MEDIUM import com.simplemobiletools.gallery.helpers.MEDIUM
import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.models.Medium
@@ -226,7 +227,7 @@ class PhotoFragment : ViewPagerFragment() {
private fun addZoomableView() { private fun addZoomableView() {
if ((medium.isImage()) && isFragmentVisible && view.subsampling_view.visibility == View.GONE) { if ((medium.isImage()) && isFragmentVisible && view.subsampling_view.visibility == View.GONE) {
view.subsampling_view.apply { view.subsampling_view.apply {
//setBitmapDecoderClass(GlideDecoder::class.java) // causing random crashes on Android 7+ setBitmapDecoderClass(GlideDecoder::class.java) // was causing random crashes on Android 7+
maxScale = 10f maxScale = 10f
beVisible() beVisible()
setImage(ImageSource.uri(medium.path)) setImage(ImageSource.uri(medium.path))

6
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideDecoder.kt
View File

@@ -42,10 +42,8 @@ class GlideDecoder : ImageDecoder {
} }
private fun drawableToBitmap(drawable: Drawable): Bitmap { private fun drawableToBitmap(drawable: Drawable): Bitmap {
if (drawable is BitmapDrawable) { if (drawable is BitmapDrawable && drawable.bitmap != null) {
if (drawable.bitmap != null) { return drawable.bitmap
return drawable.bitmap
}
} }
val bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) { val bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) {