From 284ec7b58f3e2e494719d651ab0d2edf736c0a36 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Fri, 10 Jul 2020 11:07:20 -0700
Subject: [PATCH] For #12461: Add tab count to tab tray

---
 .../org/mozilla/fenix/tabtray/TabTrayView.kt  |  3 ++
 .../main/res/layout/component_tabstray.xml    | 25 +++++++-------
 .../main/res/layout/tabs_tray_tab_counter.xml | 34 +++++++++++++++++++
 3 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/layout/tabs_tray_tab_counter.xml

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index b9acc4858..7177b2fad 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -18,6 +18,7 @@ import com.google.android.material.tabs.TabLayout
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.component_tabstray.view.*
 import kotlinx.android.synthetic.main.component_tabstray_fab.view.*
+import kotlinx.android.synthetic.main.tabs_tray_tab_counter.*
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -245,6 +246,8 @@ class TabTrayView(
                 View.VISIBLE
             }
             view.tab_tray_overflow.isVisible = !hasNoTabs
+
+            counter_text.text = "${state.normalTabs.size}"
         }
     }
 
diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 132d86363..51a1edc62 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -46,27 +46,28 @@
         android:layout_width="0dp"
         android:layout_height="80dp"
         android:background="@color/foundation_normal_theme"
-        app:tabIndicatorColor="@color/accent_normal_theme"
-        app:tabIconTint="@color/tab_icon"
-        app:tabRippleColor="@android:color/transparent"
-        app:tabGravity="fill"
-        app:layout_constraintWidth_percent="0.5"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/handle"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintWidth_percent="0.5"
+        app:tabGravity="fill"
+        app:tabIconTint="@color/tab_icon"
+        app:tabIndicatorColor="@color/accent_normal_theme"
+        app:tabRippleColor="@android:color/transparent">
 
         <com.google.android.material.tabs.TabItem
             android:id="@+id/default_tab_item"
-            android:layout_height="match_parent"
             android:layout_width="0dp"
-            android:icon="@drawable/ic_tabs"
-            android:contentDescription="@string/tab_header_label" />
+            android:layout_height="match_parent"
+            android:contentDescription="@string/tab_header_label"
+            android:layout="@layout/tabs_tray_tab_counter"
+            app:tabIconTint="@color/tab_icon" />
 
         <com.google.android.material.tabs.TabItem
             android:id="@+id/private_tab_item"
-            android:layout_height="match_parent"
             android:layout_width="0dp"
-            android:icon="@drawable/ic_private_browsing"
-            android:contentDescription="@string/tabs_header_private_tabs_title" />
+            android:layout_height="match_parent"
+            android:contentDescription="@string/tabs_header_private_tabs_title"
+            android:icon="@drawable/ic_private_browsing" />
 
     </com.google.android.material.tabs.TabLayout>
 
diff --git a/app/src/main/res/layout/tabs_tray_tab_counter.xml b/app/src/main/res/layout/tabs_tray_tab_counter.xml
new file mode 100644
index 000000000..df8b697ac
--- /dev/null
+++ b/app/src/main/res/layout/tabs_tray_tab_counter.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/counter_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:layout_centerVertical="true">
+
+    <ImageView
+        android:id="@+id/counter_box"
+        android:layout_width="@dimen/tab_counter_box_width_height"
+        android:layout_height="@dimen/tab_counter_box_width_height"
+        android:importantForAccessibility="no"
+        app:tint="@color/tab_icon"
+        app:srcCompat="@drawable/ic_tabs"/>
+
+    <!-- This text size auto adjusts based on num digits in `TabCounter` -->
+    <TextView
+        android:id="@+id/counter_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textAlignment="center"
+        android:textColor="@color/tab_icon"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        tools:text="16" />
+</FrameLayout>
\ No newline at end of file