google · chrisbanes · Sep 26, 2020 · Sep 24, 2020 · Sep 25, 2020 · Sep 25, 2020
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,8 @@ docs/index.md
 docs/contributing.md
 docs/coil.md
 docs/coil/
+docs/picasso.md
+docs/picasso/
 # Mkdocs temporary serving folder
 site
 *.bak
diff --git a/README.md b/README.md
@@ -3,22 +3,11 @@
 Accompanist is a group of libraries that contains some utilities which I've found myself copying around projects which use [Jetpack Compose][compose]. Currently, it contains:
 
 🖼️ [Coil image loading composables](./coil/README.md)
+🖼️ [Picasso image loading composables](./picasso/README.md)
 
 [Jetpack Compose][compose] is a fast-moving project and I'll be updating these libraries to match the
 latest tagged release as quickly as possible. Each [release listing](https://github.com/chrisbanes/accompanist/releases) will outline what version of Compose libraries it depends on.
 
-## Download
-
-```groovy
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation "dev.chrisbanes.accompanist:accompanist-coil:<version>"
-}
-```
-
 ### Accompanist Snapshots
 
 Snapshots of the current development version of Accompanist are available, which track the latest commit. See [here](docs/using-snapshot-version.md) for more information. 

diff --git a/build.gradle b/build.gradle
@@ -141,6 +141,10 @@ subprojects {
                             packageListUrl.set(new URL("file://$rootDir/package-list-coil-base"))
                         }
                     }
+                    externalDocumentationLink {
+                        url.set(new URL("https://square.github.io/picasso/2.x/picasso/"))
+                        packageListUrl.set(new URL("https://square.github.io/picasso/2.x/picasso/package-list"))
+                    }
                 }
             }
         }

diff --git a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -92,7 +92,12 @@ object Libs {
         const val gif = "io.coil-kt:coil-gif:$version"
     }
 
+    const val picasso = "com.squareup.picasso:picasso:2.8"
+
     const val truth = "com.google.truth:truth:1.0.1"
 
-    const val mockWebServer = "com.squareup.okhttp3:mockwebserver:3.12.2"
+    object OkHttp {
+        const val okhttp = "com.squareup.okhttp3:okhttp:3.12.2"
+        const val mockWebServer = "com.squareup.okhttp3:mockwebserver:3.12.2"
+    }
 }
diff --git a/coil/README.md b/coil/README.md
@@ -65,9 +65,9 @@ CoilImage(
 )
 ```
 
-### Custom layout
+## Custom content
 
-If you need more control over the animation, you can use the `content` composable version of `CoilImage`, to display the result in a `MaterialLoadingImage`:
+If you need more control over the animation, or you want to provide custom layout for the loaded image, you can use the `content` composable version of `CoilImage`:
 
 ``` kotlin
 CoilImage(
@@ -86,7 +86,6 @@ CoilImage(
         ImageLoadState.Empty -> /* TODO */
     }
 }
