Merge pull request #463 from qdsfdhvh/version_1.7.6

Version 1.7.6
qdsfdhvh · Feb 21, 2024 · 1a5ced6 · 1a5ced6
2 parents 030a9e3 + 8c1be43
commit 1a5ced6
Show file tree

Hide file tree

Showing 50 changed files with 665 additions and 376 deletions.
diff --git a/.github/workflows/Check.yml b/.github/workflows/Check.yml
@@ -83,7 +83,7 @@ jobs:
         run: ./gradlew test --stacktrace
 
       - name: Upload build reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-reports
           path: '**/build/reports'

diff --git a/.github/workflows/CompareScreenshot.yml b/.github/workflows/CompareScreenshot.yml
@@ -46,23 +46,23 @@ jobs:
         id: compare-screenshot-test
         run: ./gradlew compareRoborazzi --stacktrace --info
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot-diff
           path: |
             **/build/outputs/roborazzi
           retention-days: 30
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot-diff-reports
           path: |
             **/build/reports
           retention-days: 30
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot-diff-test-results
@@ -75,7 +75,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo ${{ github.event.number }} > ./pr/NR
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pr
           path: pr/
diff --git a/.github/workflows/StoreScreenshot.yml b/.github/workflows/StoreScreenshot.yml
@@ -41,23 +41,23 @@ jobs:
         id: record-test
         run: ./gradlew recordRoborazzi --stacktrace
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot
           path: |
             **/build/outputs/roborazzi
           retention-days: 30
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot-reports
           path: |
             **/build/reports
           retention-days: 30
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: screenshot-test-results

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/README.md b/README.md
@@ -17,17 +17,17 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-+                api("io.github.qdsfdhvh:image-loader:1.7.5")
++                api("io.github.qdsfdhvh:image-loader:1.7.6")
                 // optional - Moko Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.5")
++                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.6")
                 // optional - Blur Interceptor (only support bitmap)
-+                api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.5")
++                api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.6")
             }
         }
         val jvmMain by getting {
             dependencies {
                 // optional - ImageIO Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.5")
++                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.6")
             }
         }
     }
