Merge pull request #341 from leonlatsch/master

Finish Release 1.7.2
leonlatsch · Jul 4, 2024 · cb7ad91 · cb7ad91
2 parents 7650f84 + 50e447f
commit cb7ad91
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/app/src/main/assets/open_source_licenses.json b/app/src/main/assets/open_source_licenses.json
diff --git a/app/src/main/java/dev/leonlatsch/photok/gallery/ui/components/AlbumTile.kt b/app/src/main/java/dev/leonlatsch/photok/gallery/ui/components/AlbumTile.kt
@@ -76,8 +76,8 @@ fun AlbumTile(album: AlbumItem, onAlbumClicked: (String) -> Unit) {
             } else {
                 val requestData = remember(album) {
                     EncryptedImageRequestData(
-                        album.albumCover.filename,
-                        album.albumCover.filename,
+                        internalFileName = album.albumCover.filename,
+                        mimeType = album.albumCover.mimeType
                     )
                 }
 

diff --git a/app/src/main/java/dev/leonlatsch/photok/imageloading/compose/EncryptedImageFetcher.kt b/app/src/main/java/dev/leonlatsch/photok/imageloading/compose/EncryptedImageFetcher.kt
@@ -19,12 +19,17 @@ package dev.leonlatsch.photok.imageloading.compose
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.ImageDecoder
+import android.graphics.Movie
+import android.os.Build
 import androidx.core.graphics.drawable.toDrawable
 import coil.decode.DataSource
+import coil.drawable.MovieDrawable
 import coil.fetch.DrawableResult
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import dev.leonlatsch.photok.imageloading.compose.model.EncryptedImageRequestData
+import dev.leonlatsch.photok.model.database.entity.PhotoType
 import dev.leonlatsch.photok.model.io.EncryptedStorageManager
 
 /**
@@ -38,15 +43,28 @@ class EncryptedImageFetcher(
     private val resources: Resources,
 ) : Fetcher {
 
+    @Suppress("DEPRECATION") // ImageDecoder is only available from API 28
     override suspend fun fetch(): FetchResult? {
         val inputStream = encryptedStorageManager.internalOpenEncryptedFileInput(requestData.internalFileName)
         inputStream ?: return null
 
-        val bitmap: Bitmap? = BitmapFactory.decodeStream(inputStream)
-        bitmap ?: return null
+        val drawable = if (requestData.mimeType == PhotoType.GIF.mimeType && requestData.playGif) {
+            if (Build.VERSION.SDK_INT >= 31) {
+                val bytes = inputStream.readBytes()
+                val source = ImageDecoder.createSource(bytes)
+                ImageDecoder.decodeDrawable(source)
+            } else {
+                val movie = Movie.decodeStream(inputStream)
+                MovieDrawable(movie)
+            }
+        } else {
+            val bitmap: Bitmap? = BitmapFactory.decodeStream(inputStream)
+            bitmap ?: return null
+            bitmap.toDrawable(resources)
+        }
 
         return DrawableResult(
-            drawable = bitmap.toDrawable(resources),
+            drawable = drawable,
             isSampled = false,
             dataSource = DataSource.DISK,
         )

diff --git a/...c/main/java/dev/leonlatsch/photok/imageloading/compose/model/EncryptedImageRequestData.kt b/...c/main/java/dev/leonlatsch/photok/imageloading/compose/model/EncryptedImageRequestData.kt
@@ -19,4 +19,5 @@ package dev.leonlatsch.photok.imageloading.compose.model
 data class EncryptedImageRequestData(
     val internalFileName: String,
     val mimeType: String,
+    val playGif: Boolean = false,
 )
diff --git a/app/src/main/java/dev/leonlatsch/photok/imageloading/di/ImageLoadingModule.kt b/app/src/main/java/dev/leonlatsch/photok/imageloading/di/ImageLoadingModule.kt
@@ -17,10 +17,7 @@
 package dev.leonlatsch.photok.imageloading.di
 
 import android.content.Context
-import android.os.Build.VERSION.SDK_INT
 import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
 import coil.request.CachePolicy
 import dagger.Module
 import dagger.Provides
@@ -41,11 +38,6 @@ object ImageLoadingModule {
     ): ImageLoader = ImageLoader.Builder(context)
         .components {
             add(encryptedImageFetcherFactory)
-            if (SDK_INT >= 28) {
-                add(ImageDecoderDecoder.Factory())
-            } else {
-                add(GifDecoder.Factory())
-            }
         }
         .diskCachePolicy(CachePolicy.DISABLED)
         .diskCache(null)

diff --git a/app/src/main/java/dev/leonlatsch/photok/imageviewer/ui/compose/PhotoViewHolderContent.kt b/app/src/main/java/dev/leonlatsch/photok/imageviewer/ui/compose/PhotoViewHolderContent.kt
@@ -60,8 +60,9 @@ fun PhotoViewHolderContent(
                 }
 
                 EncryptedImageRequestData(
-                    fileName,
-                    photo.type.mimeType,
+                    internalFileName = fileName,
+                    mimeType = photo.type.mimeType,
+                    playGif = true,
                 )
             }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
-#Sat Jun 01 10:22:31 UTC 2024
+#Wed Jul 03 08:11:08 UTC 2024
 android.nonTransitiveRClass=false
 kotlin.code.style=official
 kapt.incremental.apt=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.databinding.incremental=true
-appVersionName=1.7.1
+appVersionName=1.7.2
 org.gradle.jvmargs=-Xmx2048m
-appVersionCode=29
+appVersionCode=30
 android.useAndroidX=true
 android.enableJetifier=true