Replaced TabsButton with CliqzTabsButton which has icon and no counter

Client/Frontend/Browser/TabToolbar.swift

@@ -8,7 +8,10 @@ import Shared
 
 protocol TabToolbarProtocol: class {
     weak var tabToolbarDelegate: TabToolbarDelegate? { get set }
+    /* Cliqz: replaced TabsButton with CliqzTabsButton which has icon and no counter
     var tabsButton: TabsButton { get }
+    */
+    var tabsButton: CliqzTabsButton { get }
     var menuButton: ToolbarButton { get }
     var forwardButton: ToolbarButton { get }
     var backButton: ToolbarButton { get }
@@ -194,7 +197,7 @@ extension ToolbarButton: Themeable {
         */
         selectedTintColor = UIColor.CliqzToolbarButton.SelectedTint.colorFor(theme)
         disabledTintColor = UIColor.CliqzToolbarButton.DisabledTint.colorFor(theme)
-        unselectedTintColor = UIColor.CliqzToolbarButton.UnselectedTint.colorFor(theme)
+        unselectedTintColor = UIColor.CliqzToolbarButton.Tint.colorFor(theme)
 
         tintColor = isEnabled ? unselectedTintColor : disabledTintColor
         imageView?.tintColor = tintColor
@@ -204,7 +207,10 @@ extension ToolbarButton: Themeable {
 class TabToolbar: UIView {
     weak var tabToolbarDelegate: TabToolbarDelegate?
 
+    /* Cliqz: replaced TabsButton with CliqzTabsButton
     let tabsButton = TabsButton()
+    */
+    let tabsButton = CliqzTabsButton()
     let menuButton = ToolbarButton()
     let forwardButton = ToolbarButton()
     let backButton = ToolbarButton()

Client/Frontend/Browser/TabTrayController.swift

@@ -1128,6 +1128,6 @@ class CliqzTrayToolbar : TrayToolbar {
         doneButton.applyTheme(theme)
         forgetModeButton.applyTheme(theme)
         backgroundColor = UIColor.CliqzToolbar.Background.colorFor(theme)
-        addTabButton.tintColor = UIColor.CliqzToolbarButton.UnselectedTint.colorFor(theme)
+        addTabButton.tintColor = UIColor.CliqzToolbarButton.Tint.colorFor(theme)
     }
 }

Client/Frontend/Browser/URLBarView.swift

@@ -117,8 +117,12 @@ class URLBarView: UIView {
 
     let line = UIView()
 
+    /* Cliqz: replaced TabsButton with CliqzTabsButton which has icon and no counter
     lazy var tabsButton: TabsButton = {
         let tabsButton = TabsButton.tabTrayButton()
+    */
+    lazy var tabsButton: CliqzTabsButton = {
+        let tabsButton = CliqzTabsButton()
         tabsButton.accessibilityIdentifier = "URLBarView.tabsButton"
         return tabsButton
     }()

Cliqz/Extensions/ColorExtension.swift

@@ -34,9 +34,9 @@ extension UIColor {
     }
 
     struct CliqzToolbarButton {
+        static let Tint = BrowserColor(normal: UIColor.white, pbm: UIColor.white)
         static let SelectedTint = BrowserColor(normal: UIColor.gray, pbm: UIColor.gray)
         static let DisabledTint = BrowserColor(normal: UIColor.gray, pbm: UIColor.gray)
-        static let UnselectedTint = BrowserColor(normal: UIColor.white, pbm: UIColor.white)
     }
 
     struct CliqzToolbar {

Cliqz/Resources/Cliqz.xcassets/TabToolbar/cliqz-nav-tabs.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Tab_Overview.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Tab_Overview@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Tab_Overview@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Cliqz/URLBar/CliqzTabToolbar.swift

@@ -8,6 +8,13 @@
 
 import UIKit
 
+class CliqzTabsButton: ToolbarButton {
+
+    func updateTabCount(_ count: Int, animated: Bool = true) {
+        // we don't show count in our tabs button
+    }
+}
+
 class CliqzTabToolbarHelper: TabToolbarHelper {
 
     override init(toolbar: TabToolbarProtocol) {
@@ -16,6 +23,8 @@ class CliqzTabToolbarHelper: TabToolbarHelper {
         toolbar.forwardButton.setImage(UIImage.templateImageNamed("cliqz-nav-forward"), for: .normal)
         toolbar.stopReloadButton.setImage(UIImage.templateImageNamed("cliqz-nav-refresh"), for: .normal)
         toolbar.menuButton.setImage(UIImage.templateImageNamed("cliqz-nav-menu"), for: .normal)
+        toolbar.tabsButton.setImage(UIImage.templateImageNamed("cliqz-nav-tabs"), for: .normal)
+        toolbar.tabsButton.accessibilityIdentifier = "TabToolbar.tabButton"
     }
 
 }