From e76960b389c956aa48a59ee16608b97ca96e8d1a Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Mon, 11 Jan 2021 17:41:38 +0400
Subject: [PATCH] [fenix] A-C 71.0.20210118134928: Fix breaking API in
 TabCounterToolbarButton

---
 .../org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt | 3 +--
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt       | 1 -
 app/src/main/res/values/styles.xml                             | 2 ++
 buildSrc/src/main/java/AndroidComponents.kt                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
index b07f53636b..4f19ee2ae0 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@@ -171,8 +171,7 @@ class DefaultToolbarIntegration(
                 interactor.onTabCounterClicked()
             },
             store = store,
-            menu = tabCounterMenu,
-            privateColor = ContextCompat.getColor(context, R.color.primary_text_private_theme)
+            menu = tabCounterMenu
         )
 
         val tabCount = if (isPrivate) {
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 0338c63f17..94bfad5193 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -1010,7 +1010,6 @@ class HomeFragment : Fragment() {
     // https://github.com/mozilla-mobile/fenix/issues/16792
     private fun updateTabCounter(browserState: BrowserState) {
         val tabCount = if (browsingModeManager.mode.isPrivate) {
-            view?.tab_button?.setColor(ContextCompat.getColor(requireContext(), R.color.primary_text_private_theme))
             browserState.privateTabs.size
         } else {
             browserState.normalTabs.size
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7b41618e9d..c0d2b4ad29 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -107,6 +107,8 @@
         <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
         <item name="privateBrowsingButtonBackground">@android:color/transparent</item>
         <item name="privateBrowsingButtonAccent">@color/primary_text_normal_theme</item>
+
+        <item name="tabCounterTintColor">?primaryText</item>
     </style>
 
     <style name="NormalTheme" parent="NormalThemeBase" />
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index ffc7fbc8e9..608c2ce5bc 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "71.0.20210117143132"
+    const val VERSION = "71.0.20210118134928"
 }