From 1df8b92034876e97afe299a5b340b67a68af15ed Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 23 Jan 2019 16:37:26 -0500
Subject: [PATCH] Update cancel button asset for link previews.

---
 .../compose-cancel.imageset/Contents.json     |  23 ++++++++++++++++++
 .../compose-cancel.imageset/x-20@1x.png       | Bin 0 -> 223 bytes
 .../compose-cancel.imageset/x-20@2x.png       | Bin 0 -> 371 bytes
 .../compose-cancel.imageset/x-20@3x.png       | Bin 0 -> 499 bytes
 Signal/src/views/LinkPreviewView.swift        |   2 +-
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Signal/Images.xcassets/compose-cancel.imageset/Contents.json
 create mode 100644 Signal/Images.xcassets/compose-cancel.imageset/x-20@1x.png
 create mode 100644 Signal/Images.xcassets/compose-cancel.imageset/x-20@2x.png
 create mode 100644 Signal/Images.xcassets/compose-cancel.imageset/x-20@3x.png

diff --git a/Signal/Images.xcassets/compose-cancel.imageset/Contents.json b/Signal/Images.xcassets/compose-cancel.imageset/Contents.json
new file mode 100644
index 000000000..69e3d4f0a
--- /dev/null
+++ b/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"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/compose-cancel.imageset/x-20@1x.png b/Signal/Images.xcassets/compose-cancel.imageset/x-20@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1c35a4a48fd2e559b1f234935e7e22444d069fa
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VXMsm#F#`j)5C}6~x?A@LC^*s6
z#WBR9_w1BJz6J%3)`h|qDg8HkbMlSdxm=F+-?<|qH-C}F_G=oOb60MWJaJ~~%+rgE
zq_%YIte9BjFU`kOrlhs}?yCzWx@x5bECF0GE0*(eFP@dY+S*PygEh;{G|X7)!i}F<
zZp>1v8onHg3o|JDuA9pG?O)Iyhx5ysg1N2#zFb<*$5h2VdjWIXzt8fsJNVWys#F`j
SdMXEW9D}E;pUXO@geCw|hEH1n

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/compose-cancel.imageset/x-20@2x.png b/Signal/Images.xcassets/compose-cancel.imageset/x-20@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..607f7dec62e053c30f53a2a2aebe5f2f4415a8b9
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000&x
z000&x0ZCFM@Bjb-B}qg<R9J=WSlbQ5APhV@K}O1`86_j6n{)$LNRBGi2N7UYtIA3K
zxx)EKc^Hz2ATl1I-Q5NqP&JrRS`6uos~kmxDWwg-KGURX@0yDvuj20jkUNOR0bpV6
zMj~sf_L*m6dX}&q-A%USFr8<cY}GczOp`sDhL~ltSIZElfrH5r4MVUPN-#J;LzJRx
z{&;+SMwX&!dvKb+hVU@yy0{oQVzTxd)0$%N!X)GR_fAF*nshyV4B=?f<!CIHTVcRl
z|HWTiFc)KyRLuQ;n+d&9hd$~;7Ym`wt<VK)=#oG5r785aGup-76bmBq(#9vA09NH)
zpjxYHpEzg^HbVKl&(Kj#_>%NpCP(!NIKMv8Q90r&N7Y~im^pYGY(#8>0NzunqVn08
R*P{Rc002ovPDHLkV1i*+opt~K

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/compose-cancel.imageset/x-20@3x.png b/Signal/Images.xcassets/compose-cancel.imageset/x-20@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4fadf69a94d546e995cbcabc4c3e3451036f601
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00009a7bBm001F3
z001F30W(;idH?_crAb6VRA_<in~iP5AP|KgogkZZg^cD=GD=2hHt7abNUrMoflXEJ
zM?OwEMS0k8pTeIGl5)<7WN)EpCvX6pz*n~k+_IF?l2W=gip{LVRATFHzpTS&4&YH9
z1@Hmj*7J^rmsr-A%9lqMOHKUszz=Np1igdJz0f4=DqVIJx`1xLe*02;rx*CBViV~9
z#zX==;0Ss|EF{$21N5jENNBkw^vJeJIC2Z<(QT6830k5p61+f5wLyXhXwkZBqG^{C
z?mZ+}2B<PrYN7?S)?`S61+?nSUlTQ<wbynMG@(s4GBr^H+G?vRcJi>MgPs81sStRr
zpRKZc&iRu{M#LorjC1IkiNZoUYq<t~-~6ISCJqaYG;Jre3M^(`TEIHTaVdLh<h@0K
z|2S!>K#KvNz`hz|S{}N#IA3|=LBiZx3c*@Ilb{J}0ZoE7tTr?W7O<MoBv`>}L6hJi
zFn4L%P>J|ZM=hZa(?T7WhB^=rb>$)4rIv8lmU6U<X%%P}unp)jR}VLpFP>m`(1+c4
p>+??@SGNg#b(_Ffw^+acz5pcWx}k+MuRQ<&002ovPDHLkV1gK!*ChY|

literal 0
HcmV?d00001

diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift
index 9930ed53a..53cde1861 100644
--- a/Signal/src/views/LinkPreviewView.swift
+++ b/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)