From fe505d58add991d7d9b73de93d6e348bb6eee132 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Wed, 27 Jul 2022 17:00:23 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/26061: Make sure favicons are
 cropped correctly

---
 app/src/main/java/org/mozilla/fenix/compose/Favicon.kt         | 2 +-
 .../mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt | 2 +-
 .../java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt  | 3 ++-
 app/src/main/res/layout/library_site_item.xml                  | 3 ++-
 app/src/main/res/values/styles.xml                             | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt b/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
index cbb6c28464..10f4e3c9c6 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
@@ -67,7 +67,7 @@ fun Favicon(
                     modifier = modifier
                         .size(size)
                         .clip(RoundedCornerShape(2.dp)),
-                    contentScale = ContentScale.Fit
+                    contentScale = ContentScale.Crop,
                 )
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt b/app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt
index f91c63706f..8ad3026a5b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt
@@ -164,7 +164,7 @@ private fun RecentBookmarkImage(bookmark: RecentBookmark) {
                             modifier = Modifier
                                 .size(36.dp)
                                 .clip(RoundedCornerShape(8.dp)),
-                            contentScale = ContentScale.Fit
+                            contentScale = ContentScale.Crop,
                         )
                     }
                 }
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 a9834a7697..da3aae1de3 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
@@ -159,7 +159,8 @@ private fun RecentTabItem(
                     RecentTabIcon(
                         url = tab.state.content.url,
                         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))
diff --git a/app/src/main/res/layout/library_site_item.xml b/app/src/main/res/layout/library_site_item.xml
index 9fb89e41c2..3706deb568 100644
--- a/app/src/main/res/layout/library_site_item.xml
+++ b/app/src/main/res/layout/library_site_item.xml
@@ -19,11 +19,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent">
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/favicon"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:padding="8dp"
+                android:scaleType="centerCrop"
                 android:importantForAccessibility="no"
                 tools:src="@drawable/ic_folder_icon" />
         <ImageView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1be3f90acb..a54d3c4380 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -679,7 +679,7 @@
     <style name="topSiteFavicon">
         <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:scaleType">fitCenter</item>
+        <item name="android:scaleType">centerCrop</item>
         <item name="android:layout_gravity">center</item>
         <item name="shapeAppearanceOverlay">@style/topSiteFaviconShape</item>
     </style>