From 68a908d19ab3829366fbb848ec56c1b04fd8f796 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 1 Jun 2023 10:43:19 +0200 Subject: [PATCH] Add EmojisPicker lib --- .../Views/ChatConversationViewSwift.swift | 22 ++++++++++++++++--- Podfile | 3 ++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift index 8ef643685..fe7626ca4 100644 --- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift +++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift @@ -24,8 +24,15 @@ import linphonesw import DropDown import PhotosUI import AVFoundation +import EmojiPicker -class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControllerDelegate, UIDocumentPickerDelegate, UICompositeViewDelegate, UICollectionViewDataSource, UICollectionViewDelegate, UIImagePickerControllerDelegate, CoreDelegate & UINavigationControllerDelegate{ // Replaces ChatConversationView +class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControllerDelegate, UIDocumentPickerDelegate, UICompositeViewDelegate, UICollectionViewDataSource, UICollectionViewDelegate, UIImagePickerControllerDelegate, EmojiPickerDelegate, CoreDelegate & UINavigationControllerDelegate{ + // Replaces ChatConversationView + + func didGetEmoji(emoji: String) { + //emojiButton.setTitle(emoji, for: .normal) + messageView.voiceRecordButton.setTitle(emoji, for: .normal) + } static let compositeDescription = UICompositeViewDescription(ChatConversationViewSwift.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil) @@ -242,7 +249,9 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll messageView.sendButton.onClickAction = onSendClick messageView.pictureButton.onClickAction = alertAction - messageView.voiceRecordButton.onClickAction = onVrStart + messageView.voiceRecordButton.addTarget(self,action:#selector(openEmojiPickerModule), + for:.touchUpInside) + //messageView.voiceRecordButton.onClickAction = openEmojiPickerModule recordingDeleteButton.onClickAction = cancelVoiceRecording recordingPlayButton.onClickAction = onvrPlayPauseStop recordingStopButton.onClickAction = onvrPlayPauseStop @@ -1352,10 +1361,17 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll messageView.messageText.emojiPIcker = true messageView.messageText.becomeFirstResponder() - //messageView.messageText.emojiPIcker = false + messageView.messageText.emojiPIcker = false } + @objc private func openEmojiPickerModule(sender: UIButton) { + let viewController = EmojiPickerViewController() + viewController.delegate = self + viewController.sourceView = sender + present(viewController, animated: true) + } + func startVoiceRecording() { ChatConversationViewModel.sharedModel.startVoiceRecording() setRecordingVisible(visible: false) diff --git a/Podfile b/Podfile index 114a2a8e0..bc8703acb 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '11.2' source "https://gitlab.linphone.org/BC/public/podspec.git" source "https://github.com/CocoaPods/Specs.git" @@ -30,6 +30,7 @@ target 'linphone' do pod 'DropDown' pod 'IQKeyboardManager' pod 'SwipeCellKit' # License: https://github.com/SwipeCellKit/SwipeCellKit/blob/develop/LICENSE + pod 'EmojiPicker', :git => 'https://github.com/htmlprogrammist/EmojiPicker' all_pods end