Merge pull request #104 from Kommunicate-io/alswft-update-5.5

Update ApplozicSwift dependency to 5.5.0 #trivial
Kommunicate-io · May 26, 2020 · 8461083 · 8461083
2 parents f4337fe + 0bf75c3
commit 8461083
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 53 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,14 +1,14 @@
 PODS:
   - Applozic (7.3.0):
     - SDWebImage (~> 5.1.0)
-  - ApplozicSwift (5.3.0):
-    - ApplozicSwift/Complete (= 5.3.0)
-  - ApplozicSwift/Complete (5.3.0):
+  - ApplozicSwift (5.5.0):
+    - ApplozicSwift/Complete (= 5.5.0)
+  - ApplozicSwift/Complete (5.5.0):
     - Applozic (~> 7.3.0)
     - ApplozicSwift/RichMessageKit
     - Kingfisher (~> 5.13.0)
     - MGSwipeTableCell (~> 1.6.11)
-  - ApplozicSwift/RichMessageKit (5.3.0)
+  - ApplozicSwift/RichMessageKit (5.5.0)
   - FBSnapshotTestCase (2.1.4):
     - FBSnapshotTestCase/SwiftSupport (= 2.1.4)
   - FBSnapshotTestCase/Core (2.1.4)
@@ -23,7 +23,7 @@ PODS:
     - Kingfisher/Core (= 5.13.4)
   - Kingfisher/Core (5.13.4)
   - Kommunicate (5.1.0):
-    - ApplozicSwift (~> 5.3.0)
+    - ApplozicSwift (~> 5.5.0)
   - MGSwipeTableCell (1.6.11)
   - Nimble (8.0.5)
   - Nimble-Snapshots (8.1.1):
@@ -62,11 +62,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Applozic: 9fffca38afaf77ced5196619e00a4c67b074ecfc
-  ApplozicSwift: c40a0a1fa362550d53ffacd550c363ed9886c97d
+  ApplozicSwift: e9fe86679b7b86ba6c670ad6750ab2deab07fd66
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
   iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
   Kingfisher: d2279a7abece3c7f25a80cd2b7f363ca5cf3f44c
-  Kommunicate: aab191cee5983a494bc724baacfd3d03ab8f313d
+  Kommunicate: bb7e8a276e807c976093b448d0580c574cf0df36
   MGSwipeTableCell: b804e4e450dee439c42250be90bd50458bf67fce
   Nimble: 4ab1aeb9b45553c75b9687196b0fa0713170a332
   Nimble-Snapshots: 5058fb9b459e64371f54a0f8d9dde6f33db490a0

diff --git a/Kommunicate.podspec b/Kommunicate.podspec
@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
   s.swift_version = '4.2'
   s.source_files = 'Kommunicate/Classes/**/*.{swift}'
   s.resources = 'Kommunicate/Assets/**/*{lproj,storyboard,xib,xcassets,json,strings}'
-  s.dependency 'ApplozicSwift', '~> 5.3.0'
+  s.dependency 'ApplozicSwift', '~> 5.5.0'
 end
diff --git a/Kommunicate/Classes/Kommunicate.swift b/Kommunicate/Classes/Kommunicate.swift
@@ -460,48 +460,3 @@ open class Kommunicate: NSObject,Localizable{
         }
     }
 }
-
-class ChatMessage: ALKChatViewModelProtocol,Localizable {
-    var messageType: ALKMessageType
-    var avatar: URL?
-    var avatarImage: UIImage?
-    var avatarGroupImageUrl: String?
-    var name: String
-    var groupName: String
-    var theLastMessage: String?
-    var hasUnreadMessages: Bool
-    var totalNumberOfUnreadMessages: UInt
-    var isGroupChat: Bool
-    var contactId: String?
-    var channelKey: NSNumber?
-    var conversationId: NSNumber!
-    var createdAt: String?
-    var channelType: Int16
-
-    init(message: ALKChatViewModelProtocol) {
-        self.avatar = message.avatar
-        self.avatarImage = message.avatarImage
-        self.avatarGroupImageUrl = message.avatarGroupImageUrl
-        self.name = message.name
-        self.groupName = message.groupName
-        self.theLastMessage = message.theLastMessage
-        self.hasUnreadMessages = message.hasUnreadMessages
-        self.totalNumberOfUnreadMessages = message.totalNumberOfUnreadMessages
-        self.isGroupChat = message.isGroupChat
-        self.contactId = message.contactId
-        self.channelKey = message.channelKey
-        self.conversationId = message.conversationId
-        self.createdAt = message.createdAt
-        self.messageType = message.messageType
-        // Update message to show conversation assignee details
-        let (_,channel) = ConversationDetail().conversationAssignee(groupId: self.channelKey, userId: self.contactId)
-        self.channelType = message.channelType
-
-        guard let alChannel = channel  else {
-            self.groupName = localizedString(forKey: KMLocalizationKey.noName, fileName: Kommunicate.defaultConfiguration.localizedStringFileName)
-            return
-        }
-        self.groupName = alChannel.name ?? localizedString(forKey: KMLocalizationKey.noName, fileName: Kommunicate.defaultConfiguration.localizedStringFileName)
-        self.avatarGroupImageUrl = alChannel.channelImageURL
-    }
-}
diff --git a/Kommunicate/Classes/Models/ChatMessage.swift b/Kommunicate/Classes/Models/ChatMessage.swift
@@ -0,0 +1,57 @@
+//
+//  ChatMessage.swift
+//  Kommunicate
+//
+//  Created by Mukesh on 26/05/20.
+//
+
+import Foundation
+import ApplozicSwift
+
+class ChatMessage: ALKChatViewModelProtocol,Localizable {
+    var messageType: ALKMessageType
+    var avatar: URL?
+    var avatarImage: UIImage?
+    var avatarGroupImageUrl: String?
+    var name: String
+    var groupName: String
+    var theLastMessage: String?
+    var hasUnreadMessages: Bool
+    var totalNumberOfUnreadMessages: UInt
+    var isGroupChat: Bool
+    var contactId: String?
+    var channelKey: NSNumber?
+    var conversationId: NSNumber!
+    var createdAt: String?
+    var channelType: Int16
+    var isMessageEmpty: Bool
+
+    init(message: ALKChatViewModelProtocol) {
+        self.avatar = message.avatar
+        self.avatarImage = message.avatarImage
+        self.avatarGroupImageUrl = message.avatarGroupImageUrl
+        self.name = message.name
+        self.groupName = message.groupName
+        self.theLastMessage = message.theLastMessage
+        self.hasUnreadMessages = message.hasUnreadMessages
+        self.totalNumberOfUnreadMessages = message.totalNumberOfUnreadMessages
+        self.isGroupChat = message.isGroupChat
+        self.contactId = message.contactId
+        self.channelKey = message.channelKey
+        self.conversationId = message.conversationId
+        self.createdAt = message.createdAt
+        self.messageType = message.messageType
+        self.isMessageEmpty = message.isMessageEmpty
+
+        // Update message to show conversation assignee details
+        let (_,channel) = ConversationDetail().conversationAssignee(groupId: self.channelKey, userId: self.contactId)
+        self.channelType = message.channelType
+
+        guard let alChannel = channel  else {
+            self.groupName = localizedString(forKey: KMLocalizationKey.noName, fileName: Kommunicate.defaultConfiguration.localizedStringFileName)
+            return
+        }
+        self.groupName = alChannel.name ?? localizedString(forKey: KMLocalizationKey.noName, fileName: Kommunicate.defaultConfiguration.localizedStringFileName)
+        self.avatarGroupImageUrl = alChannel.channelImageURL
+    }
+}