@@ -101,12 +101,18 @@ fun generateImageLoader(): ImageLoader {
             setupDefaultComponents()
         }
         interceptor {
-            // cache 100 success image result, without bitmap
-            defaultImageResultMemoryCache()
-            memoryCacheConfig {
-                // Set the max size to 25% of the app's available memory.
+            // cache 25% memory bitmap
+            bitmapMemoryCacheConfig {
                 maxSizePercent(context, 0.25)
             }
+            // cache 50 image
+            imageMemoryCacheConfig {
+                maxSize(50)
+            }
+            // cache 50 painter
+            painterMemoryCacheConfig {
+                maxSize(50)
+            }
             diskCacheConfig {
                 directory(context.cacheDir.resolve("image_cache").toOkioPath())
                 maxSizeBytes(512L * 1024 * 1024) // 512MB
@@ -125,10 +131,17 @@ fun generateImageLoader(): ImageLoader {
             setupDefaultComponents()
         }
         interceptor {
-            // cache 100 success image result, without bitmap
-            defaultImageResultMemoryCache()
-            memoryCacheConfig {
-                maxSizeBytes(32 * 1024 * 1024) // 32MB
+            // cache 32MB bitmap
+            bitmapMemoryCacheConfig {
+                maxSize(32 * 1024 * 1024) // 32MB
+            }
+            // cache 50 image
+            imageMemoryCacheConfig {
+                maxSize(50)
+            }
+            // cache 50 painter
+            painterMemoryCacheConfig {
+                maxSize(50)
             }
             diskCacheConfig {
                 directory(getCacheDir().toOkioPath().resolve("image_cache"))
@@ -156,10 +169,17 @@ fun generateImageLoader(): ImageLoader {
             setupDefaultComponents()
         }
        interceptor {
-           // cache 100 success image result, without bitmap
-           defaultImageResultMemoryCache()
-           memoryCacheConfig {
-               maxSizeBytes(32 * 1024 * 1024) // 32MB
+           // cache 32MB bitmap
+           bitmapMemoryCacheConfig {
+               maxSize(32 * 1024 * 1024) // 32MB
+           }
+           // cache 50 image
+           imageMemoryCacheConfig {
+               maxSize(50)
+           }
+           // cache 50 painter
+           painterMemoryCacheConfig {
+               maxSize(50)
            }
            diskCacheConfig {
                directory(getCacheDir().toPath().resolve("image_cache"))

diff --git a/app/android/benchmark/build.gradle.kts b/app/android/benchmark/build.gradle.kts
@@ -11,11 +11,6 @@ android {
     defaultConfig {
         minSdk = 23
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        // TODO temporary until AGP 8.2, which no longer requires this.
-        //  This is because when we update baseline profiles, we do them on emulators but they
-        //  run all tests.
-        testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"
     }
     buildTypes {
         // This benchmark buildType is used for benchmarking, and should function like your

diff --git a/app/android/src/main/java/com/seiko/imageloader/demo/MainActivity.kt b/app/android/src/main/java/com/seiko/imageloader/demo/MainActivity.kt
@@ -27,24 +27,32 @@ class MainActivity : ComponentActivity() {
             takeFrom(ImageLoader.createDefaultAndroid(applicationContext))
             commonConfig()
         }
-        // return ImageLoader {
-        //     commonConfig()
-        //     options {
-        //         androidContext(applicationContext)
-        //     }
-        //     components {
-        //         setupDefaultComponents()
-        //     }
-        //     interceptor {
-        //         memoryCacheConfig {
-        //             // Set the max size to 25% of the app's available memory.
-        //             maxSizePercent(applicationContext, 0.25)
+        //     return ImageLoader {
+        //         commonConfig()
+        //         options {
+        //             androidContext(applicationContext)
+        //         }
+        //         components {
+        //             setupDefaultComponents()
         //         }
-        //         diskCacheConfig {
-        //             directory(cacheDir.resolve("image_cache").toOkioPath())
-        //             maxSizeBytes(512L * 1024 * 1024) // 512MB
+        //         interceptor {
+        //             // cache 25% memory bitmap
+        //             bitmapMemoryCacheConfig {
+        //                 maxSizePercent(context, 0.25)
+        //             }
+        //             // cache 50 image
+        //             imageMemoryCacheConfig {
+        //                 maxSize(50)
+        //             }
+        //             // cache 50 painter
+        //             painterMemoryCacheConfig {
+        //                 maxSize(50)
+        //             }
+        //             diskCacheConfig {
+        //                 directory(cacheDir.resolve("image_cache").toOkioPath())
+        //                 maxSizeBytes(512L * 1024 * 1024) // 512MB
+        //             }
         //         }
         //     }
-        // }
     }
 }
diff --git a/app/android/src/release/generated/baselineProfiles/baseline-prof.txt b/app/android/src/release/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/LocalResourceScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/LocalResourceScene.kt
@@ -18,6 +18,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import com.seiko.imageloader.demo.MR
 import com.seiko.imageloader.model.ninePatch
+import io.github.qdsfdhvh.common.generated.resources.car_black
+import io.github.qdsfdhvh.common.generated.resources.cat
+import io.github.qdsfdhvh.common.generated.resources.chat_from_bg_normal_9
+import io.github.qdsfdhvh.common.generated.resources.collection_logo
 
 @Composable
 fun LocalResourceScene(

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/WanAndroidScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/WanAndroidScene.kt
@@ -23,6 +23,7 @@ import com.seiko.imageloader.demo.MR
 import com.seiko.imageloader.demo.util.JSON
 import com.seiko.imageloader.demo.util.httpEngine
 import com.seiko.imageloader.ui.AutoSizeImage
+import io.github.qdsfdhvh.common.generated.resources.cat
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation

diff --git a/app/common/src/iosMain/kotlin/com/seiko/imageloader/demo/Main.kt b/app/common/src/iosMain/kotlin/com/seiko/imageloader/demo/Main.kt
@@ -29,8 +29,17 @@ private fun generateImageLoader(): ImageLoader {
     //         setupDefaultComponents()
     //     }
     //     interceptor {
-    //         memoryCacheConfig {
-    //             maxSizeBytes(32 * 1024 * 1024) // 32MB
+    //         // cache 32MB bitmap
+    //         bitmapMemoryCacheConfig {
+    //             maxSize(32 * 1024 * 1024) // 32MB
+    //         }
+    //         // cache 50 image
+    //         imageMemoryCacheConfig {
+    //             maxSize(50)
+    //         }
+    //         // cache 50 painter
+    //         painterMemoryCacheConfig {
+    //             maxSize(50)
     //         }
     //         diskCacheConfig {
     //             directory(getCacheDir().toPath().resolve("image_cache"))

diff --git a/app/desktop/src/jvmMain/kotlin/com/seiko/imageloader/demo/Main.kt b/app/desktop/src/jvmMain/kotlin/com/seiko/imageloader/demo/Main.kt
@@ -8,6 +8,9 @@ import com.seiko.imageloader.ImageLoader
 import com.seiko.imageloader.LocalImageLoader
 import com.seiko.imageloader.component.setupDefaultComponents
 import com.seiko.imageloader.demo.util.commonConfig
+import com.seiko.imageloader.intercept.bitmapMemoryCacheConfig
+import com.seiko.imageloader.intercept.imageMemoryCacheConfig
+import com.seiko.imageloader.intercept.painterMemoryCacheConfig
 import okio.Path.Companion.toOkioPath
 import java.io.File
 
@@ -36,8 +39,17 @@ private fun generateImageLoader(): ImageLoader {
             setupDefaultComponents()
         }
         interceptor {
-            memoryCacheConfig {
-                maxSizeBytes(32 * 1024 * 1024) // 32MB
+            // cache 32MB bitmap
+            bitmapMemoryCacheConfig {
+                maxSize(32 * 1024 * 1024) // 32MB
+            }
+            // cache 50 image
+            imageMemoryCacheConfig {
+                maxSize(50)
+            }
+            // cache 50 painter
+            painterMemoryCacheConfig {
+                maxSize(50)
             }
             diskCacheConfig {
                 directory(getCacheDir().toOkioPath().resolve("image_cache"))

diff --git a/app/intellij-plugin/build.gradle.kts b/app/intellij-plugin/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.intellij") version "1.17.1"
+    id("org.jetbrains.intellij") version "1.17.2"
     java
     id("app.kotlin.jvm")
     id("app.compose.multiplatform")