Improvement - Show Main Avatar

show main avatar in chat room and profile, also load large thumbnail for room list avatars

Author: saeedmozaffariGithub

iGap/Controller/Custom Master Controllers/NavigationController/IGNavigationItem.swift

@@ -385,7 +385,7 @@ class IGNavigationItem: UINavigationItem {
         let avatarViewFrame = CGRect(x: 0, y: 0, width: 40, height:40)
 
         let avatarView = IGAvatarView(frame: avatarViewFrame)
-        avatarView.setRoom(room)
+        avatarView.setRoom(room, showMainAvatar: true)
         rightViewContainer!.addSubview(avatarView)
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 10.0) {

iGap/Controller/View Controllers/Channel and Group Info/IGChannelInfoTableViewController.swift

@@ -712,7 +712,7 @@ class IGChannelInfoTableViewController: UITableViewController , UIGestureRecogni
         channelNameLabel.text = room?.title
         ChannelDescriptionLabel.text = room?.channelRoom?.roomDescription
         if let channelRoom = room {
-            channelImage.setRoom(channelRoom)
+            channelImage.setRoom(channelRoom, showMainAvatar: true)
         }
         if let channelType = room?.channelRoom?.type {
             switch channelType {

iGap/Controller/View Controllers/Channel and Group Info/IGGroupInfoTableViewController.swift

@@ -589,7 +589,7 @@ class IGGroupInfoTableViewController: UITableViewController , UIGestureRecognize
         groupNameLabel.text = room?.title
         groupDescriptionLabel.text = room?.groupRoom?.roomDescription
         if let groupRoom = room {
-            groupAvatarView.setRoom(groupRoom)
+            groupAvatarView.setRoom(groupRoom, showMainAvatar: true)
         }
         if let groupType = room?.groupRoom?.type {
             switch groupType {

iGap/Controller/View Controllers/Chat and User Info/IGRegistredUserInfoTableViewController.swift

@@ -42,7 +42,7 @@ class IGRegistredUserInfoTableViewController: UITableViewController , UIGestureR
         super.viewDidLoad()
         if user != nil {
             requestToGetAvatarList()
-            self.avatarView.setUser(user!)
+            self.avatarView.setUser(user!, showMainAvatar: true)
             self.displayNameLabel.text = user!.displayName
             if let phone = user?.phone {
                 if phone == 0 {
@@ -299,7 +299,7 @@ class IGRegistredUserInfoTableViewController: UITableViewController , UIGestureR
     func handleTap(recognizer:UITapGestureRecognizer) {
         if recognizer.state == .ended {
             if let userAvatar = user?.avatar {
-                showAvatar( avatar: userAvatar)
+                showAvatar(avatar: userAvatar)
             }
         }
     }

iGap/Controller/View Controllers/Setting/IGSettingAddContactViewController.swift

@@ -44,8 +44,6 @@ class IGSettingAddContactViewController: UIViewController, UIGestureRecognizerDe
     }
 
     private func makeView(){
-        btnChooseCountry.removeUnderline()
-        
         btnChooseCountry.layer.cornerRadius = 5
         btnChooseCountry.layer.borderWidth = 1
         btnChooseCountry.layer.borderColor = UIColor.iGapColor().cgColor

iGap/Controller/View Controllers/Setting/IGSettingTableViewController.swift

@@ -50,7 +50,7 @@ class IGSettingTableViewController: UITableViewController , NVActivityIndicatorV
         let realm = try! Realm()
         let predicate = NSPredicate(format: "id = %lld", currentUserId!)
         if let userInDb = realm.objects(IGRegisteredUser.self).filter(predicate).first {
-            userAvatarView.setUser(userInDb)
+            userAvatarView.setUser(userInDb, showMainAvatar: true)
             usernameLabel.text = userInDb.displayName
             user = userInDb
             userAvatarView.avatarImageView?.isUserInteractionEnabled = true

iGap/General/IGGlobal.swift

@@ -564,28 +564,52 @@ extension UIImageView {
         }
     }
 
-    func setImage(avatar: IGAvatar) {
-        if let smallThumbnail = avatar.file?.smallThumbnail {
+    func setImage(avatar: IGAvatar, showMain: Bool = false) {
+        
+        var file : IGFile!
+        var previewType : IGFile.PreviewType!
+        
+        if showMain {
+            
+            file = avatar.file
+            previewType = IGFile.PreviewType.originalFile
+            
+        } else {
+            
+            if let largeThumbnail = avatar.file?.largeThumbnail {
+                file = largeThumbnail
+                previewType = IGFile.PreviewType.largeThumbnail
+            } else {
+                file = avatar.file?.smallThumbnail
+                previewType = IGFile.PreviewType.smallThumbnail
+            }
+        }
+        
+        if file != nil {
             do {
-                if smallThumbnail.attachedImage != nil {
-                    self.image = smallThumbnail.attachedImage
+                if file.attachedImage != nil {
+                    self.image = file.attachedImage
                 } else {
+                    
                     var image: UIImage?
-                    let path = smallThumbnail.path()
+                    let path = file.path()
                     if IGGlobal.isFileExist(path: path) {
                         image = UIImage(contentsOfFile: path!.path)
                     }
 
                     if image != nil {
                         self.image = image
                     } else {
+                        if showMain {
+                            setImage(avatar: avatar) // call this method again for load thumbnail before load main image
+                        }
                         throw NSError(domain: "asa", code: 1234, userInfo: nil)
                     }
                 }
             } catch {
-                IGDownloadManager.sharedManager.download(file: smallThumbnail, previewType:.smallThumbnail, completion: { (attachment) -> Void in
+                IGDownloadManager.sharedManager.download(file: file, previewType: previewType, completion: { (attachment) -> Void in
                     DispatchQueue.main.async {
-                        let path = smallThumbnail.path()
+                        let path = file.path()
                         if let data = try? Data(contentsOf: path!) {
                             if let image = UIImage(data: data) {
                                 self.image = image
@@ -597,9 +621,7 @@ extension UIImageView {
                 })
             }
         }
-        
     }
-    
 }
 
 //MARK: -

iGap/Libraries/Chat Screen/Controller/IGMessageViewController.swift

@@ -2522,7 +2522,7 @@ extension IGMessageViewController: IGMessageGeneralCollectionViewCellDelegate {
         return self
     }
 
-    func didTapOnAttachment(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell, imageView: IGImageView) {
+    func didTapOnAttachment(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell, imageView: IGImageView?) {
 
         var finalMessage = cellMessage
         var roomMessageLists = self.messagesWithMedia

iGap/Libraries/Chat Screen/View/IGMessageGeneralCollectionViewCell.swift

@@ -13,7 +13,7 @@ import UIKit
 
 protocol IGMessageGeneralCollectionViewCellDelegate {
     func didTapAndHoldOnMessage(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell)
-    func didTapOnAttachment(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell, imageView: IGImageView)
+    func didTapOnAttachment(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell, imageView: IGImageView?)
     func didTapOnForwardedAttachment(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell)
     func didTapOnOriginalMessageWhenReply(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell)
     func didTapOnSenderAvatar(cellMessage: IGRoomMessage, cell: IGMessageGeneralCollectionViewCell)

iGap/VIew/ReusableViews/IGAvatarView.swift

@@ -71,15 +71,15 @@ class IGAvatarView: UIView {
         self.initialLettersLabel!.text = ""
     }
 
-    func setUser(_ user: IGRegisteredUser) {
+    func setUser(_ user: IGRegisteredUser, showMainAvatar: Bool = false) {
         self.avatarImageView!.image = nil
         self.initialLettersLabel!.text = user.initials
 
         let color = UIColor(hexString: user.color)
         self.initialLettersView!.backgroundColor = color
 
         if let avatar = user.avatar {
-            self.avatarImageView!.setImage(avatar: avatar)
+            self.avatarImageView!.setImage(avatar: avatar, showMain: showMainAvatar)
         }
 
         if self.frame.size.width < 40 {
@@ -92,7 +92,7 @@ class IGAvatarView: UIView {
 
     }
 
-    func setRoom(_ room: IGRoom) {
+    func setRoom(_ room: IGRoom, showMainAvatar: Bool = false) {
 
         if room.isInvalidated {
             return
@@ -107,16 +107,16 @@ class IGAvatarView: UIView {
         switch room.type {
         case .chat:
             if let avatar = room.chatRoom?.peer?.avatar {
-                self.avatarImageView!.setImage(avatar: avatar)
+                self.avatarImageView!.setImage(avatar: avatar, showMain: showMainAvatar)
 
             }
         case .group:
             if let avatar = room.groupRoom?.avatar {
-                self.avatarImageView!.setImage(avatar: avatar)
+                self.avatarImageView!.setImage(avatar: avatar, showMain: showMainAvatar)
             }
         case .channel:
             if let avatar = room.channelRoom?.avatar {
-                self.avatarImageView!.setImage(avatar: avatar)
+                self.avatarImageView!.setImage(avatar: avatar, showMain: showMainAvatar)
             }
         }