Skip to content

Commit 84de558

Browse files
moldovaniosifmoldovaniosif
committed
apply review changes
1 parent 09907c1 commit 84de558

13 files changed

Lines changed: 215 additions & 181 deletions

‎Example/ChatExample.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@
364364
TargetAttributes = {
365365
882B5E321CF7D4B900B6E160 = {
366366
CreatedOnToolsVersion = 7.3.1;
367-
DevelopmentTeam = 5HU545WEHV;
368367
LastSwiftMigration = 0800;
369368
};
370369
882B5E481CF7D4B900B6E160 = {
@@ -773,7 +772,7 @@
773772
buildSettings = {
774773
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
775774
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
776-
DEVELOPMENT_TEAM = 5HU545WEHV;
775+
DEVELOPMENT_TEAM = "";
777776
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
778777
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
779778
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.ChatExample;
@@ -788,7 +787,7 @@
788787
buildSettings = {
789788
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
790789
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
791-
DEVELOPMENT_TEAM = 5HU545WEHV;
790+
DEVELOPMENT_TEAM = "";
792791
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
793792
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
794793
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.ChatExample;

‎Example/Sources/Models/MockMessage.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private struct MockAudiotem: AudioItem {
6464
self.url = url
6565
self.size = CGSize(width: 160, height: 35)
6666
// compute duration
67-
let audioAsset = AVURLAsset.init(url: url)
67+
let audioAsset = AVURLAsset(url: url)
6868
self.duration = Float(CMTimeGetSeconds(audioAsset.duration))
6969
}
7070

‎Example/Sources/View Controllers/AdvancedExampleViewController.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,12 @@ extension AdvancedExampleViewController: MessagesDisplayDelegate {
336336
return LocationMessageSnapshotOptions(showsBuildings: true, showsPointsOfInterest: true, span: MKCoordinateSpan(latitudeDelta: 10, longitudeDelta: 10))
337337
}
338338

339+
// MARK: - Audio Messages
340+
341+
func audioTintColor(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> UIColor {
342+
return self.isFromCurrentSender(message: message) ? .white : UIColor(red: 15/255, green: 135/255, blue: 255/255, alpha: 1.0)
343+
}
344+
339345
}
340346

341347
// MARK: - MessagesLayoutDelegate

‎Example/Sources/View Controllers/BasicExampleViewController.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import UIKit
2626
import MapKit
2727
import MessageKit
2828
import MessageInputBar
29-
import AVFoundation
3029

3130
final class BasicExampleViewController: ChatViewController {
3231

‎Example/Sources/View Controllers/ChatViewController.swift‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ SOFTWARE.
2525
import UIKit
2626
import MessageKit
2727
import MessageInputBar
28-
import AVFoundation
2928

3029
/// A base class for the example controllers
3130
class ChatViewController: MessagesViewController, MessagesDataSource {
@@ -65,7 +64,8 @@ class ChatViewController: MessagesViewController, MessagesDataSource {
6564
override func viewDidDisappear(_ animated: Bool) {
6665
super.viewDidDisappear(animated)
6766
MockSocket.shared.disconnect()
68-
self.stopAnyPlayingSound()
67+
68+
audioController.stopAnyOngoingPLaying()
6969
}
7070

7171
func loadFirstMessages() {
@@ -207,6 +207,20 @@ extension ChatViewController: MessageCellDelegate {
207207
print("Bottom label tapped")
208208
}
209209

210+
func didTapPlayButton(in cell: AudioMessageCell) {
211+
guard let indexPath = messagesCollectionView.indexPath(for: cell),
212+
let message = messagesCollectionView.messagesDataSource?.messageForItem(at: indexPath, in: messagesCollectionView) else {
213+
print("Failed to identify message when audio cell receive tap gesture")
214+
return
215+
}
216+
// check if should play sound or pause
217+
if cell.playButton.isSelected == true { // sound is playing - prepare to pause sound
218+
self.audioController.pauseSound(for: message, in: cell)
219+
} else { // sound is in pause or stoped - prepare to play sound
220+
self.audioController.playSound(for: message, in: cell)
221+
}
222+
}
223+
210224
func didStartAudio(in cell: AudioMessageCell) {
211225
print("Did start playing audio sound")
212226
}

‎MessageKit.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@
3535
1FF377AA20087D78004FD648 /* MessagesViewController+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF377A920087D78004FD648 /* MessagesViewController+Menu.swift */; };
3636
1FF377AC20087DA2004FD648 /* MessagesViewController+Keyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF377AB20087DA2004FD648 /* MessagesViewController+Keyboard.swift */; };
3737
38C2AE7C20D4878D00F8079E /* MessageInputBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38C2AE7B20D4878D00F8079E /* MessageInputBar.framework */; };
38-
5067043B2164F7BB00778871 /* AudioCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5067043A2164F7BB00778871 /* AudioCellDelegate.swift */; };
39-
5067043D2164F7D400778871 /* AudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5067043C2164F7D400778871 /* AudioController.swift */; };
40-
5067043F2164F7DC00778871 /* MessageViewController+AudioCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5067043E2164F7DC00778871 /* MessageViewController+AudioCellDelegate.swift */; };
4138
5074EF272163495800D82952 /* AudioItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5074EF262163495800D82952 /* AudioItem.swift */; };
4239
5074EF292163497200D82952 /* AudioMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5074EF282163497200D82952 /* AudioMessageCell.swift */; };
4340
5074EF2B2163498B00D82952 /* AudioMessageSizeCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5074EF2A2163498B00D82952 /* AudioMessageSizeCalculator.swift */; };
41+
50DA334821676BCF000ADEF2 /* BasicAudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DA334721676BCF000ADEF2 /* BasicAudioController.swift */; };
42+
50DA334A21676BDF000ADEF2 /* AudioControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DA334921676BDF000ADEF2 /* AudioControllerDelegate.swift */; };
4443
88916B2D1CF0DF2F00469F91 /* MessageKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88916B221CF0DF2F00469F91 /* MessageKit.framework */; };
4544
8962AC8A1F87AB7D0030B058 /* MessagesCollectionViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8962AC831F87AB230030B058 /* MessagesCollectionViewTests.swift */; };
4645
8962AC8C1F87AB7D0030B058 /* AvatarViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8962AC851F87AB230030B058 /* AvatarViewTests.swift */; };
@@ -135,12 +134,11 @@
135134
1FF377A920087D78004FD648 /* MessagesViewController+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MessagesViewController+Menu.swift"; sourceTree = "<group>"; };
136135
1FF377AB20087DA2004FD648 /* MessagesViewController+Keyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MessagesViewController+Keyboard.swift"; sourceTree = "<group>"; };
137136
38C2AE7B20D4878D00F8079E /* MessageInputBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageInputBar.framework; path = Carthage/Build/iOS/MessageInputBar.framework; sourceTree = "<group>"; };
138-
5067043A2164F7BB00778871 /* AudioCellDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioCellDelegate.swift; sourceTree = "<group>"; };
139-
5067043C2164F7D400778871 /* AudioController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioController.swift; sourceTree = "<group>"; };
140-
5067043E2164F7DC00778871 /* MessageViewController+AudioCellDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MessageViewController+AudioCellDelegate.swift"; sourceTree = "<group>"; };
141137
5074EF262163495800D82952 /* AudioItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioItem.swift; sourceTree = "<group>"; };
142138
5074EF282163497200D82952 /* AudioMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioMessageCell.swift; sourceTree = "<group>"; };
143139
5074EF2A2163498B00D82952 /* AudioMessageSizeCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioMessageSizeCalculator.swift; sourceTree = "<group>"; };
140+
50DA334721676BCF000ADEF2 /* BasicAudioController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicAudioController.swift; sourceTree = "<group>"; };
141+
50DA334921676BDF000ADEF2 /* AudioControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioControllerDelegate.swift; sourceTree = "<group>"; };
144142
88916B221CF0DF2F00469F91 /* MessageKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MessageKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
145143
88916B2C1CF0DF2F00469F91 /* MessageKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
146144
8962AC741F87AB230030B058 /* MessageKitDateFormatterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageKitDateFormatterTests.swift; sourceTree = "<group>"; };
@@ -416,7 +414,7 @@
416414
1FD5895F2064E08A004B5081 /* MediaItem.swift */,
417415
1FD5896320660C1C004B5081 /* LocationItem.swift */,
418416
5074EF262163495800D82952 /* AudioItem.swift */,
419-
5067043A2164F7BB00778871 /* AudioCellDelegate.swift */,
417+
50DA334921676BDF000ADEF2 /* AudioControllerDelegate.swift */,
420418
);
421419
path = Protocols;
422420
sourceTree = "<group>";
@@ -427,8 +425,7 @@
427425
B7A03F4E1F86697C006AEF79 /* MessagesViewController.swift */,
428426
1FF377A920087D78004FD648 /* MessagesViewController+Menu.swift */,
429427
1FF377AB20087DA2004FD648 /* MessagesViewController+Keyboard.swift */,
430-
5067043E2164F7DC00778871 /* MessageViewController+AudioCellDelegate.swift */,
431-
5067043C2164F7D400778871 /* AudioController.swift */,
428+
50DA334721676BCF000ADEF2 /* BasicAudioController.swift */,
432429
);
433430
path = Controllers;
434431
sourceTree = "<group>";
@@ -590,9 +587,9 @@
590587
B7A03F3C1F866946006AEF79 /* LocationMessageCell.swift in Sources */,
591588
1FF377AA20087D78004FD648 /* MessagesViewController+Menu.swift in Sources */,
592589
B7A03F5B1F8669CA006AEF79 /* MessageType.swift in Sources */,
593-
5067043D2164F7D400778871 /* AudioController.swift in Sources */,
594590
B7A03F601F8669CA006AEF79 /* MessagesDisplayDelegate.swift in Sources */,
595591
1FE783A8206633C0007FA024 /* InsetLabel.swift in Sources */,
592+
50DA334821676BCF000ADEF2 /* BasicAudioController.swift in Sources */,
596593
B7A03F5C1F8669CA006AEF79 /* MessageCellDelegate.swift in Sources */,
597594
1FF377A420087C82004FD648 /* MessageKitError.swift in Sources */,
598595
1F6C040E206A2AF4007BDE44 /* MessageReusableView.swift in Sources */,
@@ -606,7 +603,6 @@
606603
1FCA6D30201C1CC900BC3480 /* UIEdgeInsets+Extensions.swift in Sources */,
607604
B7A03F3D1F866946006AEF79 /* MediaMessageCell.swift in Sources */,
608605
1FE783A220662905007FA024 /* TextMessageSizeCalculator.swift in Sources */,
609-
5067043B2164F7BB00778871 /* AudioCellDelegate.swift in Sources */,
610606
B7A03F2E1F866895006AEF79 /* MessageKind.swift in Sources */,
611607
B7A03F7B1F866B85006AEF79 /* MessageCollectionViewCell.swift in Sources */,
612608
B7A03F6B1F8669EB006AEF79 /* UIColor+Extensions.swift in Sources */,
@@ -622,7 +618,6 @@
622618
1FD5896420660C1C004B5081 /* LocationItem.swift in Sources */,
623619
B7A03F291F866895006AEF79 /* Sender.swift in Sources */,
624620
B7A03F4F1F86697C006AEF79 /* MessagesViewController.swift in Sources */,
625-
5067043F2164F7DC00778871 /* MessageViewController+AudioCellDelegate.swift in Sources */,
626621
5074EF272163495800D82952 /* AudioItem.swift in Sources */,
627622
B7A03F251F866895006AEF79 /* NSConstraintLayoutSet.swift in Sources */,
628623
0EE91E661FDEC888005420A2 /* CGRect+Extensions.swift in Sources */,
@@ -637,6 +632,7 @@
637632
B7A03F2D1F866895006AEF79 /* LabelAlignment.swift in Sources */,
638633
1F6C040C206A2891007BDE44 /* MessageContentCell.swift in Sources */,
639634
B7A03F2C1F866895006AEF79 /* DetectorType.swift in Sources */,
635+
50DA334A21676BDF000ADEF2 /* AudioControllerDelegate.swift in Sources */,
640636
B7A03F271F866895006AEF79 /* Avatar.swift in Sources */,
641637
1F82D1431FB1B75B00B81A88 /* AvatarPosition.swift in Sources */,
642638
1FF377AC20087DA2004FD648 /* MessagesViewController+Keyboard.swift in Sources */,

0 commit comments

Comments
 (0)