Rollback integration/{compose,ktx}/{src,api}/ to 00251a5

The previous Compose integration was fairly buggy, so this rolls things
back to a "known good" state (commit 00251a5).

* rollback integration/{compose,ktx}/{src,api}/ to 00251a5, retaining
  some regression tests added since then (since we don't want the same bugs
  again).
* rollback build.gradle and settings.gradle files as needed to restore
  dependencies.
* remove nullability annotations from RequestListener.java to allow
  things to continue building.

Author: donaldchai

integration/compose/api/compose.api

@@ -1,25 +1,10 @@
-public final class com/bumptech/glide/integration/compose/CrossFade : com/bumptech/glide/integration/compose/Transition$Factory {
-	public static final field $stable I
-	public static final field Companion Lcom/bumptech/glide/integration/compose/CrossFade$Companion;
-	public fun <init> (Landroidx/compose/animation/core/AnimationSpec;)V
-	public fun build ()Lcom/bumptech/glide/integration/compose/Transition;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-}
-
-public final class com/bumptech/glide/integration/compose/CrossFade$Companion : com/bumptech/glide/integration/compose/Transition$Factory {
-	public fun build ()Lcom/bumptech/glide/integration/compose/Transition;
-}
-
 public abstract interface annotation class com/bumptech/glide/integration/compose/ExperimentalGlideComposeApi : java/lang/annotation/Annotation {
 }
 
 public final class com/bumptech/glide/integration/compose/GlideImageKt {
-	public static final fun GlideImage (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;FLandroidx/compose/ui/graphics/ColorFilter;Lcom/bumptech/glide/integration/compose/Placeholder;Lcom/bumptech/glide/integration/compose/Placeholder;Lcom/bumptech/glide/integration/compose/Transition$Factory;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V
-	public static final fun GlideSubcomposition (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun GlideImage (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;FLandroidx/compose/ui/graphics/ColorFilter;Lcom/bumptech/glide/integration/compose/Placeholder;Lcom/bumptech/glide/integration/compose/Placeholder;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun placeholder (I)Lcom/bumptech/glide/integration/compose/Placeholder;
 	public static final fun placeholder (Landroid/graphics/drawable/Drawable;)Lcom/bumptech/glide/integration/compose/Placeholder;
-	public static final fun placeholder (Landroidx/compose/ui/graphics/painter/Painter;)Lcom/bumptech/glide/integration/compose/Placeholder;
 	public static final fun placeholder (Lkotlin/jvm/functions/Function2;)Lcom/bumptech/glide/integration/compose/Placeholder;
 }
 
@@ -28,11 +13,6 @@ public abstract interface class com/bumptech/glide/integration/compose/GlidePrel
 	public abstract fun getSize ()I
 }
 
-public abstract interface class com/bumptech/glide/integration/compose/GlideSubcompositionScope {
-	public abstract fun getPainter ()Landroidx/compose/ui/graphics/painter/Painter;
-	public abstract fun getState ()Lcom/bumptech/glide/integration/compose/RequestState;
-}
-
 public abstract class com/bumptech/glide/integration/compose/Placeholder {
 	public static final field $stable I
 }
@@ -42,40 +22,3 @@ public final class com/bumptech/glide/integration/compose/PreloadKt {
 	public static final fun rememberGlidePreloadingData-u6VnWhU (ILkotlin/jvm/functions/Function1;JILjava/lang/Integer;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Lcom/bumptech/glide/integration/compose/GlidePreloadingData;
 }
 
-public abstract class com/bumptech/glide/integration/compose/RequestState {
-	public static final field $stable I
-}
-
-public final class com/bumptech/glide/integration/compose/RequestState$Failure : com/bumptech/glide/integration/compose/RequestState {
-	public static final field $stable I
-	public static final field INSTANCE Lcom/bumptech/glide/integration/compose/RequestState$Failure;
-}
-
-public final class com/bumptech/glide/integration/compose/RequestState$Loading : com/bumptech/glide/integration/compose/RequestState {
-	public static final field $stable I
-	public static final field INSTANCE Lcom/bumptech/glide/integration/compose/RequestState$Loading;
-}
-
-public final class com/bumptech/glide/integration/compose/RequestState$Success : com/bumptech/glide/integration/compose/RequestState {
-	public static final field $stable I
-	public fun <init> (Lcom/bumptech/glide/load/DataSource;)V
-	public final fun component1 ()Lcom/bumptech/glide/load/DataSource;
-	public final fun copy (Lcom/bumptech/glide/load/DataSource;)Lcom/bumptech/glide/integration/compose/RequestState$Success;
-	public static synthetic fun copy$default (Lcom/bumptech/glide/integration/compose/RequestState$Success;Lcom/bumptech/glide/load/DataSource;ILjava/lang/Object;)Lcom/bumptech/glide/integration/compose/RequestState$Success;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDataSource ()Lcom/bumptech/glide/load/DataSource;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract interface class com/bumptech/glide/integration/compose/Transition {
-	public abstract fun getDrawCurrent ()Lkotlin/jvm/functions/Function5;
-	public abstract fun getDrawPlaceholder ()Lkotlin/jvm/functions/Function5;
-	public abstract fun stop (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun transition (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/bumptech/glide/integration/compose/Transition$Factory {
-	public abstract fun build ()Lcom/bumptech/glide/integration/compose/Transition;
-}
-

integration/compose/build.gradle

@@ -59,12 +59,14 @@ dependencies {
     }
     implementation libs.compose.foundation
     implementation libs.compose.ui
+    implementation libs.drawablepainter
     implementation libs.androidx.core.ktx
     debugImplementation libs.compose.ui.testmanifest
     testImplementation libs.compose.ui.testmanifest
     testImplementation libs.compose.ui.testjunit4
     testImplementation libs.junit
     testImplementation libs.robolectric
+    testImplementation libs.androidx.appcompat
     testImplementation libs.androidx.junit
     testImplementation libs.androidx.test.runner
     androidTestImplementation libs.junit

integration/compose/src/androidTest/assets/glideImage_startsAnimatedDrawable_2.625_33.png

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalGlideComposeApi::class, ExperimentalCoroutinesApi::class)
+
 package com.bumptech.glide.integration.compose
 
 import android.graphics.Canvas
@@ -14,6 +16,7 @@ import com.bumptech.glide.integration.compose.test.Constants
 import com.bumptech.glide.integration.compose.test.GlideComposeRule
 import com.bumptech.glide.integration.compose.test.assertDisplaysInstance
 import com.bumptech.glide.integration.compose.test.onNodeWithDefaultContentDescription
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -25,7 +28,6 @@ import org.junit.runners.Parameterized
  *
  * Transformable types are tested in [GlideImageDefaultTransformationTest].
  */
-@OptIn(ExperimentalGlideComposeApi::class)
 @RunWith(Parameterized::class)
 class GlideImageCustomDrawableTransformationTest(
   private val contentScale: ContentScale,
@@ -34,8 +36,7 @@ class GlideImageCustomDrawableTransformationTest(
   // though it's only used by Parameters to create the test name.
   @Suppress("unused") private val name: String,
 ) {
-  @get:Rule
-  val glideComposeRule = GlideComposeRule()
+  @get:Rule val glideComposeRule = GlideComposeRule()
 
   @Test
   fun glideImage_nonBitmapDrawable_doesNotThrow() = runTest {
@@ -97,9 +98,8 @@ class GlideImageCustomDrawableTransformationTest(
 @Suppress("DeprecatedCallableAddReplaceWith")
 private open class FakeDrawable : Drawable() {
   override fun draw(p0: Canvas) {}
-  override fun setAlpha(p0: Int) {}
-  override fun setColorFilter(p0: ColorFilter?) {}
-
+  override fun setAlpha(p0: Int) = throw UnsupportedOperationException()
+  override fun setColorFilter(p0: ColorFilter?) = throw UnsupportedOperationException()
   @Deprecated("Deprecated in Java")
   override fun getOpacity(): Int = throw UnsupportedOperationException()
 }

integration/compose/src/androidTest/assets/glideImage_startsAnimatedDrawable_2.75_34.png

@@ -7,7 +7,9 @@
 package com.bumptech.glide.integration.compose
 
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.drawable.Drawable
+import android.util.TypedValue
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
@@ -26,6 +28,7 @@ import com.bumptech.glide.integration.ktx.ExperimentGlideFlows
 import com.bumptech.glide.integration.ktx.Resource
 import com.bumptech.glide.integration.ktx.Status
 import com.bumptech.glide.integration.ktx.flow
+import kotlin.math.roundToInt
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest

integration/compose/src/androidTest/assets/glideImage_withDrawBehind_drawsImageOnTopOfBackground_2.625_33.png

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalGlideComposeApi::class)
+
 package com.bumptech.glide.integration.compose
 
 import android.content.Context
@@ -7,7 +9,6 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.test.core.app.ApplicationProvider
 import com.bumptech.glide.integration.compose.test.GlideComposeRule
 import com.bumptech.glide.integration.compose.test.expectDisplayedDrawable
-import com.bumptech.glide.integration.compose.test.expectDisplayedPainter
 import com.bumptech.glide.integration.compose.test.expectDisplayedResource
 import com.bumptech.glide.integration.compose.test.expectNoDrawable
 import org.junit.Rule
@@ -17,12 +18,9 @@ import org.junit.Test
  * Avoids [com.bumptech.glide.load.engine.executor.GlideIdlingResourceInit] because we want to make
  * assertions about loads that have not yet completed.
  */
-@OptIn(ExperimentalGlideComposeApi::class)
 class GlideImageErrorTest {
   private val context: Context = ApplicationProvider.getApplicationContext()
-
-  @get:Rule
-  val glideComposeRule = GlideComposeRule()
+  @get:Rule val glideComposeRule = GlideComposeRule()
 
   @Test
   fun requestBuilderTransform_withErrorResourceId_displaysError() {
@@ -50,23 +48,6 @@ class GlideImageErrorTest {
       .assert(expectDisplayedDrawable(errorDrawable))
   }
 
-  @Test
-  fun loadingParameter_withError_isUsedWhenAllElseFails() {
-    val description = "test"
-    val resourceId = android.R.drawable.star_big_off
-    glideComposeRule.setContent {
-      GlideImage(
-        model = null,
-        contentDescription = description,
-        loading = placeholder(resourceId),
-      )
-    }
-
-    glideComposeRule
-      .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(context, resourceId))
-  }
-
   @Test
   fun failureParameter_withErrorResourceId_displaysError() {
     val description = "test"
@@ -75,14 +56,13 @@ class GlideImageErrorTest {
       GlideImage(
         model = null,
         contentDescription = description,
-        loading = placeholder(android.R.drawable.star_on), // arbitary; shouldn't be displayed.
         failure = placeholder(failureResourceId),
       )
     }
 
     glideComposeRule
       .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(context, failureResourceId))
+      .assert(expectDisplayedResource(failureResourceId))
   }
 
   @Test
@@ -99,7 +79,7 @@ class GlideImageErrorTest {
 
     glideComposeRule
       .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(failureDrawable))
+      .assert(expectDisplayedDrawable(failureDrawable))
   }
 
   @Test
@@ -117,41 +97,49 @@ class GlideImageErrorTest {
   }
 
   @Test
-  fun failure_setViaFailureParameterWithResourceId_andRequestBuilderTransform_prefersFailureParameter() {
-    val description = "test"
+  fun failureParameter_withComposable_displaysComposable() {
     val failureResourceId = android.R.drawable.star_big_off
+    val description = "test"
     glideComposeRule.setContent {
       GlideImage(
         model = null,
-        contentDescription = description,
-        failure = placeholder(failureResourceId),
-      ) {
-        it.error(android.R.drawable.btn_star)
-      }
+        contentDescription = "none",
+        failure =
+          placeholder {
+            // Nesting GlideImage is not really a good idea, but it's convenient for this test
+            // because
+            // we can use our helpers to assert on its contents.
+            GlideImage(
+              model = null,
+              contentDescription = description,
+              failure = placeholder(failureResourceId),
+            )
+          }
+      )
     }
 
     glideComposeRule
       .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(context, failureResourceId))
+      .assert(expectDisplayedResource(failureResourceId))
   }
 
   @Test
-  fun failure_setViaFailureParameterWithPainter_andRequestBuilderTransform_prefersFailurePainter() {
+  fun failure_setViaFailureParameterWithResourceId_andRequestBuilderTransform_prefersFailureParameter() {
     val description = "test"
-    val failurePainter = context.getDrawable(android.R.drawable.star_big_off).toPainter()
+    val failureResourceId = android.R.drawable.star_big_off
     glideComposeRule.setContent {
       GlideImage(
         model = null,
         contentDescription = description,
-        failure = placeholder(failurePainter),
+        failure = placeholder(failureResourceId),
       ) {
         it.error(android.R.drawable.btn_star)
       }
     }
 
     glideComposeRule
       .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(failurePainter))
+      .assert(expectDisplayedResource(failureResourceId))
   }
 
   @Test
@@ -170,7 +158,7 @@ class GlideImageErrorTest {
 
     glideComposeRule
       .onNodeWithContentDescription(description)
-      .assert(expectDisplayedPainter(failureDrawable))
+      .assert(expectDisplayedDrawable(failureDrawable))
   }
 
   @Test
@@ -188,4 +176,30 @@ class GlideImageErrorTest {
 
     glideComposeRule.onNodeWithContentDescription(description).assert(expectNoDrawable())
   }
+
+  @Test
+  fun failure_setViaFailureParameterWithComposable_andRequestBuilderTransform_showsComposable() {
+    val description = "test"
+    val failureResourceId = android.R.drawable.star_big_off
+    glideComposeRule.setContent {
+      GlideImage(
+        model = null,
+        contentDescription = "other",
+        failure =
+          placeholder {
+            GlideImage(
+              model = null,
+              contentDescription = description,
+              failure = placeholder(failureResourceId),
+            )
+          },
+      ) {
+        it.error(android.R.drawable.btn_star)
+      }
+    }
+
+    glideComposeRule
+      .onNodeWithContentDescription(description)
+      .assert(expectDisplayedResource(failureResourceId))
+  }
 }