From 70f90e71e8bea55281ba7b6974573909d8971fb2 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 29 Jun 2020 14:02:49 -0400
Subject: [PATCH] For #11991 - Show tab count during onboarding

---
 .../org/mozilla/fenix/home/HomeFragment.kt    | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 76c463054..f2993aa86 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -30,6 +30,7 @@ import androidx.constraintlayout.widget.ConstraintSet.TOP
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.doOnLayout
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -223,22 +224,6 @@ class HomeFragment : Fragment() {
         updateSessionControlView(view)
 
         activity.themeManager.applyStatusBarTheme(activity)
-
-        view.consumeFrom(requireComponents.core.store, viewLifecycleOwner) {
-            val tabCount = if (currentMode.getCurrentMode() == Mode.Normal) {
-                it.normalTabs.size
-            } else {
-                it.privateTabs.size
-            }
-
-            view.tab_button.setCountWithAnimation(tabCount)
-            view.add_tabs_to_collections_button?.visibility = if (tabCount > 0) {
-                View.VISIBLE
-            } else {
-                View.GONE
-            }
-        }
-
         return view
     }
 
@@ -403,6 +388,17 @@ class HomeFragment : Fragment() {
         } else {
             requireActivity().window.clearFlags(FLAG_SECURE)
         }
+
+        consumeFrom(requireComponents.core.store) {
+            val tabCount = if (browsingModeManager.mode.isPrivate) {
+                it.privateTabs.size
+            } else {
+                it.normalTabs.size
+            }
+
+            view.tab_button?.setCountWithAnimation(tabCount)
+            view.add_tabs_to_collections_button?.isVisible = tabCount > 0
+        }
     }
 
     override fun onDestroyView() {