From 320fc4e4aeb0bda537865fb87e035929d13c6efc Mon Sep 17 00:00:00 2001
From: mcarare <“mihai.carare.dev@gmail.com”>
Date: Mon, 9 Mar 2020 16:22:38 +0200
Subject: [PATCH] For #8788 Use Flexbox instead of Grid manager for top sites

---
 app/build.gradle                                             | 2 ++
 .../home/sessioncontrol/viewholders/TopSiteViewHolder.kt     | 5 ++---
 app/src/main/res/layout/top_site_item.xml                    | 2 +-
 buildSrc/src/main/java/Dependencies.kt                       | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 217c7c510..1f1926a23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -504,6 +504,8 @@ dependencies {
     implementation Deps.androidx_work_ktx
     implementation Deps.google_material
 
+    implementation Deps.google_flexbox
+
     implementation Deps.lottie
 
     implementation Deps.adjust
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSiteViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSiteViewHolder.kt
index e3a979f8e..324934b03 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSiteViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TopSiteViewHolder.kt
@@ -5,8 +5,8 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders
 
 import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.component_top_sites.view.*
 import mozilla.components.feature.top.sites.TopSite
@@ -24,7 +24,7 @@ class TopSiteViewHolder(
     init {
         view.top_sites_list.apply {
             adapter = topSitesAdapter
-            layoutManager = GridLayoutManager(view.context, NUM_COLUMNS)
+            layoutManager = FlexboxLayoutManager(view.context)
             isNestedScrollingEnabled = false
         }
     }
@@ -35,6 +35,5 @@ class TopSiteViewHolder(
 
     companion object {
         const val LAYOUT_ID = R.layout.component_top_sites
-        const val NUM_COLUMNS = 5
     }
 }
diff --git a/app/src/main/res/layout/top_site_item.xml b/app/src/main/res/layout/top_site_item.xml
index 1d95a4437..7ac31d95d 100644
--- a/app/src/main/res/layout/top_site_item.xml
+++ b/app/src/main/res/layout/top_site_item.xml
@@ -5,7 +5,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/top_site_item"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
     android:padding="4dp"
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index a1112a63d..aae282b78 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -31,6 +31,7 @@ object Versions {
     const val androidx_transition = "1.3.0"
     const val androidx_work = "2.2.0"
     const val google_material = "1.1.0"
+    const val google_flexbox = "2.0.1"
 
     const val mozilla_android_components = "36.0.0-SNAPSHOT"
 
@@ -174,6 +175,7 @@ object Deps {
     const val androidx_work_ktx = "androidx.work:work-runtime-ktx:${Versions.androidx_work}"
     const val androidx_work_testing = "androidx.work:work-testing:${Versions.androidx_work}"
     const val google_material = "com.google.android.material:material:${Versions.google_material}"
+    const val google_flexbox = "com.google.android:flexbox:${Versions.google_flexbox}"
 
     const val adjust = "com.adjust.sdk:adjust-android:${Versions.adjust}"
     const val installreferrer = "com.android.installreferrer:installreferrer:${Versions.installreferrer}"