Support visionOS 2.0+ and Swift Package Manager

Author: HaleXie

MessageKit.xcodeproj/project.pbxproj

@@ -79,7 +79,7 @@
 		C72A8F522944400E006DB10F /* MessagesCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72A8F0A2944400E006DB10F /* MessagesCollectionView.swift */; };
 		C72A8F532944400E006DB10F /* PlayButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72A8F0B2944400E006DB10F /* PlayButtonView.swift */; };
 		C72A8F542944400E006DB10F /* BubbleCircle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72A8F0C2944400E006DB10F /* BubbleCircle.swift */; };
-		C72A8F5A29444349006DB10F /* InputBarAccessoryView in Frameworks */ = {isa = PBXBuildFile; productRef = C72A8F5929444349006DB10F /* InputBarAccessoryView */; };
+		C7951AFC2D39EC9300CEACA2 /* InputBarAccessoryView in Frameworks */ = {isa = PBXBuildFile; productRef = C7951AFB2D39EC9300CEACA2 /* InputBarAccessoryView */; };
 		C79D579B296BF5790044D518 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7CB28212943270000C8328F /* Assets.xcassets */; };
 /* End PBXBuildFile section */
 
@@ -167,7 +167,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C72A8F5A29444349006DB10F /* InputBarAccessoryView in Frameworks */,
+				C7951AFC2D39EC9300CEACA2 /* InputBarAccessoryView in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -397,7 +397,7 @@
 			);
 			name = MessageKit;
 			packageProductDependencies = (
-				C72A8F5929444349006DB10F /* InputBarAccessoryView */,
+				C7951AFB2D39EC9300CEACA2 /* InputBarAccessoryView */,
 			);
 			productName = MessageKit;
 			productReference = C72A8DF529443D1E006DB10F /* MessageKit.framework */;
@@ -446,7 +446,7 @@
 			);
 			mainGroup = C7CB27F0294324CA00C8328F;
 			packageReferences = (
-				C72A8F55294442C5006DB10F /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */,
+				C7951AFA2D39EC8600CEACA2 /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */,
 			);
 			productRefGroup = C7CB27FE2943253B00C8328F /* Products */;
 			projectDirPath = "";
