Clean up attachments

Also fix group profile pictures

Signal/Images.xcassets/Loki V2/CirclePlay.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "CirclePlay.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/Images.xcassets/Loki V2/Play.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Play.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/Loki/Redesign/Components/ConversationCell.swift

@@ -117,9 +117,10 @@ final class ConversationCell : UITableViewCell {
             let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability
             if !randomUsers.isEmpty {
                 profilePictureView.hexEncodedPublicKey = randomUsers[0]
-                profilePictureView.additionalHexEncodedPublicKey = randomUsers.count == 2 ? randomUsers[1] : nil
+                profilePictureView.additionalHexEncodedPublicKey = randomUsers.count == 2 ? randomUsers[1] : ""
             } else {
-                // TODO: Handle
+                profilePictureView.hexEncodedPublicKey = ""
+                profilePictureView.additionalHexEncodedPublicKey = ""
             }
             profilePictureView.isRSSFeed = (threadViewModel.threadRecord as? TSGroupThread)?.isRSSFeed ?? false
         } else {

Signal/src/Loki/Redesign/Components/ProfilePictureView.swift

@@ -59,7 +59,8 @@ final class ProfilePictureView : UIView {
             imageView.removeConstraint(imageViewWidthConstraint)
             imageView.removeConstraint(imageViewHeightConstraint)
         }
-        func getProfilePicture(of size: CGFloat, for hexEncodedPublicKey: String) -> UIImage {
+        func getProfilePicture(of size: CGFloat, for hexEncodedPublicKey: String) -> UIImage? {
+            guard !hexEncodedPublicKey.isEmpty else { return nil }
             return OWSProfileManager.shared().profileAvatar(forRecipientId: hexEncodedPublicKey) ?? Identicon.generateIcon(string: hexEncodedPublicKey, size: size)
         }
         let size: CGFloat

Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift

@@ -326,8 +326,10 @@ public class ConversationMediaView: UIView {
         stillImageView.autoPinEdgesToSuperviewEdges()
 
         if !addUploadProgressIfNecessary(stillImageView) {
-            let videoPlayIcon = UIImage(named: "play_button")
+            let videoPlayIcon = UIImage(named: "CirclePlay")
             let videoPlayButton = UIImageView(image: videoPlayIcon)
+            videoPlayButton.set(.width, to: 72)
+            videoPlayButton.set(.height, to: 72)
             stillImageView.addSubview(videoPlayButton)
             videoPlayButton.autoCenterInSuperview()
         }

Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m

@@ -251,11 +251,13 @@ const CGFloat kRemotelySourcedContentRowSpacing = 4;
             quotedAttachmentView.backgroundColor = [UIColor whiteColor];
 
             if (self.isVideoAttachment) {
-                UIImage *contentIcon = [UIImage imageNamed:@"attachment_play_button"];
+                UIImage *contentIcon = [UIImage imageNamed:@"Play"];
                 contentIcon = [contentIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
                 UIImageView *contentImageView = [self imageViewForImage:contentIcon];
-                contentImageView.tintColor = [UIColor whiteColor];
+                contentImageView.tintColor = LKColors.text;
                 [quotedAttachmentView addSubview:contentImageView];
+                [contentImageView autoSetDimension:ALDimensionWidth toSize:16];
+                [contentImageView autoSetDimension:ALDimensionHeight toSize:16];
                 [contentImageView autoCenterInSuperview];
             }
         } else if (self.quotedMessage.thumbnailDownloadFailed) {

SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift

@@ -154,8 +154,10 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
             let playButton = UIButton()
             self.playVideoButton = playButton
             playButton.accessibilityLabel = NSLocalizedString("PLAY_BUTTON_ACCESSABILITY_LABEL", comment: "Accessibility label for button to start media playback")
-            playButton.setBackgroundImage(#imageLiteral(resourceName: "play_button"), for: .normal)
+            playButton.setBackgroundImage(#imageLiteral(resourceName: "CirclePlay"), for: .normal)
             playButton.contentMode = .scaleAspectFit
+            playButton.autoSetDimension(.width, toSize: 72)
+            playButton.autoSetDimension(.height, toSize: 72)
 
             let playButtonWidth = ScaleFromIPhone5(70)
             playButton.autoSetDimensions(to: CGSize(width: playButtonWidth, height: playButtonWidth))

SignalMessaging/ViewControllers/MediaMessageView.swift

@@ -252,12 +252,14 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
         // attachment approval provides it's own play button to keep it
         // at the proper zoom scale.
         if mode != .attachmentApproval {
-            let videoPlayIcon = UIImage(named: "play_button")!
+            let videoPlayIcon = UIImage(named: "CirclePlay")!
             let videoPlayButton = UIImageView(image: videoPlayIcon)
             self.videoPlayButton = videoPlayButton
             videoPlayButton.contentMode = .scaleAspectFit
             self.addSubview(videoPlayButton)
             videoPlayButton.autoCenterInSuperview()
+            videoPlayButton.autoSetDimension(.width, toSize: 72)
+            videoPlayButton.autoSetDimension(.height, toSize: 72)
         }
     }