Add macCatalyst header UI & bump deps/version

Update workspace packages and app version, and add macCatalyst-specific header UI in ChatView.

- Bump Package.resolved versions: swift-asn1 -> 1.6.0, swift-collections -> 1.4.1, SwiftSoup -> 2.13.2 (revision updates included).
- Increment MARKETING_VERSION to 4.6.5.
- Modify ChatView to provide macCatalyst-specific layout and header visuals: use a plain background view and separator on macCatalyst instead of the glass/edge-effect header, adjust constraints and subview setup, and guard trait/layout/update methods with conditional compilation to keep existing iOS behavior unchanged.

These changes improve macCatalyst compatibility and UI consistency while preserving the original behavior on iOS.

Author: Lakr233

FlowDown.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -10,5 +10,5 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 //
 
-MARKETING_VERSION = 4.6.4;
+MARKETING_VERSION = 4.6.5;
 CURRENT_PROJECT_VERSION = 1;

FlowDown/Configuration/Version.xcconfig

@@ -90,7 +90,11 @@ class ChatView: UIView {
         editor.handlerColor = handlerColor
         editor.delegate = self
         editor.snp.makeConstraints { make in
-            make.bottom.equalTo(safeAreaLayoutGuide)
+            #if targetEnvironment(macCatalyst)
+                make.bottom.equalToSuperview()
+            #else
+                make.bottom.equalTo(safeAreaLayoutGuide)
+            #endif
             make.centerX.equalToSuperview()
             make.width.lessThanOrEqualTo(750)
             make.width.lessThanOrEqualToSuperview()
@@ -305,8 +309,13 @@ extension ChatView {
             $0.showsMenuAsPrimaryAction = true
         }
 
-        let edgeEffectView = ChatHeaderEdgeEffectView()
-        let backgroundContainer = ChatHeaderGlassBackgroundContainerView()
+        #if targetEnvironment(macCatalyst)
+            let bg = UIView().with { $0.backgroundColor = .background }
+            let sep = SeparatorView()
+        #else
+            let edgeEffectView = ChatHeaderEdgeEffectView()
+            let backgroundContainer = ChatHeaderGlassBackgroundContainerView()
+        #endif
 
         let rightClick = RightClickFinder()
         var cancellables: Set<AnyCancellable> = .init()
@@ -317,42 +326,77 @@ extension ChatView {
         init() {
             super.init(frame: .zero)
             translatesAutoresizingMaskIntoConstraints = false
-            clipsToBounds = false
 
             snp.makeConstraints { make in
                 make.height.equalTo(40).priority(.low)
             }
 
-            addSubview(edgeEffectView)
-            addSubview(backgroundContainer)
+            #if targetEnvironment(macCatalyst)
+                addSubview(bg)
+                bg.snp.makeConstraints { make in
+                    make.left.bottom.right.equalToSuperview()
+                    make.top.equalToSuperview().offset(-128)
+                }
+                addSubview(sep)
+                sep.snp.makeConstraints { make in
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalToSuperview()
+                    make.height.equalTo(1)
+                }
 
-            backgroundContainer.contentView.addSubview(icon)
-            backgroundContainer.contentView.addSubview(textLabel)
+                addSubview(icon)
+                addSubview(textLabel)
+                addSubview(menuButton)
 
-            let menuButtonGlass = menuButton.wrappedInGlassEffect(cornerStyle: .capsule)
-            backgroundContainer.contentView.addSubview(menuButtonGlass)
+                icon.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.left.equalToSuperview().inset(20)
+                    make.width.height.equalTo(24)
+                }
+                textLabel.snp.makeConstraints { make in
+                    make.center.equalToSuperview()
+                    make.top.greaterThanOrEqualToSuperview()
+                    make.bottom.lessThanOrEqualToSuperview()
+                    make.left.greaterThanOrEqualTo(icon.snp.right).offset(8)
+                    make.right.lessThanOrEqualTo(menuButton.snp.left).offset(-8)
+                }
+                menuButton.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.right.equalToSuperview().inset(20)
+                    make.width.height.equalTo(18)
+                }
+            #else
+                clipsToBounds = false
 
-            menuButtonGlass.snp.makeConstraints { make in
-                make.centerY.equalToSuperview()
-                make.right.equalToSuperview().inset(12)
-                make.width.height.equalTo(34)
-            }
+                addSubview(edgeEffectView)
+                addSubview(backgroundContainer)
 
-            icon.snp.makeConstraints { make in
-                make.centerY.equalToSuperview()
-                make.left.equalToSuperview().inset(20)
-                make.width.height.equalTo(24)
-            }
-            textLabel.snp.makeConstraints { make in
-                make.centerX.equalToSuperview()
-                make.centerY.equalToSuperview()
-                make.top.greaterThanOrEqualToSuperview()
-                make.bottom.lessThanOrEqualToSuperview()
-                make.left.greaterThanOrEqualTo(icon.snp.right).offset(8)
-                make.right.lessThanOrEqualTo(menuButtonGlass.snp.left).offset(-8)
-            }
+                backgroundContainer.contentView.addSubview(icon)
+                backgroundContainer.contentView.addSubview(textLabel)
+
+                let menuButtonGlass = menuButton.wrappedInGlassEffect(cornerStyle: .capsule)
+                backgroundContainer.contentView.addSubview(menuButtonGlass)
+
+                menuButtonGlass.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.right.equalToSuperview().inset(12)
+                    make.width.height.equalTo(34)
+                }
+
+                icon.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.left.equalToSuperview().inset(20)
+                    make.width.height.equalTo(24)
+                }
+                textLabel.snp.makeConstraints { make in
+                    make.centerX.equalToSuperview()
+                    make.centerY.equalToSuperview()
+                    make.top.greaterThanOrEqualToSuperview()
+                    make.bottom.lessThanOrEqualToSuperview()
+                    make.left.greaterThanOrEqualTo(icon.snp.right).offset(8)
+                    make.right.lessThanOrEqualTo(menuButtonGlass.snp.left).offset(-8)
+                }
 
