For mozilla-mobile#26061: Make sure favicons are cropped correctly

rocketsroger · Jul 27, 2022 · 30093fe · 30093fe
1 parent 11a7085
commit 30093fe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>