Merge pull request #8 from GetStream/landscapist/2.0.1

Migrate landscapist to 2.0.1

Author: skydoves

core-designsystem/build.gradle.kts

@@ -22,6 +22,8 @@ plugins {
 dependencies {
   // image loading
   api(libs.landscapist.glide)
+  api(libs.landscapist.animation)
+  api(libs.landscapist.placeholder)
 
   api(libs.androidx.compose.runtime)
   api(libs.androidx.compose.ui)

core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt

@@ -26,7 +26,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.skydoves.landscapist.Shimmer
+import com.skydoves.landscapist.placeholder.shimmer.Shimmer
 import io.getstream.whatsappclone.designsystem.theme.shimmerHighLight
 
 @Composable

feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt

@@ -56,7 +56,7 @@ fun WhatsAppCallHistory(
         modifier = Modifier
           .size(56.dp)
           .clip(CircleShape),
-        imageModel = whatsAppUser.picture,
+        imageModel = { whatsAppUser.picture },
         previewPlaceholder = io.getstream.whatsappclone.designsystem.R.drawable.placeholder
       )
 

feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt

@@ -53,7 +53,7 @@ fun WhatsAppCallHistoryInfoBody(
           start.linkTo(parent.start)
           top.linkTo(parent.top)
         },
-      imageModel = whatsAppUser.picture,
+      imageModel = { whatsAppUser.picture },
       previewPlaceholder = R.drawable.placeholder
     )
 

feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt

@@ -35,6 +35,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.skydoves.landscapist.animation.crossfade.CrossfadePlugin
+import com.skydoves.landscapist.components.rememberImageComponent
 import com.skydoves.landscapist.glide.GlideImage
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.whatsappclone.designsystem.component.WhatsAppLoadingIndicator
@@ -114,8 +116,13 @@ private fun WhatsAppMessageUserInfo(
           modifier = Modifier
             .size(32.dp)
             .clip(CircleShape),
-          imageModel = messageUiState.data.image.takeIf { it.isNotEmpty() }
-            ?: io.getstream.whatsappclone.designsystem.R.drawable.stream_logo,
+          imageModel = {
+            messageUiState.data.image.takeIf { it.isNotEmpty() }
+              ?: io.getstream.whatsappclone.designsystem.R.drawable.stream_logo
+          },
+          component = rememberImageComponent {
+            +CrossfadePlugin()
+          },
           previewPlaceholder = io.getstream.whatsappclone.designsystem.R.drawable.placeholder
         )
 

feature-status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt

@@ -62,7 +62,7 @@ fun WhatsAppStatus() {
           modifier = Modifier
             .size(56.dp)
             .clip(CircleShape),
-          imageModel = "https://placekitten.com/200/300",
+          imageModel = { "https://placekitten.com/200/300" },
           previewPlaceholder = io.getstream.whatsappclone.designsystem.R.drawable.placeholder
         )
 

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 streamChatSDK = "5.11.1"
 sealedx = "1.0.0"
-landscapist = "1.6.1"
+landscapist = "2.0.1"
 accompanist = "0.25.0"
 androidDesugarJdkLibs = "1.1.5"
 androidGradlePlugin = "7.3.0"
@@ -46,6 +46,8 @@ stream-compose = { group = "io.getstream", name = "stream-chat-android-compose",
 sealedx-core = { group = "com.github.skydoves", name = "sealedx-core", version.ref = "sealedx" }
 sealedx-processor = { group = "com.github.skydoves", name = "sealedx-processor", version.ref = "sealedx" }
 landscapist-glide = { group = "com.github.skydoves", name = "landscapist-glide", version.ref = "landscapist" }
+landscapist-animation = { group = "com.github.skydoves", name = "landscapist-animation", version.ref = "landscapist" }
+landscapist-placeholder = { group = "com.github.skydoves", name = "landscapist-placeholder", version.ref = "landscapist" }
 accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
 accompanist-indicator = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }