GitHub/MessageKit
1
0
Fork 0
mirror of https://github.com/MessageKit/MessageKit.git synced 2026-02-06 19:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Tannar
2019-04-05 00:11:14 -07:00
parent 601c393969 231e4ca7c9
commit 8cc96d71a2
19 changed files with 376 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessageKit.xcodeproj/project.pbxproj
+16
View File
@@ -50,6 +50,10 @@
5073C1192175BE960040EAD5 /* AudioMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073C1182175BE950040EAD5 /* AudioMessageCell.swift */; };
5073C11D2175BEC60040EAD5 /* AudioMessageSizeCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5073C11C2175BEC60040EAD5 /* AudioMessageSizeCalculator.swift */; };
5073C1232175C1980040EAD5 /* sound1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 5073C1222175C1980040EAD5 /* sound1.m4a */; };
50FF34552237FE4C0004DCD7 /* ContactItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FF34542237FE4C0004DCD7 /* ContactItem.swift */; };
50FF34572237FE6A0004DCD7 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FF34562237FE6A0004DCD7 /* UIImage+Extension.swift */; };
50FF34592237FE850004DCD7 /* ContactMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FF34582237FE840004DCD7 /* ContactMessageCell.swift */; };
50FF345B2237FE9C0004DCD7 /* ContactMessageSizeCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FF345A2237FE9C0004DCD7 /* ContactMessageSizeCalculator.swift */; };
88916B2D1CF0DF2F00469F91 /* MessageKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88916B221CF0DF2F00469F91 /* MessageKit.framework */; };
8962AC8A1F87AB7D0030B058 /* MessagesCollectionViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8962AC831F87AB230030B058 /* MessagesCollectionViewTests.swift */; };
8962AC8C1F87AB7D0030B058 /* AvatarViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8962AC851F87AB230030B058 /* AvatarViewTests.swift */; };
@@ -161,6 +165,10 @@
5073C1182175BE950040EAD5 /* AudioMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioMessageCell.swift; sourceTree = "<group>"; };
5073C11C2175BEC60040EAD5 /* AudioMessageSizeCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioMessageSizeCalculator.swift; sourceTree = "<group>"; };
5073C1222175C1980040EAD5 /* sound1.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = sound1.m4a; sourceTree = "<group>"; };
50FF34542237FE4C0004DCD7 /* ContactItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactItem.swift; sourceTree = "<group>"; };
50FF34562237FE6A0004DCD7 /* UIImage+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = "<group>"; };
50FF34582237FE840004DCD7 /* ContactMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactMessageCell.swift; sourceTree = "<group>"; };
50FF345A2237FE9C0004DCD7 /* ContactMessageSizeCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactMessageSizeCalculator.swift; sourceTree = "<group>"; };
88916B221CF0DF2F00469F91 /* MessageKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MessageKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
88916B2C1CF0DF2F00469F91 /* MessageKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8962AC741F87AB230030B058 /* MessageKitDateFormatterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageKitDateFormatterTests.swift; sourceTree = "<group>"; };
@@ -250,6 +258,7 @@
B7A03F381F866946006AEF79 /* LocationMessageCell.swift */,
B7A03F391F866946006AEF79 /* MediaMessageCell.swift */,
5073C1182175BE950040EAD5 /* AudioMessageCell.swift */,
50FF34582237FE840004DCD7 /* ContactMessageCell.swift */,
B7A03F7A1F866B85006AEF79 /* MessageCollectionViewCell.swift */,
1F6C040B206A2891007BDE44 /* MessageContentCell.swift */,
B7A03F361F866946006AEF79 /* TextMessageCell.swift */,
@@ -393,6 +402,7 @@
B09643981F295D43004D0129 /* Extensions */ = {
isa = PBXGroup;
children = (
50FF34562237FE6A0004DCD7 /* UIImage+Extension.swift */,
0EE91E651FDEC887005420A2 /* CGRect+Extensions.swift */,
B7A03F671F8669EB006AEF79 /* Bundle+Extensions.swift */,
B7A03F681F8669EB006AEF79 /* NSAttributedString+Extensions.swift */,
@@ -444,6 +454,7 @@
B096439B1F295D82004D0129 /* Protocols */ = {
isa = PBXGroup;
children = (
50FF34542237FE4C0004DCD7 /* ContactItem.swift */,
B7A03F521F8669C9006AEF79 /* MessageCellDelegate.swift */,
B7A03F551F8669C9006AEF79 /* MessageLabelDelegate.swift */,
B7A03F571F8669CA006AEF79 /* MessagesDataSource.swift */,
@@ -471,6 +482,7 @@
B096439D1F295DC3004D0129 /* Layout */ = {
isa = PBXGroup;
children = (
50FF345A2237FE9C0004DCD7 /* ContactMessageSizeCalculator.swift */,
B7A03F161F86682C006AEF79 /* MessagesCollectionViewFlowLayout.swift */,
B7A03F171F86682C006AEF79 /* MessagesCollectionViewLayoutAttributes.swift */,
1FE7839D20662835007FA024 /* MessageSizeCalculator.swift */,
@@ -641,6 +653,7 @@
B7A03F6C1F8669EB006AEF79 /* UIView+Extensions.swift in Sources */,
383B9EB121728BAD008AB91A /* SenderType.swift in Sources */,
B7A03F3A1F866946006AEF79 /* TextMessageCell.swift in Sources */,
50FF34552237FE4C0004DCD7 /* ContactItem.swift in Sources */,
B7A03F191F86682C006AEF79 /* MessagesCollectionViewLayoutAttributes.swift in Sources */,
38A2230F221FB8A300D14DAF /* MessageInputBar.swift in Sources */,
B7A03F461F86694F006AEF79 /* AvatarView.swift in Sources */,
@@ -656,10 +669,12 @@
B7A03F261F866895006AEF79 /* MessageKitDateFormatter.swift in Sources */,
B7A03F6D1F8669EB006AEF79 /* Bundle+Extensions.swift in Sources */,
5073C1192175BE960040EAD5 /* AudioMessageCell.swift in Sources */,
50FF34592237FE850004DCD7 /* ContactMessageCell.swift in Sources */,
1FD589602064E08A004B5081 /* MediaItem.swift in Sources */,
B7A03F611F8669CA006AEF79 /* MessagesDataSource.swift in Sources */,
B7A03F6E1F8669EB006AEF79 /* NSAttributedString+Extensions.swift in Sources */,
B7A03F471F86694F006AEF79 /* MessageLabel.swift in Sources */,
50FF345B2237FE9C0004DCD7 /* ContactMessageSizeCalculator.swift in Sources */,
B7A03F5F1F8669CA006AEF79 /* MessageLabelDelegate.swift in Sources */,
B7A03F4C1F86694F006AEF79 /* PlayButtonView.swift in Sources */,
1FD5896420660C1C004B5081 /* LocationItem.swift in Sources */,
@@ -682,6 +697,7 @@
1F6C040C206A2891007BDE44 /* MessageContentCell.swift in Sources */,
B7A03F2C1F866895006AEF79 /* DetectorType.swift in Sources */,
B7A03F271F866895006AEF79 /* Avatar.swift in Sources */,
50FF34572237FE6A0004DCD7 /* UIImage+Extension.swift in Sources */,
1F82D1431FB1B75B00B81A88 /* AvatarPosition.swift in Sources */,
1FF377AC20087DA2004FD648 /* MessagesViewController+Keyboard.swift in Sources */,
);