@@ -618,7 +618,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -633,13 +633,16 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				XROS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -698,7 +701,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -712,14 +715,17 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				XROS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -908,20 +914,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		C72A8F55294442C5006DB10F /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */ = {
+		C7951AFA2D39EC8600CEACA2 /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "git@github.com:nathantannar4/InputBarAccessoryView.git";
+			repositoryURL = "https://github.com/HaleXie/InputBarAccessoryView";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 5.4.0;
+				branch = visionOS;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		C72A8F5929444349006DB10F /* InputBarAccessoryView */ = {
+		C7951AFB2D39EC9300CEACA2 /* InputBarAccessoryView */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = C72A8F55294442C5006DB10F /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */;
+			package = C7951AFA2D39EC8600CEACA2 /* XCRemoteSwiftPackageReference "InputBarAccessoryView" */;
 			productName = InputBarAccessoryView;
 		};
 /* End XCSwiftPackageProductDependency section */

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 /*
@@ -27,22 +27,26 @@ import PackageDescription
 
 let package = Package(
     name: "MessageKit",
-    platforms: [.iOS(.v12)],
+    platforms: [
+		.iOS(.v16),
+		.visionOS(.v2)
+    ],
     products: [
         .library(name: "MessageKit", targets: ["MessageKit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/nathantannar4/InputBarAccessoryView", .upToNextMajor(from: "5.4.0"))
+        .package(url: "git@github.com:HaleXie/InputBarAccessoryView.git", branch: "visionOS")
     ],
     targets: [
         .target(
             name: "MessageKit",
             dependencies: ["InputBarAccessoryView"],
             path: "Sources",
             exclude: ["Supporting/Info.plist", "Supporting/MessageKit.h"],
+            resources: [.process("Assets.xcassets")],
             swiftSettings: [SwiftSetting.define("IS_SPM")]
         ),
         .testTarget(name: "MessageKitTests", dependencies: ["MessageKit"])
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v5]
 )

Sources/Controllers/MessagesViewController+Keyboard.swift

@@ -50,7 +50,9 @@ internal extension MessagesViewController {
             removeKeyboardWillChangeFrameNotificationObserver()
         }
         NotificationCenter.default.removeObserver(self, name: UITextView.textDidBeginEditingNotification, object: nil)
+#if os(iOS)
         NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil)
+#endif
     }
 
     // MARK: - Notification Handlers
@@ -142,7 +144,11 @@ internal extension MessagesViewController {
     }
 
     func requiredInitialScrollViewBottomInset() -> CGFloat {
+#if os(visionOS)
+        let inputAccessoryViewHeight: CGFloat = 0
+#else
         let inputAccessoryViewHeight = inputAccessoryView?.frame.height ?? 0
+#endif
         return max(0, inputAccessoryViewHeight + additionalBottomInset - automaticallyAddedBottomInset)
     }
 

Sources/Controllers/MessagesViewController+Menu.swift

@@ -1,18 +1,18 @@
 /*
  MIT License
-
+ 
  Copyright (c) 2017-2019 MessageKit
-
+ 
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
-
+ 
  The above copyright notice and this permission notice shall be included in all
  copies or substantial portions of the Software.
-
+ 
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,56 +26,56 @@ import Foundation
 import UIKit
 
 internal extension MessagesViewController {
-
+    
     // MARK: - Register / Unregister Observers
-
+#if os(iOS)
     func addMenuControllerObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(MessagesViewController.menuControllerWillShow(_:)), name: UIMenuController.willShowMenuNotification, object: nil)
     }
-
+    
     func removeMenuControllerObservers() {
         NotificationCenter.default.removeObserver(self, name: UIMenuController.willShowMenuNotification, object: nil)
     }
-
+    
     // MARK: - Notification Handlers
-
+    
     /// Show menuController and set target rect to selected bubble
     @objc
     private func menuControllerWillShow(_ notification: Notification) {
-
+        
         guard let currentMenuController = notification.object as? UIMenuController,
-            let selectedIndexPath = selectedIndexPathForMenu else { return }
-
+              let selectedIndexPath = selectedIndexPathForMenu else { return }
+        
         NotificationCenter.default.removeObserver(self, name: UIMenuController.willShowMenuNotification, object: nil)
         defer {
             NotificationCenter.default.addObserver(self,
                                                    selector: #selector(MessagesViewController.menuControllerWillShow(_:)),
                                                    name: UIMenuController.willShowMenuNotification, object: nil)
             selectedIndexPathForMenu = nil
         }
-
+        
         currentMenuController.setMenuVisible(false, animated: false)
-
+        
         guard let selectedCell = messagesCollectionView.cellForItem(at: selectedIndexPath) as? MessageContentCell else { return }
         let selectedCellMessageBubbleFrame = selectedCell.convert(selectedCell.messageContainerView.frame, to: view)
-
+        
         var messageInputBarFrame: CGRect = .zero
         if let messageInputBarSuperview = messageInputBar.superview {
             messageInputBarFrame = view.convert(messageInputBar.frame, from: messageInputBarSuperview)
         }
-
+        
         var topNavigationBarFrame: CGRect = navigationBarFrame
         if navigationBarFrame != .zero, let navigationBarSuperview = navigationController?.navigationBar.superview {
             topNavigationBarFrame = view.convert(navigationController!.navigationBar.frame, from: navigationBarSuperview)
         }
-
+        
         let menuHeight = currentMenuController.menuFrame.height
-
+        
         let selectedCellMessageBubblePlusMenuFrame = CGRect(selectedCellMessageBubbleFrame.origin.x, selectedCellMessageBubbleFrame.origin.y - menuHeight, selectedCellMessageBubbleFrame.size.width, selectedCellMessageBubbleFrame.size.height + 2 * menuHeight)
-
+        
         var targetRect: CGRect = selectedCellMessageBubbleFrame
         currentMenuController.arrowDirection = .default
-
+        
         /// Message bubble intersects with navigationBar and keyboard
         if selectedCellMessageBubblePlusMenuFrame.intersects(topNavigationBarFrame) && selectedCellMessageBubblePlusMenuFrame.intersects(messageInputBarFrame) {
             let centerY = (selectedCellMessageBubblePlusMenuFrame.intersection(messageInputBarFrame).minY + selectedCellMessageBubblePlusMenuFrame.intersection(topNavigationBarFrame).maxY) / 2
@@ -84,17 +84,24 @@ internal extension MessagesViewController {
         else if selectedCellMessageBubblePlusMenuFrame.intersects(topNavigationBarFrame) {
             currentMenuController.arrowDirection = .up
         }
-
+        
         currentMenuController.setTargetRect(targetRect, in: view)
         currentMenuController.setMenuVisible(true, animated: true)
     }
-
+    
     // MARK: - Helpers
-
+    
     private var navigationBarFrame: CGRect {
         guard let navigationController = navigationController, !navigationController.navigationBar.isHidden else {
             return .zero
         }
         return navigationController.navigationBar.frame
     }
+#elseif os(visionOS)
+    func addMenuControllerObservers() {
+    }
+    
+    func removeMenuControllerObservers() {
+    }
+#endif
 }

Sources/Controllers/MessagesViewController.swift

@@ -78,9 +78,11 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
         return true
     }
 
+#if os(iOS)
     open override var inputAccessoryView: UIView? {
         return messageInputBar
     }
+#endif
 
     open override var shouldAutorotate: Bool {
         return false
@@ -119,7 +121,9 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
     internal var messageCollectionViewBottomInset: CGFloat = 0 {
         didSet {
             messagesCollectionView.contentInset.bottom = messageCollectionViewBottomInset
+#if os(iOS)
             messagesCollectionView.scrollIndicatorInsets.bottom = messageCollectionViewBottomInset
+#endif
         }
     }
 
@@ -232,7 +236,9 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
     private func setupDefaults() {
         extendedLayoutIncludesOpaqueBars = true
         view.backgroundColor = .collectionViewBackground
+#if os(iOS)
         messagesCollectionView.keyboardDismissMode = .interactive
+#endif
         messagesCollectionView.alwaysBounceVertical = true
         messagesCollectionView.backgroundColor = .collectionViewBackground
         if #available(iOS 13.0, *) {
@@ -465,15 +471,17 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
         return layoutDelegate.footerViewSize(for: section, in: messagesCollectionView)
     }
 
+    // TODO: re-implement with - (nullable UIContextMenuConfiguration *)collectionView:(UICollectionView *)collectionView contextMenuConfigurationForItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths point:(CGPoint)point
+    #if os(iOS)
     open func collectionView(_ collectionView: UICollectionView, shouldShowMenuForItemAt indexPath: IndexPath) -> Bool {
         guard let messagesDataSource = messagesCollectionView.messagesDataSource else { return false }
-
+        
         if isSectionReservedForTypingIndicator(indexPath.section) {
             return false
         }
-
+        
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
-
+        
         switch message.kind {
         case .text, .attributedText, .emoji, .photo:
             selectedIndexPathForMenu = indexPath
@@ -482,21 +490,21 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
             return false
         }
     }
-
+    
     open func collectionView(_ collectionView: UICollectionView, canPerformAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) -> Bool {
         if isSectionReservedForTypingIndicator(indexPath.section) {
             return false
         }
         return (action == NSSelectorFromString("copy:"))
     }
-
+    
     open func collectionView(_ collectionView: UICollectionView, performAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) {
         guard let messagesDataSource = messagesCollectionView.messagesDataSource else {
             fatalError(MessageKitError.nilMessagesDataSource)
         }
         let pasteBoard = UIPasteboard.general
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
-
+        
         switch message.kind {
         case .text(let text), .emoji(let text):
             pasteBoard.string = text
@@ -508,6 +516,7 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource, UIGestureRecogni
             break
         }
     }
+    #endif
 
     // MARK: - Helpers
 

Sources/Layout/MessagesCollectionViewFlowLayout.swift

@@ -90,7 +90,9 @@ open class MessagesCollectionViewFlowLayout: UICollectionViewFlowLayout {
     }
 
     private func setupObserver() {
+#if os(iOS)
         NotificationCenter.default.addObserver(self, selector: #selector(MessagesCollectionViewFlowLayout.handleOrientationChange(_:)), name: UIApplication.didChangeStatusBarOrientationNotification, object: nil)
+#endif
     }
 
     // MARK: - Typing Indicator API