-            #if !targetEnvironment(macCatalyst)
                 icon.alpha = 0
             #endif
 
@@ -369,41 +413,25 @@ extension ChatView {
                 }
                 .store(in: &cancellables)
 
-            _ = registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (view: TitleBar, _: UITraitCollection) in
-                view.updateBackgroundInterfaceStyle()
-            }
-            updateBackgroundInterfaceStyle()
+            #if !targetEnvironment(macCatalyst)
+                _ = registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (view: TitleBar, _: UITraitCollection) in
+                    view.updateBackgroundInterfaceStyle()
+                }
+                updateBackgroundInterfaceStyle()
+            #endif
         }
 
         @available(*, unavailable)
         required init?(coder _: NSCoder) {
             fatalError()
         }
 
-        override func layoutSubviews() {
-            super.layoutSubviews()
-
-            let safeTop = safeAreaInsets.top
+        #if !targetEnvironment(macCatalyst)
+            override func layoutSubviews() {
+                super.layoutSubviews()
 
-            #if targetEnvironment(macCatalyst)
-                backgroundContainer.frame = CGRect(
-                    x: 0,
-                    y: 0,
-                    width: bounds.width,
-                    height: bounds.height,
-                )
-                backgroundContainer.setContentTopOffset(safeTop)
+                let safeTop = safeAreaInsets.top
 
-                let edgeHeight = bounds.height + 14
-                edgeEffectView.update(
-                    content: .background,
-                    blur: true,
-                    alpha: 0.85,
-                    rect: CGRect(x: 0, y: 0, width: bounds.width, height: edgeHeight),
-                    edge: .top,
-                    edgeSize: min(54, edgeHeight),
-                )
-            #else
                 let usesUnifiedBackdrop = if #available(iOS 26.0, *) {
                     false
                 } else {
@@ -437,29 +465,38 @@ extension ChatView {
                     edge: .top,
                     edgeSize: min(54, edgeHeight),
                 )
-            #endif
-        }
+            }
+        #endif
 
         deinit {
             cancellables.forEach { $0.cancel() }
             cancellables.removeAll()
         }
 
-        override func didMoveToWindow() {
-            super.didMoveToWindow()
-            updateBackgroundInterfaceStyle()
-        }
+        #if !targetEnvironment(macCatalyst)
+            override func didMoveToWindow() {
+                super.didMoveToWindow()
+                updateBackgroundInterfaceStyle()
+            }
+        #endif
 
         private var conv: Conversation.ID?
 
-        private func updateBackgroundInterfaceStyle() {
-            backgroundContainer.update(isDark: traitCollection.userInterfaceStyle == .dark)
-        }
+        #if !targetEnvironment(macCatalyst)
+            private func updateBackgroundInterfaceStyle() {
+                backgroundContainer.update(isDark: traitCollection.userInterfaceStyle == .dark)
+            }
 
-        func setDecorativeBackgroundHidden(_ isHidden: Bool) {
-            backgroundContainer.setVisualEffectEnabled(!isHidden)
-            edgeEffectView.isHidden = isHidden
-        }
+            func setDecorativeBackgroundHidden(_ isHidden: Bool) {
+                backgroundContainer.setVisualEffectEnabled(!isHidden)
+                edgeEffectView.isHidden = isHidden
+            }
+        #else
+            func setDecorativeBackgroundHidden(_ isHidden: Bool) {
+                bg.isHidden = isHidden
+                sep.isHidden = isHidden
+            }
+        #endif
 
         func use(identifier: Conversation.ID?) {
             conv = identifier