[fenix] For https://github.com/mozilla-mobile/fenix/issues/26061: Make sure favicons are cropped correctly

pull/600/head
Roger Yang 2 years ago committed by mergify[bot]
parent faef97dad4
commit fe505d58ad

@ -67,7 +67,7 @@ fun Favicon(
modifier = modifier modifier = modifier
.size(size) .size(size)
.clip(RoundedCornerShape(2.dp)), .clip(RoundedCornerShape(2.dp)),
contentScale = ContentScale.Fit contentScale = ContentScale.Crop,
) )
} }
} }

@ -164,7 +164,7 @@ private fun RecentBookmarkImage(bookmark: RecentBookmark) {
modifier = Modifier modifier = Modifier
.size(36.dp) .size(36.dp)
.clip(RoundedCornerShape(8.dp)), .clip(RoundedCornerShape(8.dp)),
contentScale = ContentScale.Fit contentScale = ContentScale.Crop,
) )
} }
} }

@ -159,7 +159,8 @@ private fun RecentTabItem(
RecentTabIcon( RecentTabIcon(
url = tab.state.content.url, url = tab.state.content.url,
modifier = Modifier.size(18.dp).clip(RoundedCornerShape(2.dp)), modifier = Modifier.size(18.dp).clip(RoundedCornerShape(2.dp)),
icon = tab.state.content.icon contentScale = ContentScale.Crop,
icon = tab.state.content.icon,
) )
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))

@ -19,11 +19,12 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<ImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/favicon" android:id="@+id/favicon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="8dp" android:padding="8dp"
android:scaleType="centerCrop"
android:importantForAccessibility="no" android:importantForAccessibility="no"
tools:src="@drawable/ic_folder_icon" /> tools:src="@drawable/ic_folder_icon" />
<ImageView <ImageView

@ -679,7 +679,7 @@
<style name="topSiteFavicon"> <style name="topSiteFavicon">
<item name="android:layout_width">@dimen/top_sites_favicon_size</item> <item name="android:layout_width">@dimen/top_sites_favicon_size</item>
<item name="android:layout_height">@dimen/top_sites_favicon_size</item> <item name="android:layout_height">@dimen/top_sites_favicon_size</item>
<item name="android:scaleType">fitCenter</item> <item name="android:scaleType">centerCrop</item>
<item name="android:layout_gravity">center</item> <item name="android:layout_gravity">center</item>
<item name="shapeAppearanceOverlay">@style/topSiteFaviconShape</item> <item name="shapeAppearanceOverlay">@style/topSiteFaviconShape</item>
</style> </style>

Loading…
Cancel
Save