-```
 
 ## GIFs
 

diff --git a/coil/build.gradle b/coil/build.gradle
@@ -87,7 +87,7 @@ dependencies {
     androidTestImplementation Libs.junit
     androidTestImplementation Libs.truth
 
-    androidTestImplementation Libs.mockWebServer
+    androidTestImplementation Libs.OkHttp.mockWebServer
 
     androidTestImplementation Libs.Coroutines.test
 

diff --git a/coil/src/androidTest/AndroidManifest.xml b/coil/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="dev.chrisbanes.accompanist.coil.test">
 
-    <uses-sdk android:targetSdkVersion="29" />
+    <uses-sdk android:targetSdkVersion="30" />
 
     <!-- Needed for MockWebServer -->
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt
@@ -58,6 +58,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.withTimeout
 import kotlinx.coroutines.withTimeoutOrNull
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
@@ -244,7 +245,9 @@ class CoilTest {
 
         // Await the first load
         runBlocking {
-            loadCompleteSignal.receive()
+            withTimeout(5000) {
+                loadCompleteSignal.receive()
+            }
         }
 
         // Assert that the content is completely Red
@@ -259,7 +262,11 @@ class CoilTest {
         drawableResId.value = R.drawable.blue_rectangle
 
         // Await the second load
-        runBlocking { loadCompleteSignal.receive() }
+        runBlocking {
+            withTimeout(5000) {
+                loadCompleteSignal.receive()
+            }
+        }
 
         // Assert that the content is completely Blue
         composeTestRule.onNodeWithTag(CoilTestTags.Image)
@@ -282,7 +289,7 @@ class CoilTest {
         composeTestRule.setContent {
             val size = sizeFlow.collectAsState()
             CoilImage(
-                data = resourceUri(R.drawable.blue_rectangle),
+                data = resourceUri(R.drawable.red_rectangle),
                 modifier = Modifier.preferredSize(size.value).testTag(CoilTestTags.Image),
                 onRequestCompleted = { loadCompleteSignal.offer(Unit) }
             )

diff --git a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt
@@ -36,6 +36,8 @@ import coil.imageLoader
 import coil.request.ImageRequest
 import coil.request.ImageResult
 import dev.chrisbanes.accompanist.imageloading.DataSource
+import dev.chrisbanes.accompanist.imageloading.DefaultRefetchOnSizeChangeLambda
+import dev.chrisbanes.accompanist.imageloading.EmptyRequestCompleteLambda
 import dev.chrisbanes.accompanist.imageloading.ImageLoad
 import dev.chrisbanes.accompanist.imageloading.ImageLoadState
 import dev.chrisbanes.accompanist.imageloading.MaterialLoadingImage
@@ -74,8 +76,8 @@ fun CoilImage(
     modifier: Modifier = Modifier,
     requestBuilder: (ImageRequest.Builder.(size: IntSize) -> ImageRequest.Builder)? = null,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     content: @Composable (imageLoadState: ImageLoadState) -> Unit
 ) {
     CoilImage(
@@ -123,8 +125,8 @@ fun CoilImage(
     modifier: Modifier = Modifier,
     requestBuilder: (ImageRequest.Builder.(size: IntSize) -> ImageRequest.Builder)? = null,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     content: @Composable (imageLoadState: ImageLoadState) -> Unit
 ) {
     ImageLoad(
@@ -210,8 +212,8 @@ fun CoilImage(
     fadeIn: Boolean = false,
     requestBuilder: (ImageRequest.Builder.(size: IntSize) -> ImageRequest.Builder)? = null,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     error: @Composable ((ImageLoadState.Error) -> Unit)? = null,
     loading: @Composable (() -> Unit)? = null,
 ) {
@@ -283,8 +285,8 @@ fun CoilImage(
     fadeIn: Boolean = false,
     requestBuilder: (ImageRequest.Builder.(size: IntSize) -> ImageRequest.Builder)? = null,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     error: @Composable ((ImageLoadState.Error) -> Unit)? = null,
     loading: @Composable (() -> Unit)? = null,
 ) {
@@ -372,7 +374,3 @@ internal fun Any.toImageRequest(): ImageRequest {
         remember(this) { ImageRequest.Builder(context).data(this).build() }
     }
 }
-
-internal val emptySuccessLambda: (ImageLoadState) -> Unit = {}
-
-internal val defaultRefetchOnSizeChangeLambda: (ImageLoadState, IntSize) -> Boolean = { _, _ -> false }
diff --git a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Crossfade.kt b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Crossfade.kt
@@ -28,6 +28,8 @@ import androidx.compose.ui.unit.IntSize
 import coil.ImageLoader
 import coil.imageLoader
 import coil.request.ImageRequest
+import dev.chrisbanes.accompanist.imageloading.DefaultRefetchOnSizeChangeLambda
+import dev.chrisbanes.accompanist.imageloading.EmptyRequestCompleteLambda
 import dev.chrisbanes.accompanist.imageloading.ImageLoadState
 import dev.chrisbanes.accompanist.imageloading.MaterialLoadingImage
 
@@ -64,8 +66,8 @@ fun CoilImageWithCrossfade(
     contentScale: ContentScale = ContentScale.Fit,
     crossfadeDuration: Int = DefaultTransitionDuration,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     error: @Composable ((ImageLoadState.Error) -> Unit)? = null,
     loading: @Composable (() -> Unit)? = null
 ) {
@@ -115,8 +117,8 @@ fun CoilImageWithCrossfade(
     contentScale: ContentScale = ContentScale.Fit,
     crossfadeDuration: Int = DefaultTransitionDuration,
     imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     error: @Composable ((ImageLoadState.Error) -> Unit)? = null,
     loading: @Composable (() -> Unit)? = null
 ) {

diff --git a/generate_docs.sh b/generate_docs.sh
@@ -22,9 +22,13 @@ sed -i.bak 's/images\/social.png/header.png/' docs/index.md
 cp coil/README.md docs/coil.md
 mkdir -p docs/coil
 cp coil/images/crossfade.gif docs/coil/crossfade.gif
-
 sed -i.bak 's/images\/crossfade.gif/crossfade.gif/' docs/coil.md
 
+cp picasso/README.md docs/picasso.md
+mkdir -p docs/picasso
+cp picasso/images/crossfade.gif docs/picasso/crossfade.gif
+sed -i.bak 's/images\/crossfade.gif/crossfade.gif/' docs/picasso.md
+
 # Convert docs/xxx.md links to just xxx/
 sed -i.bak 's/docs\/\([a-zA-Z-]*\).md/\1/' docs/index.md
 

diff --git a/imageloading-core/api/imageloading-core.api b/imageloading-core/api/imageloading-core.api
@@ -16,7 +16,9 @@ public final class dev/chrisbanes/accompanist/imageloading/DataSource : java/lan
 }
 
 public final class dev/chrisbanes/accompanist/imageloading/ImageLoad {
-	public static final fun ImageLoad (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun ImageLoad (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun getDefaultRefetchOnSizeChangeLambda ()Lkotlin/jvm/functions/Function2;
+	public static final fun getEmptyRequestCompleteLambda ()Lkotlin/jvm/functions/Function1;
 }
 
 public abstract class dev/chrisbanes/accompanist/imageloading/ImageLoadState {

diff --git a/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt b/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt
@@ -46,23 +46,27 @@ import kotlinx.coroutines.flow.flow
  * @param request The request to execute.
  * @param executeRequest Suspending lambda to execute an image loading request.
  * @param modifier [Modifier] used to adjust the layout algorithm or draw decoration content.
+ * @param requestKey The object to key this request on. If the request type supports equality then
+ * the default value will work. Otherwise pass in the `data` value.
+ * @param modifier [Modifier] used to adjust the layout algorithm or draw decoration content.
  * @param transformRequestForSize Optionally transform [request] for the given [IntSize].
  * @param shouldRefetchOnSizeChange Lambda which will be invoked when the size changes, allowing
  * optional re-fetching of the image. Return true to re-fetch the image.
  * @param onRequestCompleted Listener which will be called when the loading request has finished.
  * @param content Content to be displayed for the given state.
  */
 @Composable
-fun <T> ImageLoad(
+fun <T : Any> ImageLoad(
     request: T,
     executeRequest: suspend (T) -> ImageLoadState,
     modifier: Modifier = Modifier,
+    requestKey: Any = request,
     transformRequestForSize: (T, IntSize) -> T? = { r, _ -> r },
-    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
-    onRequestCompleted: (ImageLoadState) -> Unit = emptySuccessLambda,
+    shouldRefetchOnSizeChange: (currentResult: ImageLoadState, size: IntSize) -> Boolean = DefaultRefetchOnSizeChangeLambda,
+    onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda,
     content: @Composable (imageLoadState: ImageLoadState) -> Unit
 ) {
-    var state by stateFor<ImageLoadState>(request) { ImageLoadState.Empty }
+    var state by stateFor<ImageLoadState>(requestKey) { ImageLoadState.Empty }
 
     // This may look a little weird, but allows the launchInComposition callback to always
     // invoke the last provided [onRequestCompleted].
@@ -77,7 +81,7 @@ fun <T> ImageLoad(
     val callback = remember { mutableStateOf(onRequestCompleted, referentialEqualityPolicy()) }
     callback.value = onRequestCompleted
 
-    val requestActor = remember(request) {
+    val requestActor = remember(requestKey) {
         ImageLoadRequestActor(executeRequest)
     }
 
@@ -142,6 +146,12 @@ private fun <T> ImageLoadRequestActor(
     }
 }
 
-internal val emptySuccessLambda: (ImageLoadState) -> Unit = {}
+/**
+ * Empty lamdba for use in the `onRequestCompleted` parameter.
+ */
+val EmptyRequestCompleteLambda: (ImageLoadState) -> Unit = {}
 
-internal val defaultRefetchOnSizeChangeLambda: (ImageLoadState, IntSize) -> Boolean = { _, _ -> false }
+/**
+ * Default lamdba for use in the `shouldRefetchOnSizeChange` parameter.
+ */
+val DefaultRefetchOnSizeChangeLambda: (ImageLoadState, IntSize) -> Boolean = { _, _ -> false }
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,12 +13,15 @@ repo_url: 'https://github.com/chrisbanes/accompanist'
 nav:
   - 'Overview': index.md
   - 'Coil': coil.md
+  - 'Picasso': picasso.md
   - 'API':
     - 'Coil': api/coil/index.md
+    - 'Picasso': api/picasso/index.md
+    - 'Image Loading Core': api/imageloading-core/index.md
   - 'Snapshots': using-snapshot-version.md
   - 'Contributing': contributing.md
   - 'Maintainers':
-      - 'Update guide': updating.md
+    - 'Update guide': updating.md
 
 # Configuration
 theme: