Fix #5683: Add support for dynamic type on the url & bottom toolbars (#…

…5684)

Client/Assets/Images.xcassets/TabToolbar/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Client/Frontend/Browser/BrowserViewController.swift

@@ -949,10 +949,6 @@ public class BrowserViewController: UIViewController, BrowserViewControllerDeleg
       make.left.right.equalTo(self.view)
     }
 
-    topToolbar.snp.makeConstraints { make in
-      make.height.equalTo(UIConstants.topToolbarHeight)
-    }
-
     collapsedURLBarView.snp.makeConstraints {
       $0.edges.equalToSuperview()
     }

Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift

@@ -265,7 +265,7 @@ extension BrowserViewController: PlaylistHelperDelegate {
 
           let pulseAnimation = RadialPulsingAnimation(ringCount: 3)
           pulseAnimation.present(
-            icon: UIImage(named: "welcome-view-playlist-button-icon", in: .current, compatibleWith: nil)!,
+            icon: self.topToolbar.locationView.playlistButton.snapshot,
             from: self.topToolbar.locationView.playlistButton,
             on: popover,
             browser: self)

Client/Frontend/Browser/TabsBar/TabBarCell.swift

@@ -59,7 +59,8 @@ class TabBarCell: UICollectionViewCell {
 
     [deselectedOverlayView, closeButton, titleLabel, separatorLine, separatorLineRight].forEach { contentView.addSubview($0) }
     initConstraints()
-
+    updateFont()
+
     isSelected = false
     privateModeCancellable = PrivateBrowsingManager.shared
       .$isPrivateBrowsing
@@ -146,6 +147,18 @@ class TabBarCell: UICollectionViewCell {
       closeButton.isHidden = true
       deselectedOverlayView.isHidden = false
     }
+    updateFont()
+  }
+
+  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    updateFont()
+  }
+
+  private func updateFont() {
+    let clampedTraitCollection = self.traitCollection.clampingSizeCategory(maximum: .extraExtraLarge)
+    let font = UIFont.preferredFont(forTextStyle: .caption1, compatibleWith: clampedTraitCollection)
+    titleLabel.font = .systemFont(ofSize: font.pointSize, weight: isSelected ? .semibold : .regular)
   }
 
   @objc func closeTab() {

Client/Frontend/Browser/Toolbars/BottomToolbar/BottomToolbarView.swift

@@ -54,6 +54,8 @@ class BottomToolbarView: UIView, ToolbarProtocol {
         self?.updateColors(PrivateBrowsingManager.shared.isPrivateBrowsing)
       }
       .store(in: &cancellables)
+
+    helper?.updateForTraitCollection(traitCollection)
   }
 
   private var privateModeCancellable: AnyCancellable?
@@ -90,6 +92,11 @@ class BottomToolbarView: UIView, ToolbarProtocol {
     }
     super.updateConstraints()
   }
+
+  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    helper?.updateForTraitCollection(traitCollection)
+  }
 
   private func setupAccessibility() {
     backButton.accessibilityIdentifier = "TabToolbar.backButton"

Client/Frontend/Browser/Toolbars/ToolbarButton.swift

@@ -4,6 +4,19 @@
 
 import UIKit
 
+extension UITraitCollection {
+  /// Returns the size category to be used for toolbar buttons based on the current preferred size category
+  var toolbarButtonContentSizeCategory: UIContentSizeCategory {
+    let sizeCategory = preferredContentSizeCategory
+    if sizeCategory < UIContentSizeCategory.extraLarge {
+      return .large
+    } else if sizeCategory < UIContentSizeCategory.extraExtraLarge {
+      return .extraLarge
+    }
+    return .extraExtraLarge
+  }
+}
+
 class ToolbarButton: UIButton {
   fileprivate var selectedTintColor: UIColor?
   fileprivate var primaryTintColor: UIColor?