Switched the position of menuButton and tabsButton

ghostery · May 9, 2018 · 056613e6bb12d501b4ae7572402cf8845715a38f · 056613e
1 parent 2e67e3b
commit 056613e6bb12d501b4ae7572402cf8845715a38f
Unified Split

Showing with 8 additions and 5 deletions.

+3 −0 Client/Frontend/Browser/TabToolbar.swift

+5 −5 Cliqz/URLBar/CliqzURLBar.swift
diff --git a/Client/Frontend/Browser/TabToolbar.swift b/Client/Frontend/Browser/TabToolbar.swift
@@ -215,7 +215,10 @@ class TabToolbar: UIView {
     private let contentView = UIStackView()
 
     fileprivate override init(frame: CGRect) {
+        /* Cliqz: Switched the position of menuButton and tabsButton
         actionButtons = [backButton, forwardButton, stopReloadButton, tabsButton, menuButton]
+        */
+        actionButtons = [backButton, forwardButton, stopReloadButton, menuButton, tabsButton]
         super.init(frame: frame)
         setupAccessibility()
 

diff --git a/Cliqz/URLBar/CliqzURLBar.swift b/Cliqz/URLBar/CliqzURLBar.swift
@@ -110,20 +110,20 @@ class CliqzURLBar: URLBarView {
             make.size.equalTo(URLBarViewUX.ButtonHeight)
         }
 
-        stopReloadButton.snp.makeConstraints { make in
+        stopReloadButton.snp.remakeConstraints { make in
             make.left.equalTo(self.forwardButton.snp.right)
             make.centerY.equalTo(self)
             make.size.equalTo(URLBarViewUX.ButtonHeight)
         }
 
-        menuButton.snp.makeConstraints { make in
+        tabsButton.snp.remakeConstraints { make in
             make.trailing.equalTo(self.safeArea.trailing).offset(-URLBarViewUX.Padding)
             make.centerY.equalTo(self)
             make.size.equalTo(URLBarViewUX.ButtonHeight)
         }
 
-        tabsButton.snp.makeConstraints { make in
-            make.trailing.equalTo(self.menuButton.snp.leading)
+        menuButton.snp.remakeConstraints { make in
+            make.trailing.equalTo(self.tabsButton.snp.leading)
             make.centerY.equalTo(self)
             make.size.equalTo(URLBarViewUX.ButtonHeight)
         }
@@ -180,7 +180,7 @@ class CliqzURLBar: URLBarView {
         } else {
             self.ghosteryButton.snp.remakeConstraints { (make) in
                 if self.toolbarIsShowing {
-                    make.trailing.equalTo(self.tabsButton.snp.leading)
+                    make.trailing.equalTo(self.menuButton.snp.leading)
                 }
                 else {
                     make.trailing.equalTo(self.safeArea.trailing).offset(-URLBarViewUX.Padding)