Merge remote-tracking branch 'origin/3.0.0-beta' into typingIndicatorView

Example/ChatExample.xcodeproj/project.pbxproj

@@ -477,7 +477,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework",
 				"${BUILT_PRODUCTS_DIR}/MessageKit/MessageKit.framework",
 			);
@@ -488,7 +488,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		52AB594E03799821A66AFF18 /* [CP] Check Pods Manifest.lock */ = {

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - InputBarAccessoryView (4.2.1)
+  - InputBarAccessoryView (4.2.2)
   - MessageKit (3.0.0-beta):
     - InputBarAccessoryView
 
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  InputBarAccessoryView: 37175becdced159cd9ea335f47ae001b1e112909
-  MessageKit: 4226995f0811d3a51b8e80b56d2e95c97fa879e8
+  InputBarAccessoryView: 2b937602598e2fab3149f37f51dd7ad795653812
+  MessageKit: 30a1e0b112c44361904016e7add631a78c5128e0
 
 PODFILE CHECKSUM: cecdb7bc8129cf99f66de9f68eea3256fec30c3d
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.5.3

Example/Sources/Data Generation/SampleData.swift

@@ -43,6 +43,7 @@ final internal class SampleData {
         case Url
         case Phone
         case Custom
+        case ShareContact
     }
 
     let system = MockUser(senderId: "000000", displayName: "System")
@@ -51,6 +52,15 @@ final internal class SampleData {
     let wu = MockUser(senderId: "000003", displayName: "Wu Zhong")
 
     lazy var senders = [nathan, steven, wu]
+    
+    lazy var contactsToShare = [
+        MockContactItem(name: "System", initials: "S"),
+        MockContactItem(name: "Nathan Tannar", initials: "NT", emails: ["test@test.com"]),
+        MockContactItem(name: "Steven Deutsch", initials: "SD", phoneNumbers: ["+1-202-555-0114", "+1-202-555-0145"]),
+        MockContactItem(name: "Wu Zhong", initials: "WZ", phoneNumbers: ["202-555-0158"]),
+        MockContactItem(name:"+40 123 123", initials: "#", phoneNumbers: ["+40 123 123"]),
+        MockContactItem(name:"test@test.com", initials: "#", emails: ["test@test.com"])
+    ]
 
     var currentSender: MockUser {
         return nathan
@@ -142,8 +152,8 @@ final internal class SampleData {
         return messageTypes.random()!
     }
 
+    // swiftlint:disable cyclomatic_complexity
     func randomMessage(allowedSenders: [MockUser]) -> MockMessage {
-
         let randomNumberSender = Int(arc4random_uniform(UInt32(allowedSenders.count)))
         
         let uniqueID = NSUUID().uuidString
@@ -182,8 +192,12 @@ final internal class SampleData {
             return MockMessage(text: "123-456-7890", user: user, messageId: uniqueID, date: date)
         case .Custom:
             return MockMessage(custom: "Someone left the conversation", user: system, messageId: uniqueID, date: date)
+        case .ShareContact:
+            let randomContact = Int(arc4random_uniform(UInt32(contactsToShare.count)))
+            return MockMessage(contact: contactsToShare[randomContact], user: user, messageId: uniqueID, date: date)
         }
     }
+    // swiftlint:enable cyclomatic_complexity
 
     func getMessages(count: Int, completion: ([MockMessage]) -> Void) {
         var messages: [MockMessage] = []

Example/Sources/Models/MockMessage.swift

@@ -70,6 +70,22 @@ private struct MockAudiotem: AudioItem {
 
 }
 
+struct MockContactItem: ContactItem {
+    
+    var displayName: String
+    var initials: String
+    var phoneNumbers: [String]
+    var emails: [String]
+    
+    init(name: String,  initials: String, phoneNumbers: [String] = [], emails: [String] = []) {
+        self.displayName = name
+        self.initials = initials
+        self.phoneNumbers = phoneNumbers
+        self.emails = emails
+    }
+    
+}
+
 internal struct MockMessage: MessageType {
 
     var messageId: String
@@ -124,4 +140,7 @@ internal struct MockMessage: MessageType {
         self.init(kind: .audio(audioItem), user: user, messageId: messageId, date: date)
     }
 
+    init(contact: MockContactItem, user: MockUser, messageId: String, date: Date) {
+        self.init(kind: .contact(contact), user: user, messageId: messageId, date: date)
+    }
 }

Example/Sources/View Controllers/SettingsViewController.swift

@@ -33,7 +33,7 @@ final internal class SettingsViewController: UITableViewController {
         return .lightContent
     }
     
-    let cells = ["Mock messages count", "Text Messages", "AttributedText Messages", "Photo Messages", "Video Messages", "Audio Messages", "Emoji Messages", "Location Messages", "Url Messages", "Phone Messages"]
+    let cells = ["Mock messages count", "Text Messages", "AttributedText Messages", "Photo Messages", "Video Messages", "Audio Messages", "Emoji Messages", "Location Messages", "Url Messages", "Phone Messages", "ShareContact Messages"]
     
     // MARK: - Picker
     
@@ -137,6 +137,7 @@ final internal class SettingsViewController: UITableViewController {
         let cell = cells[sender.tag]
                 
         UserDefaults.standard.set(sender.isOn, forKey: cell)
+        UserDefaults.standard.synchronize()
     }
 }