Use own cache for bitmaps instead of coil (#265)

* Use own cache for bitmaps instead of coil * Fix detekt
michaeltroger · May 24, 2024 · 41cfaa9 · 41cfaa9
1 parent 07de196
commit 41cfaa9
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 17 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
     implementation(libs.com.github.lisawray.groupie)
     implementation(libs.com.github.lisawray.groupie.viewbinding)
     implementation(libs.com.google.android.material)
-    implementation(libs.io.coil)
     implementation(libs.io.github.panpf.zoomimage.view)
 
     testImplementation(libs.androidx.test.ext.junit.ktx)

diff --git a/app/src/main/java/com/michaeltroger/gruenerpass/GreenPassApplication.kt b/app/src/main/java/com/michaeltroger/gruenerpass/GreenPassApplication.kt
@@ -1,6 +1,7 @@
 package com.michaeltroger.gruenerpass
 
 import android.app.Application
+import com.michaeltroger.gruenerpass.cache.BitmapCache
 import com.michaeltroger.gruenerpass.migration.AppMigrator
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
@@ -15,4 +16,9 @@ class GreenPassApplication : Application() {
         super.onCreate()
         appMigrator.performMigration()
     }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        BitmapCache.memoryCache.evictAll()
+    }
 }
diff --git a/app/src/main/java/com/michaeltroger/gruenerpass/cache/BitmapCache.kt b/app/src/main/java/com/michaeltroger/gruenerpass/cache/BitmapCache.kt
@@ -0,0 +1,23 @@
+package com.michaeltroger.gruenerpass.cache
+
+import android.graphics.Bitmap
+import android.util.LruCache
+
+object BitmapCache {
+    @Suppress("MagicNumber")
+    val memoryCache: LruCache<String, Bitmap> by lazy {
+        val maxMemory = (Runtime.getRuntime().maxMemory() / 1024).toInt()
+
+        // Use 1/8th of the available memory for this memory cache.
+        val cacheSize = maxMemory / 8
+
+        object : LruCache<String, Bitmap>(cacheSize) {
+
+            override fun sizeOf(key: String, bitmap: Bitmap): Int {
+                // The cache size will be measured in kilobytes rather than
+                // number of items.
+                return bitmap.byteCount / 1024
+            }
+        }
+    }
+}
diff --git a/...c/main/java/com/michaeltroger/gruenerpass/certificates/pager/item/partials/PdfPageItem.kt b/...c/main/java/com/michaeltroger/gruenerpass/certificates/pager/item/partials/PdfPageItem.kt
@@ -4,10 +4,9 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.view.View
 import androidx.core.view.isVisible
-import coil.imageLoader
-import coil.memory.MemoryCache
 import com.michaeltroger.gruenerpass.R
 import com.michaeltroger.gruenerpass.barcode.BarcodeRenderer
+import com.michaeltroger.gruenerpass.cache.BitmapCache
 import com.michaeltroger.gruenerpass.databinding.ItemCertificatePartialPdfPageBinding
 import com.xwray.groupie.Item
 import com.xwray.groupie.viewbinding.BindableItem
@@ -38,8 +37,8 @@ class PdfPageItem(
 
     private var job: Job? = null
 
-    private val barcodeCacheKey = MemoryCache.Key("barcode-$fileName-$pageIndex")
-    private val pdfCacheKey = MemoryCache.Key("pdf-$fileName-$pageIndex")
+    private val barcodeCacheKey = "barcode-$fileName-$pageIndex"
+    private val pdfCacheKey = "pdf-$fileName-$pageIndex"
 
     override fun initializeViewBinding(view: View): ItemCertificatePartialPdfPageBinding
         = ItemCertificatePartialPdfPageBinding.bind(view)
@@ -49,11 +48,10 @@ class PdfPageItem(
     override fun bind(viewBinding: ItemCertificatePartialPdfPageBinding, position: Int) {
         job = scope.launch {
             val context = viewBinding.root.context
-            val imageLoader = context.imageLoader
 
-            var pdf: Bitmap? = imageLoader.memoryCache?.get(pdfCacheKey)?.bitmap
+            var pdf: Bitmap? = BitmapCache.memoryCache.get(pdfCacheKey)
             if(!isActive) return@launch
-            var barcode: Bitmap? = imageLoader.memoryCache?.get(barcodeCacheKey)?.bitmap
+            var barcode: Bitmap? = BitmapCache.memoryCache.get(barcodeCacheKey)
             if(!isActive) return@launch
 
             if (pdf == null) {
@@ -63,14 +61,14 @@ class PdfPageItem(
                 if(!isActive) return@launch
 
                 if (barcode != null) {
-                    imageLoader.memoryCache?.set(
+                    BitmapCache.memoryCache.put(
                         barcodeCacheKey,
-                        MemoryCache.Value(barcode)
+                        barcode
                     )
                 }
-                imageLoader.memoryCache?.set(
+                BitmapCache.memoryCache.put(
                     pdfCacheKey,
-                    MemoryCache.Value(pdf)
+                    pdf
                 )
                 if(!isActive) return@launch
             }

diff --git a/app/src/main/java/com/michaeltroger/gruenerpass/settings/SettingsFragment.kt b/app/src/main/java/com/michaeltroger/gruenerpass/settings/SettingsFragment.kt
@@ -8,8 +8,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
-import coil.imageLoader
 import com.michaeltroger.gruenerpass.R
+import com.michaeltroger.gruenerpass.cache.BitmapCache
 import com.michaeltroger.gruenerpass.lock.AppLockedRepo
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
@@ -49,11 +49,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
             if (!preferenceBarcode.isChecked) {
                 preferenceTryHard.isChecked = false
             }
-            requireContext().imageLoader.memoryCache?.clear()
+            BitmapCache.memoryCache.evictAll()
             true
         }
         preferenceTryHard.setOnPreferenceClickListener {
-            requireContext().imageLoader.memoryCache?.clear()
+            BitmapCache.memoryCache.evictAll()
             true
         }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,6 @@ com-google-dagger-hilt-android = "2.51.1"
 com-google-devtools-ksp = "1.9.23-1.0.20"
 com-squareup-leakcanary-android = "2.13"
 com-tom-roush-pdfbox-android = "2.0.27.0"
-io-coil = "2.6.0"
 io-gitlab-arturbosch-detekt = "1.23.6"
 io-github-panpf-zoomimage-view = "1.0.2"
 io-kotest-assertions-core = "5.8.1"
@@ -63,7 +62,6 @@ com-google-dagger-hilt-android = { module = "com.google.dagger:hilt-android", ve
 com-google-dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "com-google-dagger-hilt-android" }
 com-squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary-android" }
 com-tom-roush-pdfbox-android = { module = "com.tom-roush:pdfbox-android", version.ref = "com-tom-roush-pdfbox-android" }
-io-coil = { module = "io.coil-kt:coil", version.ref = "io-coil" }
 io-github-panpf-zoomimage-view = { module = "io.github.panpf.zoomimage:zoomimage-view", version.ref = "io-github-panpf-zoomimage-view" }
 io-kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "io-kotest-assertions-core" }
 io-mockk = { module = "io.mockk:mockk", version.ref = "io-mockk" }