From 01bfa8dfc467d351dc4f3e91011a47f91b23c0b5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 8 May 2018 15:52:19 -0400 Subject: [PATCH] Apply contact share assets. --- .../Contents.json | 23 ++++++++++++++++++ .../phone_20@1x.png | Bin 0 -> 398 bytes .../phone_20@2x.png | Bin 0 -> 768 bytes .../phone_20@3x.png | Bin 0 -> 1115 bytes .../Contents.json | 23 ++++++++++++++++++ .../message_20@1x.png | Bin 0 -> 356 bytes .../message_20@2x.png | Bin 0 -> 617 bytes .../message_20@3x.png | Bin 0 -> 943 bytes .../Contents.json | 23 ++++++++++++++++++ .../video_20@1x.png | Bin 0 -> 228 bytes .../video_20@2x.png | Bin 0 -> 447 bytes .../video_20@3x.png | Bin 0 -> 605 bytes .../ContactViewController.swift | 13 +++++++++- 13 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 Signal/Images.xcassets/contact_view_audio_call.imageset/Contents.json create mode 100644 Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@1x.png create mode 100644 Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@2x.png create mode 100644 Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@3x.png create mode 100644 Signal/Images.xcassets/contact_view_message.imageset/Contents.json create mode 100644 Signal/Images.xcassets/contact_view_message.imageset/message_20@1x.png create mode 100644 Signal/Images.xcassets/contact_view_message.imageset/message_20@2x.png create mode 100644 Signal/Images.xcassets/contact_view_message.imageset/message_20@3x.png create mode 100644 Signal/Images.xcassets/contact_view_video_call.imageset/Contents.json create mode 100644 Signal/Images.xcassets/contact_view_video_call.imageset/video_20@1x.png create mode 100644 Signal/Images.xcassets/contact_view_video_call.imageset/video_20@2x.png create mode 100644 Signal/Images.xcassets/contact_view_video_call.imageset/video_20@3x.png diff --git a/Signal/Images.xcassets/contact_view_audio_call.imageset/Contents.json b/Signal/Images.xcassets/contact_view_audio_call.imageset/Contents.json new file mode 100644 index 000000000..55ca8105d --- /dev/null +++ b/Signal/Images.xcassets/contact_view_audio_call.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "phone_20@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "phone_20@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "phone_20@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@1x.png b/Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..b665a0065d7c42d86d70161055398f5a134d2017 GIT binary patch literal 398 zcmV;90df9`P)Px$NJ&INR5%f(l)FkqF%(5JilBpyrH?|pDMb(wixIS#5AY)dyZHk@M#M*BAt)jU zc4{FOHa6M}f`S$ng7{b)Zr~7dE;BK($vJ0d@8srj8zF=dumDynEYshC4k&83sD3k8 zD{@2hmNC-=N2P}Mj^Q`;xj{{b5cC|8xGjfs%Mv}hYzVCy&ZRbBa))wFecDyk5aV#4 zz?$xmkJe~hN}v1z&XWFunY7LcmVGp+hlkE?0zcV194Bsh;Pgoy(m3X_w6?!uZ$p?zf#)- zT3M{6{Rv#Q$uzgp)F91!b`P!d7s+8&Xw&z5+Gp0pi*@?xl}c9@^R8!-tLyR~gY=n3 sGxbaTeu|wyZ@*JvmVOFMf+w)}2SCtt(`*Y1v;Y7A07*qoM6N<$g1V@xLjV8( literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@2x.png b/Signal/Images.xcassets/contact_view_audio_call.imageset/phone_20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..697b45bf3248b75b56dbed60ce6cd0d3aca41c96 GIT binary patch literal 768 zcmV+b1ONPqP)Px%x=BPqR9Fecn7M0JK@`ScG=+$UDEIfo&jkQhw z04;1%m{Mb6<_jncF$4=kP!P97(BCH+xLjv)=geK+f$!aUXU_87+3&Pke%XS0 z09*mHU>PieKF}7~Mb;580iJ+W@W+F9=r(~yWsGb;fRB(*cdAi#B>QL}C&CY#CivY* zP$YYsBB}B8H6huB1fOJ=H+cHS+D5u>`0Pl|XmC^uem2-U)2$RVxf+ovvTW2^p}P0@ z)xP8?!K=h(*p1(CqHnZY8G=f3Bsx=~p$I-p^p)G=622zaC9FeZ&8J_(e%zFyr17MI z;0m_KO6D`WpNk~;9J?NK^a>od6QgL$yNiwN8Wl|viMG2t|4QK>wO-1$7>;PH8N%K- zA)M|f^?QslD>d&R+6&+a`JT5c&6p7EYym-$KAsS_GM7#wy#>D3bGp~mH*%5*z18Ug zf+G3==w;d__sQ&9EcCqIHg+W54}L|Eto>xYInWB)&h(`>7^rvZ6BM*IK6Q$S=SghN zgKa?LSv`~_T6ShYsEf0Db$85|yqJr(!2io2dD88~`2)z336(W*xmU6fxM zd|f*OU6v*X0JSl&*TsHH{QV$9y1PhRw2FRq*3%4C#CMMt$F zQrUXl^j0ofT+e`_lX;d%sI2Sg+C<}1>*g(BSv#|2M`~l23#?C7eM(G%C6FZ%D(fVr yi~W|~v}w_#>IVnbv6rV#GkOu>3%Ckyg4SQc-{BNoN{hSz0000Px(6-h)vRA>d&T1jgaK@iS!!xazW5((-hiXcP~714u&UL@ebB_I(*4+a$v@hU#d zFAz_9@DLD<7xgCOpagG<5kv(+MGd$SL2&^!F5ia}X&*DaO;@H~!S~+0sp_iwrh0n1 z`%O!Wzs!c|R-g_H0;9kipbwY?G`+NeK^Jfa7zW0G-v#K!`KFMXk!1&tHvtoq^%@A-a^UFt%VrR$ zI~HhPiTP_p^}SDBb{w=?D`DXolokHuY3pM)6-GTihE>|!MQ~T;LiC)BOskTREjBCs z*=7)-TZlG$BHB$z6B2$W5J~OeMZ%8-2(N`tm5(SX!n}rRtGo`$g$zo*wtPe_B6Ce5 zSz$h+wrL{ETuAsMz{!V%s9il>23y~*>TCA|K4(c>#WFrwVakoaU&%i2!P6GtOEQm% z9ks)sZ{=Ke>@71B=O^NBq$Fvsx=x5>Cgilg1Ys^fb_nGq=C(7E@Kdx~C6<+-<09cJQDwdc*_ah{9shv+a#ai>l6e?NdLSZ( zswM{m3G;EZK^23*WH{-63Annmseb@_wc9!-|HjRWm79Zd~HI2jM98~e zUFTTovfXrk z3hp|84Q)f7)4V`eJmc}jnm%ALkW_e2vYWcd73n!S>F~_xR74zhcdqM`cK0I@iI^9F zgIOK0b;DiIb6#(@3q4NS-PwIY6KJ&On2=Wq_JA_CPGcN)_v3)M!-JpUau!V*ornHr z6}gwaA`3qs-_LQYqmTI|uj#bJ=it$w%L&PaRrz}QgrXU1XG_IO~N*F zav0xbM(@<*^85{^Burl%SyK)+c}bT!S5Hlt{x~_|=vyW+skVIITSR8SD+eH{#AEz& zP~*?4{1Q&@AJ>Tq~P}z)VF?(boq-?fb6UsIV#*IPl zhK6nd+lct;+NvNt9+UgtM}ZfBZ^C8l7)OP$;s*ff#~61<)CvEpJq>VWQ>L1EZMmFP zD|{276X*v!}m002ovPDHLkV1i&H_{;zR literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_message.imageset/Contents.json b/Signal/Images.xcassets/contact_view_message.imageset/Contents.json new file mode 100644 index 000000000..21451e63a --- /dev/null +++ b/Signal/Images.xcassets/contact_view_message.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "message_20@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "message_20@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "message_20@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/contact_view_message.imageset/message_20@1x.png b/Signal/Images.xcassets/contact_view_message.imageset/message_20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b70dc4a0c366049d412697c14af71241bfd322 GIT binary patch literal 356 zcmV-q0h|7bP)Px$9!W$&R5%gMls{?$K^#V-f`y%+h~f>@Cbif_uV9@M*ru@a4qm`QNENV2A@Kwj zrf~&38w(L4Nf1SS-{QcI_%FL#FuB@vnW`GBGInlx?Vc0eyZ}I*hz;rTx(7R=B50000Px%BS}O-R9Fe^m`f`}VHn3}5M?C`l-O8MvZNG6E<2^jC-4pIDMcw+DjO@8rG=e^ zOA$#V$_Fsz(zs+rx&8jkt8r!y=gc{rSNYd}9^T9I{LVY)@}7yua#I1*nsGO7z~#6s z6$!Bme3^i|kAI4!`)c=4h^RgsM2%dhssy3*|Omxs+461F4ePYuK$& z(01ikjhxiOtRxN!@!fpYP%U2?V)S>3!|qp2Pa0%Y*u}l(Q|&L+Pwx};C zsC(H>gmC6y#UPdp&C_BAMIGmybnOHht9_5kf9d+gulhDI*?61h`Dyf(#l*Lw!VW)715} zVbSg8H_yE*>gh)$Pby`U-bsH0Q12Tv*w+t7Qy$><7^B@!t_Pv5o$B}kV|=U@>!{oc z>)teswZWAe@hBGXEq0ry&9KId<2GD~eM?u)Hg+qrMW2AaQZb!+u(#k=tOM5TY$%!_ zixcjdwpBb3N`(MPw0a#_=SC9idAx}iaRUGA&#%BMH__c+Z%Jwi00000NkvXXu0mjf DSM(i) literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_message.imageset/message_20@3x.png b/Signal/Images.xcassets/contact_view_message.imageset/message_20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dba15e3cae91c038eab73749507297e31b0596d0 GIT binary patch literal 943 zcmV;g15o^lP)Px&X-PyuRA>e5n@emBQ5?qABO0^`LDPkV3W;b#=mw!%3pQ-*?66=V?7I^i3oDB* zSlA(gB}vOd8ePzOCmuJMh^J(}MmJ(|Fd*xD2<*phQlc@*(gtiSuji=nwAT6n4 zJJE+>RAFhilNM>RjyXi^hQDCiCQRc?le9^r6|@rNCNvdN?e@|rt%KaU%H0%EIATJehj22mowUu99 z%3?iRze8IIvyLM#@>CKx*pjtK+xg|`zu3vQwv)LMPu^yrpKn|dXj_N8O~EE=wv)IP zPaY>v+lQvu&u8VI#|FHKy1USlPoI;n-coAS4|6BXyIHxG$4(jUQq2=|$#AnBNf0OxsNRu(5T!=s*r?idt!QH;PWm8*REe}>v=7++NA~E(#$(9hYfa6`3-H4s!Q=^+`YV* zW5d1S*$v9;C`{zk^p3#f^v`oSG<v zp^c|PsQR~THLB((^^-^gAtC>+NIqys+L}KHySxDG`?Pgh6m7W{JMku>V>Z# zFzTqf(C$h>Hy`GxrQKN%y^ok%EcVbP<5TFutX0zR7@Zr6(&Lr()qvU0XgmoQ#IsoJ zrPuc~YL!MdtL^X6)(v%zv4X=yF*T!;+Zp&IM&GEpbn$*125-_+Ob$JA`3R$mP`g)9 zulWbqOhLQa9hl@rR9%}tgj(@!g*vZTK{(JQBJMGWdV#ijs{WxwA3eg^0(IHB7OsIy zU{it0t;N0m^Y9Mp{|@31?1vis)Ucn(QD^oUZFi-nqzZvG13K$fGOW=*2#wdM^l=J< zs3~PuyPS4)&1i7Lk7DgYv!!F@8`M8XRMw*79@L4a4{9Y-M|}k9BjDx;`~@F_c??CF RAa(!%002ovPDHLkV1ksf(7pfw literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_video_call.imageset/Contents.json b/Signal/Images.xcassets/contact_view_video_call.imageset/Contents.json new file mode 100644 index 000000000..2f7c70957 --- /dev/null +++ b/Signal/Images.xcassets/contact_view_video_call.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "video_20@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "video_20@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "video_20@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@1x.png b/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..9a924596dfd345bcf24c9885ac54b84fcb16445b GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1Igd7dtgAr^wk z2@(?(*k8QXcla}(I5^x#$zj_Q{;7(Aq;LQgP#(fC+9I z9c-5j-2XCm3TAU`vYODi$6*ggti5nRLrehs6^ZV3GliIEUgTx|sA(uLyYlcIhXAGH zToWcUZ_Jr_$cD~BXf!Q%~J#UBPia3h~9$7~Q ZhBI|F!e16l76Q7I!PC{xWt~$(69CDgOTz#F literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@2x.png b/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..850f74f6347f17fc3ac7d4001d4381e851518c82 GIT binary patch literal 447 zcmV;w0YLtVP)Px$c}YY;R9Fe^n7c~EKoo|9w?dY!M6eYL8$rYi2tJ05l@DQ|FJSKzh~Od!K7hT5 zplD%fVXuuYR*IMJUl77@lFfwZta1)~OLAsT&YwRC%xso<${HM5WxpD7%cw z?x10c)}L=i-b|%%@Bt;OaAztCk|_jA!WArlmRqHfN}xn($F~Vuuy(|Y-}h5q9XxC4LGfiDk6)82)KS&#q#002ovPDHLkV1gf`!#4l` literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@3x.png b/Signal/Images.xcassets/contact_view_video_call.imageset/video_20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3b4fc31a02c356e3229e05974f26eb730b14e4 GIT binary patch literal 605 zcmV-j0;2tiP)Px%7fD1xRA>e5S~*U{KoB%X1_4J%0Eie85&{I`4Ftd=h~NoJjKl{Zg8&4tfP@zy zGLDcV194V)v1D03#%_;h26sy(dp+%%s&30#c_xZ9v;tZIt$g_^9y0$4wQ?4+)LQxmnd8be?^0Ong|ZHH_SG!ww7 zfNll%ZUEE3Ex;!yK5^a6qWLMZNlfCV3n0yVh2P^O`_2rclU$!uTisa04Sf0KX+I%Z z-hfZnsL>>bk+cVV0Y&;>NK`cF%XMn3idiJ^ku}k5lw?9=E2qlr77|_!%~E5qhDV|O zsDb_<4KKpzO#`#Rb$9?KcYybXW`i@lFEARvWB6|-q?nS54b8CBZ={CBCG?y?JM4Lb z#PYPm;u3mJpdI$SL1KB@VQ~pPC(sUi-XO6&?Xb9no)d)DVSaBGNBkuKEWRGo2Kk9+ z7wF6Yc^m-_fx1s-?HlS&AkC+_ve?8RmrzXSF-|lkY&);aY%(^3lS{y4 zZlfdi*c?~$GVJ4G?S4xD9t@sS_n zV{i@30X_z`HHjzOv<@r-+!1sSa7Vx!5N{mm%%&C^W^`)XQr~jF^{zLjaZ?;MSl^hI rnAW3KKr5gX& Void) -> UIView { + private func createCircleActionButton(text: String, imageName: String, actionBlock : @escaping () -> Void) -> UIView { let buttonSize = CGFloat(50) let button = TappableView(actionBlock: actionBlock) @@ -417,6 +420,14 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate circleView.autoPinEdge(toSuperviewEdge: .top) circleView.autoHCenterInSuperview() + guard let image = UIImage(named: imageName) else { + owsFail("\(logTag) missing image.") + return button + } + let imageView = UIImageView(image: image) + circleView.addSubview(imageView) + imageView.autoCenterInSuperview() + let label = UILabel() label.text = text label.font = UIFont.ows_dynamicTypeCaption2