Merge branch 'charlesmchen/linkPreviewsComposeCancel'

Signal/Images.xcassets/compose-cancel.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "x-20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "x-20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "x-20@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/views/LinkPreviewView.swift

@@ -618,7 +618,7 @@ public class LinkPreviewView: UIStackView {
         cancelStack.setContentHuggingHigh()
         cancelStack.setCompressionResistanceHigh()
 
-        let cancelImage: UIImage = #imageLiteral(resourceName: "quoted-message-cancel").withRenderingMode(.alwaysTemplate)
+        let cancelImage = UIImage(named: "compose-cancel")?.withRenderingMode(.alwaysTemplate)
         let cancelButton = UIButton(type: .custom)
         cancelButton.setImage(cancelImage, for: .normal)
         cancelButton.addTarget(self, action: #selector(didTapCancel(sender:)), for: .touchUpInside)