From 8054f6e5c4bf8df11a9fab090b3df789183ee9bf Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 18 May 2024 00:15:15 +0200 Subject: [PATCH] Don't show wikipedia image if it's empty --- .../launcher/search/wikipedia/ArticleItem.kt | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/ArticleItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/ArticleItem.kt index b87ee6d5..41a0a7ca 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/ArticleItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/ArticleItem.kt @@ -112,7 +112,10 @@ fun ArticleItem( this@AnimatedContent, resizeMode = SharedTransitionScope.ResizeMode.RemeasureToBounds ) - .background(MaterialTheme.colorScheme.secondaryContainer, MaterialTheme.shapes.small) + .background( + MaterialTheme.colorScheme.secondaryContainer, + MaterialTheme.shapes.small + ) .clip(MaterialTheme.shapes.small), model = article.imageUrl, contentScale = ContentScale.Crop, @@ -124,7 +127,8 @@ fun ArticleItem( modifier = Modifier.padding(horizontal = 16.dp), ) { Text( - modifier = Modifier.padding(bottom = 24.dp) + modifier = Modifier + .padding(bottom = 24.dp) .sharedBounds( rememberSharedContentState("summary"), this@AnimatedContent, @@ -134,20 +138,23 @@ fun ArticleItem( ) } } else { - AsyncImage( - modifier = Modifier - .fillMaxWidth() - .aspectRatio(16f / 9f) - .sharedBounds( - rememberSharedContentState("image"), - this@AnimatedContent, - resizeMode = SharedTransitionScope.ResizeMode.RemeasureToBounds - ) - .background(MaterialTheme.colorScheme.secondaryContainer), - model = ImageRequest.Builder(context).data(article.imageUrl).crossfade(false).build(), - contentScale = ContentScale.Crop, - contentDescription = null - ) + if (!article.imageUrl.isNullOrEmpty()) { + AsyncImage( + modifier = Modifier + .fillMaxWidth() + .aspectRatio(16f / 9f) + .sharedBounds( + rememberSharedContentState("image"), + this@AnimatedContent, + resizeMode = SharedTransitionScope.ResizeMode.RemeasureToBounds + ) + .background(MaterialTheme.colorScheme.secondaryContainer), + model = ImageRequest.Builder(context).data(article.imageUrl) + .crossfade(false).build(), + contentScale = ContentScale.Crop, + contentDescription = null + ) + } Column( modifier = Modifier.padding( @@ -186,7 +193,8 @@ fun ArticleItem( color = MaterialTheme.colorScheme.secondary ) Text( - modifier = Modifier.padding(vertical = 16.dp) + modifier = Modifier + .padding(vertical = 16.dp) .sharedBounds( rememberSharedContentState("summary"), this@AnimatedContent,