PR feedback

Author: Jawnnypoo

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## [2.0.0] - March 16, 2022
+- Updates to support Coil 2.0
 
 ## [1.1.0 - 1.1.2] - January 14, 2022
 - Add `GrayscaleTransformation` and `BlurTransformation` which are removed from Coil 2.0

build.gradle.kts

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:7.1.2")
         classpath("org.jlleitschuh.gradle:ktlint-gradle:10.2.1")
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.19.0")
         classpath(kotlin("gradle-plugin", version = "1.6.10"))
     }
 }

gradle.properties

@@ -4,11 +4,12 @@ org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
 
 # Config
-minSdk=14
+minSdk=21
 targetSdk=31
 coilVersion=2.0.0-rc01
 
 GROUP=com.commit451.coiltransformations
+# Overwritten by CI
 VERSION_NAME=1.0.0
 
 POM_NAME=Transformations for Coil

sample/build.gradle.kts

@@ -1,4 +1,5 @@
 import coiltransformations.coilVersion
+import coiltransformations.minSdk
 import coiltransformations.targetSdk
 
 plugins {
@@ -11,7 +12,7 @@ android {
     compileSdk = project.targetSdk
     defaultConfig {
         applicationId = "com.commit451.coiltransformations.sample"
-        minSdk = 21
+        minSdk = project.minSdk
         targetSdk = project.targetSdk
         versionCode = 1
         versionName = "1.0.0"
@@ -33,8 +34,6 @@ android {
     }
 }
 
-val lifecycleVersion = "2.0.0"
-
 dependencies {
     implementation(project(":transformations"))
     implementation(project(":transformations-gpu"))
@@ -44,9 +43,9 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.lifecycle:lifecycle-extensions:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-livedata:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
 
     implementation("com.google.android.material:material:1.5.0")

sample/src/main/java/com/commit451/coiltransformations/sample/App.kt

@@ -6,18 +6,20 @@ import android.app.Application
 import android.util.Log
 import coil.Coil
 import coil.ImageLoader
+import coil.ImageLoaderFactory
 import coil.memory.MemoryCache
 import coil.util.DebugLogger
 
 class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        val imageLoader = ImageLoader.Builder(this)
-            .logger(DebugLogger(level = Log.DEBUG))
-            .memoryCache(MemoryCache.Builder(this).maxSizePercent(0.5).build())
-            .crossfade(true)
-            .build()
-        Coil.setImageLoader(imageLoader)
+        Coil.setImageLoader {
+            ImageLoader.Builder(this)
+                .logger(DebugLogger(level = Log.DEBUG))
+                .memoryCache(MemoryCache.Builder(this).maxSizePercent(0.5).build())
+                .crossfade(true)
+                .build()
+        }
     }
 }

transformations/src/main/java/com/commit451/coiltransformations/SquareCropTransformation.kt

@@ -13,7 +13,10 @@ class SquareCropTransformation : Transformation {
     override val cacheKey: String = SquareCropTransformation::class.java.name
 
     override suspend fun transform(input: Bitmap, size: Size): Bitmap {
-        val largerSize = max(input.width, input.height)
+        val largerSize = max(
+            size.width.pxOrElse { input.width },
+            size.height.pxOrElse { input.height }
+        )
         return Util.centerCrop(input, largerSize, largerSize)
     }
 }

transformations/src/main/java/com/commit451/coiltransformations/ext.kt

@@ -0,0 +1,11 @@
+package com.commit451.coiltransformations
+
+import coil.size.Dimension
+
+/**
+ * If this is a [Dimension.Pixels] value, return its number of pixels. Else, invoke and return
+ * the value from [block].
+ */
+internal inline fun Dimension.pxOrElse(block: () -> Int): Int {
+    return if (this is Dimension.Pixels) px else block()
+}