[iOS] Improve toolbar icon sizing

This change also replaces the coloured product icons so that they include proper visual spacing built-in

ios/brave-ios/Sources/Brave/Frontend/Browser/BackForwardTableViewCell.swift

@@ -71,9 +71,7 @@ class BackForwardTableViewCell: UITableViewCell {
       if let s = site {
         if InternalURL.isValid(url: s.tileURL) {
           faviconView.backgroundColor = .white
-          faviconView.image = UIImage(sharedNamed: "brave.logo")?.imageWithInsets(
-            insets: .init(equalInset: 4)
-          )
+          faviconView.image = UIImage(sharedNamed: "brave.logo")
         } else {
           faviconView.loadFavicon(for: s.tileURL, isPrivateBrowsing: isPrivateBrowsing)
         }

ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift

@@ -689,7 +689,7 @@ public class BrowserViewController: UIViewController {
   ) {
     let showToolbar = shouldShowFooterForTraitCollection(newCollection)
     bottomTouchArea.isEnabled = showToolbar
-    topToolbar.setShowToolbar(!showToolbar)
+    topToolbar.setShowToolbar(showToolbar)
 
     if (showToolbar && toolbar == nil) || (!showToolbar && toolbar != nil) {
       toolbar?.removeFromSuperview()

ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/BottomToolbarView.swift

@@ -61,13 +61,15 @@ class BottomToolbarView: UIView, ToolbarProtocol {
         self.updateColors()
         self.helper?.updateForTraitCollection(
           self.traitCollection,
-          browserColors: privateBrowsingManager.browserColors
+          browserColors: privateBrowsingManager.browserColors,
+          isBottomToolbar: true
         )
       })
 
     helper?.updateForTraitCollection(
       traitCollection,
-      browserColors: privateBrowsingManager.browserColors
+      browserColors: privateBrowsingManager.browserColors,
+      isBottomToolbar: true
     )
 
     updateColors()
@@ -106,7 +108,8 @@ class BottomToolbarView: UIView, ToolbarProtocol {
     super.traitCollectionDidChange(previousTraitCollection)
     helper?.updateForTraitCollection(
       traitCollection,
-      browserColors: privateBrowsingManager.browserColors
+      browserColors: privateBrowsingManager.browserColors,
+      isBottomToolbar: true
     )
   }
 

ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/ToolbarHelper.swift

@@ -113,14 +113,17 @@ class ToolbarHelper: NSObject {
   func updateForTraitCollection(
     _ traitCollection: UITraitCollection,
     browserColors: some BrowserColors,
+    isBottomToolbar: Bool,
     additionalButtons: [UIButton] = []
   ) {
     let toolbarTraitCollection = UITraitCollection(
       preferredContentSizeCategory: traitCollection.toolbarButtonContentSizeCategory
     )
     let config = UIImage.SymbolConfiguration(
-      pointSize: UIFont.preferredFont(forTextStyle: .body, compatibleWith: toolbarTraitCollection)
-        .pointSize,
+      pointSize: isBottomToolbar
+        ? UIFont.preferredFont(forTextStyle: .body, compatibleWith: toolbarTraitCollection)
+          .pointSize
+        : UIFontMetrics.default.scaledValue(for: 14, compatibleWith: toolbarTraitCollection),
       weight: .regular,
       scale: .large
     )

ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/RewardsButton.swift

@@ -32,6 +32,8 @@ class RewardsButton: UIButton {
 
     adjustsImageWhenHighlighted = false
     imageView?.contentMode = .scaleAspectFit
+    contentHorizontalAlignment = .fill
+    contentVerticalAlignment = .fill
     imageView?.adjustsImageSizeForAccessibilityContentSizeCategory = true
 
     accessibilityLabel = Strings.rewardsPanel

ios/brave-ios/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/TopToolbarView.swift

@@ -275,15 +275,14 @@ class TopToolbarView: UIView, ToolbarProtocol {
     button.accessibilityLabel = Strings.bravePanel
     button.imageView?.adjustsImageSizeForAccessibilityContentSizeCategory = true
     button.accessibilityIdentifier = "urlBar-shieldsButton"
-    button.contentEdgeInsets = .init(top: 4, left: 5, bottom: 4, right: 5)
+    button.contentHorizontalAlignment = .fill
+    button.contentVerticalAlignment = .fill
     return button
   }()
 
   private(set) lazy var rewardsButton: RewardsButton = {
     let button = RewardsButton()
     button.addTarget(self, action: #selector(didTapBraveRewardsButton), for: .touchUpInside)
-    // Visual centering
-    button.contentEdgeInsets = .init(top: 4, left: 4, bottom: 6, right: 4)
     return button
   }()
 
@@ -389,14 +388,16 @@ class TopToolbarView: UIView, ToolbarProtocol {
         self.updateColors()
         self.helper?.updateForTraitCollection(
           self.traitCollection,
-          browserColors: privateBrowsingManager.browserColors
+          browserColors: privateBrowsingManager.browserColors,
+          isBottomToolbar: false
         )
       })
 
     updateURLBarButtonsVisibility()
     helper?.updateForTraitCollection(
       traitCollection,
       browserColors: privateBrowsingManager.browserColors,
+      isBottomToolbar: false,
       additionalButtons: [shortcutButton]
     )
     updateForTraitCollection()
@@ -439,6 +440,7 @@ class TopToolbarView: UIView, ToolbarProtocol {
     helper?.updateForTraitCollection(
       traitCollection,
       browserColors: privateBrowsingManager.browserColors,
+      isBottomToolbar: false,
       additionalButtons: [shortcutButton]
     )
     updateForTraitCollection()
@@ -447,7 +449,7 @@ class TopToolbarView: UIView, ToolbarProtocol {
   private func updateForTraitCollection() {
     let toolbarSizeCategory = traitCollection.toolbarButtonContentSizeCategory
     let pointSize = UIFontMetrics(forTextStyle: .body).scaledValue(
-      for: 28,
+      for: 24,
       compatibleWith: .init(preferredContentSizeCategory: toolbarSizeCategory)
     )
     shieldsButton.snp.remakeConstraints {
@@ -751,10 +753,10 @@ class TopToolbarView: UIView, ToolbarProtocol {
     if cancelButton.isHidden == inOverlayMode {
       cancelButton.isHidden = !inOverlayMode
     }
-    backButton.isHidden = !toolbarIsShowing || inOverlayMode
-    forwardButton.isHidden = !toolbarIsShowing || inOverlayMode
-    shareButton.isHidden = !toolbarIsShowing || inOverlayMode
-    trailingItemsStackView.isHidden = !toolbarIsShowing || inOverlayMode
+    backButton.isHidden = toolbarIsShowing || inOverlayMode
+    forwardButton.isHidden = toolbarIsShowing || inOverlayMode
+    shareButton.isHidden = toolbarIsShowing || inOverlayMode
+    trailingItemsStackView.isHidden = toolbarIsShowing || inOverlayMode
     locationView.contentView.isHidden = inOverlayMode
     shieldsRewardsStack.isHidden = inOverlayMode
 

ios/brave-ios/Sources/BraveUI/Images/Shared.xcassets/Colored PDF/brave.basicattentiontoken.greyscale.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "brave.basicattentiontoken.greyscale.pdf",
+      "filename" : "brave.basicattentiontoken.greyscale.svg",
       "idiom" : "universal"
     }
   ],

ios/brave-ios/Sources/BraveUI/Images/Shared.xcassets/Colored PDF/brave.basicattentiontoken.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "brave.basicattentiontoken.pdf",
+      "filename" : "brave.basicattentiontoken.svg",
       "idiom" : "universal"
     }
   ],

ios/brave-ios/Sources/BraveUI/Images/Shared.xcassets/Colored PDF/brave.logo.greyscale.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "brave.logo.greyscale.pdf",
+      "filename" : "brave.logo.greyscale.svg",
       "idiom" : "universal"
     }
   ],

ios/brave-ios/Sources/BraveUI/Images/Shared.xcassets/Colored PDF/brave.logo.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "brave.logo.pdf",
+      "filename" : "brave.logo.svg",
       "idiom" : "universal"
     }
   ],