From c30195bf88b3d3f40cd639d06185f3d780e76154 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 13 Mar 2023 17:38:41 -0400
Subject: [PATCH] Bug 1822181 - Refactor TabCounterBuilder to TabCounterView

---
 .../app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt |  4 ++--
 .../fenix/home/{TabCounterBuilder.kt => TabCounterView.kt}   |  7 ++-----
 .../home/{TabCounterBuilderTest.kt => TabCounterViewTest.kt} | 12 +++++-------
 3 files changed, 9 insertions(+), 14 deletions(-)
 rename mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/{TabCounterBuilder.kt => TabCounterView.kt} (96%)
 rename mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/{TabCounterBuilderTest.kt => TabCounterViewTest.kt} (90%)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index ca99b68b35d8..bd92d6f86cc8 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -580,12 +580,12 @@ class HomeFragment : Fragment() {
             hideOnboardingIfNeeded = ::hideOnboardingIfNeeded,
         ).build()
 
-        TabCounterBuilder(
+        TabCounterView(
             context = requireContext(),
             browsingModeManager = browsingModeManager,
             navController = findNavController(),
             tabCounter = binding.tabButton,
-        ).build()
+        )
 
         binding.toolbar.compoundDrawablePadding =
             view.resources.getDimensionPixelSize(R.dimen.search_bar_search_engine_icon_padding)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterBuilder.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
similarity index 96%
rename from mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterBuilder.kt
rename to mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
index 53754152f6bb..1a455235c6e8 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterBuilder.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
@@ -25,17 +25,14 @@ import org.mozilla.fenix.ext.nav
  * @property navController [NavController] used for navigation.
  * @property tabCounter The [TabCounter] that will be setup with event handlers.
  */
-class TabCounterBuilder(
+class TabCounterView(
     private val context: Context,
     private val browsingModeManager: BrowsingModeManager,
     private val navController: NavController,
     private val tabCounter: TabCounter,
 ) {
 
-    /**
-     * Builds the [FenixTabCounterMenu].
-     */
-    fun build() {
+    init {
         val tabCounterMenu = FenixTabCounterMenu(
             context = context,
             onItemTapped = ::onItemTapped,
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterBuilderTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
similarity index 90%
rename from mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterBuilderTest.kt
rename to mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
index ace33dea671c..4247751adeea 100644
--- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterBuilderTest.kt
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
@@ -28,7 +28,7 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
 
 @RunWith(FenixRobolectricTestRunner::class)
-class TabCounterBuilderTest {
+class TabCounterViewTest {
 
     @get:Rule
     val gleanTestRule = GleanTestRule(testContext)
@@ -37,7 +37,7 @@ class TabCounterBuilderTest {
     private lateinit var browsingModeManager: BrowsingModeManager
     private lateinit var settings: Settings
     private lateinit var modeDidChange: (BrowsingMode) -> Unit
-    private lateinit var tabCounterBuilder: TabCounterBuilder
+    private lateinit var tabCounterView: TabCounterView
     private lateinit var tabCounter: TabCounter
 
     @Before
@@ -54,7 +54,7 @@ class TabCounterBuilderTest {
             modeDidChange = modeDidChange,
         )
 
-        tabCounterBuilder = TabCounterBuilder(
+        tabCounterView = TabCounterView(
             context = testContext,
             browsingModeManager = browsingModeManager,
             navController = navController,
@@ -64,8 +64,6 @@ class TabCounterBuilderTest {
 
     @Test
     fun `WHEN tab counter is clicked THEN navigate to tabs tray and record metrics`() {
-        tabCounterBuilder.build()
-
         assertNull(StartOnHome.openTabsTray.testGetValue())
 
         tabCounter.performClick()
@@ -82,14 +80,14 @@ class TabCounterBuilderTest {
 
     @Test
     fun `WHEN New tab menu item is tapped THEN set browsing mode to normal`() {
-        tabCounterBuilder.onItemTapped(TabCounterMenu.Item.NewTab)
+        tabCounterView.onItemTapped(TabCounterMenu.Item.NewTab)
 
         assertEquals(BrowsingMode.Normal, browsingModeManager.mode)
     }
 
     @Test
     fun `WHEN New private tab menu item is tapped THEN set browsing mode to private`() {
-        tabCounterBuilder.onItemTapped(TabCounterMenu.Item.NewPrivateTab)
+        tabCounterView.onItemTapped(TabCounterMenu.Item.NewPrivateTab)
 
         assertEquals(BrowsingMode.Private, browsingModeManager.mode)
     }
-- 
2.11.4.GIT