From 1b01210e75111b23c5f3fd4b00d7969383b95214 Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Thu, 25 Aug 2022 16:24:11 -0400 Subject: [PATCH] [fenix] Close https://github.com/mozilla-mobile/fenix/issues/26666: Use correct content scale when displaying recent tab thumbnail and icon --- .../main/java/org/mozilla/fenix/compose/ThumbnailCard.kt | 2 +- .../org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt index 07e9f6bf0e..dec6f8e368 100644 --- a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt +++ b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt @@ -88,7 +88,7 @@ fun ThumbnailCard( modifier = Modifier .size(36.dp) .clip(RoundedCornerShape(8.dp)), - contentScale = ContentScale.Fit + contentScale = contentScale ) } } diff --git a/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt b/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt index 0167233d1f..d6b778b309 100644 --- a/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt +++ b/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt @@ -126,7 +126,8 @@ private fun RecentTabItem( tab = tab, modifier = Modifier .size(108.dp, 80.dp) - .clip(RoundedCornerShape(8.dp)) + .clip(RoundedCornerShape(8.dp)), + contentScale = ContentScale.Crop, ) Spacer(modifier = Modifier.width(16.dp)) @@ -214,7 +215,8 @@ fun RecentTabImage( else -> ThumbnailCard( url = tab.state.content.url, key = tab.state.id, - modifier = modifier + modifier = modifier, + contentScale = contentScale, ) } } @@ -305,7 +307,7 @@ private fun RecentTabIcon( painter = icon.painter, contentDescription = null, modifier = modifier, - contentScale = ContentScale.Fit + contentScale = contentScale, ) } }