Use independent Modifier with constraints for plugins

skydoves · Aug 1, 2023 · 36d5cd6 · 36d5cd6
1 parent 238a8c9
commit 36d5cd6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/MainPosters.kt b/app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/MainPosters.kt
@@ -187,6 +187,7 @@ private fun ColorPalettes(palette: Palette?) {
         modifier = Modifier
           .padding(horizontal = 8.dp)
           .size(45.dp),
+        label = "ColorPalettes",
       ) {
         Box(
           modifier = Modifier

diff --git a/coil/src/main/kotlin/com/skydoves/landscapist/coil/CoilImage.kt b/coil/src/main/kotlin/com/skydoves/landscapist/coil/CoilImage.kt
@@ -224,7 +224,7 @@ public fun CoilImage(
 
       is CoilImageState.Loading -> {
         component.ComposeLoadingStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           executor = { size ->
             CoilThumbnail(
@@ -240,7 +240,7 @@ public fun CoilImage(
 
       is CoilImageState.Failure -> {
         component.ComposeFailureStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           reason = coilImageState.reason,
         )
@@ -249,7 +249,7 @@ public fun CoilImage(
 
       is CoilImageState.Success -> {
         component.ComposeSuccessStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageModel = imageRequest.invoke().data,
           imageOptions = imageOptions,
           imageBitmap = coilImageState.drawable?.toBitmap()

diff --git a/fresco/src/main/kotlin/com/skydoves/landscapist/fresco/FrescoImage.kt b/fresco/src/main/kotlin/com/skydoves/landscapist/fresco/FrescoImage.kt
@@ -132,7 +132,7 @@ public fun FrescoImage(
 
       is FrescoImageState.Loading -> {
         component.ComposeLoadingStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           executor = { size ->
             FrescoImageThumbnail(
@@ -148,7 +148,7 @@ public fun FrescoImage(
 
       is FrescoImageState.Failure -> {
         component.ComposeFailureStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           reason = frescoImageState.reason,
         )
@@ -157,7 +157,7 @@ public fun FrescoImage(
 
       is FrescoImageState.Success -> {
         component.ComposeSuccessStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageModel = imageUrl,
           imageOptions = imageOptions,
           imageBitmap = frescoImageState.imageBitmap,

diff --git a/glide/src/main/kotlin/com/skydoves/landscapist/glide/GlideImage.kt b/glide/src/main/kotlin/com/skydoves/landscapist/glide/GlideImage.kt
@@ -160,7 +160,7 @@ public fun GlideImage(
 
       is GlideImageState.Loading -> {
         component.ComposeLoadingStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           executor = { size ->
             GlideThumbnail(
@@ -178,7 +178,7 @@ public fun GlideImage(
 
       is GlideImageState.Failure -> {
         component.ComposeFailureStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageOptions = imageOptions,
           reason = glideImageState.reason,
         )
@@ -187,7 +187,7 @@ public fun GlideImage(
 
       is GlideImageState.Success -> {
         component.ComposeSuccessStatePlugins(
-          modifier = modifier,
+          modifier = Modifier.constraint(this),
           imageModel = imageModel,
           imageOptions = imageOptions,
           imageBitmap = glideImageState.data.toImageBitmap(