From 94f3e86e72043929a982d39b8dc811dacd412afc Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 12 Dec 2019 14:26:23 +1100 Subject: [PATCH] Clean up attachments Also fix group profile pictures --- .../CirclePlay.imageset/CirclePlay.pdf | Bin 0 -> 21349 bytes .../Loki V2/CirclePlay.imageset/Contents.json | 12 + .../Loki V2/Play.imageset/Contents.json | 12 + .../Loki V2/Play.imageset/Play.pdf | 228 ++++++++++++++++++ .../Components/ConversationCell.swift | 5 +- .../Components/ProfilePictureView.swift | 3 +- .../Cells/ConversationMediaView.swift | 4 +- .../Cells/OWSQuotedMessageView.m | 6 +- .../AttachmentPrepViewController.swift | 4 +- .../ViewControllers/MediaMessageView.swift | 4 +- 10 files changed, 270 insertions(+), 8 deletions(-) create mode 100644 Signal/Images.xcassets/Loki V2/CirclePlay.imageset/CirclePlay.pdf create mode 100644 Signal/Images.xcassets/Loki V2/CirclePlay.imageset/Contents.json create mode 100644 Signal/Images.xcassets/Loki V2/Play.imageset/Contents.json create mode 100644 Signal/Images.xcassets/Loki V2/Play.imageset/Play.pdf diff --git a/Signal/Images.xcassets/Loki V2/CirclePlay.imageset/CirclePlay.pdf b/Signal/Images.xcassets/Loki V2/CirclePlay.imageset/CirclePlay.pdf new file mode 100644 index 0000000000000000000000000000000000000000..63737834ed171f390b0b71965aa33296c618227b GIT binary patch literal 21349 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 VOfXLuk_Zl>/OCGs[5 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream + + + + + Adobe Illustrator 24.0 (Macintosh) + 2019-12-11T15:57:39+11:00 + 2019-12-11T15:57:39+11:00 + 2019-12-11T15:57:39+11:00 + + + + 232 + 256 + JPEG + /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADoAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9Pavq2m6Pplzqmp3CWmn 2cbTXNzIaKiKKkn+g64q+NfzX/5yz826/dz6f5NkfQtDUlFu0oL6cD9svv6IPYJ8Xi3bFXhWoanq WpXDXOo3c15cNUtNcSPK5J61ZyTiqvpHmLX9FmE2j6ndadMDyElpPJA1fGsbLir2LyH/AM5c/mRo MscGvmPzJpooGWcCK6Vf8ieNfiP/ABkVvmMVfU35a/nV5C/MG3UaLe+lqYXlNpF1SO6SnUhKkSKP 5kJHjQ7YqzvFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXyT/zmX+Z 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 7FXYq7FXYq7FX//Z + + + + 1 + False + False + + 163.860992 + 163.860992 + Points + + + + Cyan + Magenta + Yellow + Black + + + + + + Default Swatch Group + 0 + + + + application/pdf + + + play-button-arrowhead + + + proof:pdf + uuid:8126d959-1947-9b44-a237-45907b82f9b5 + uuid:57cea73e-7a67-3f40-a634-b8f7db8c6d54 + Adobe Illustrator + Adobe PDF library 15.00 + + + + + + + + + + + + + + + + + + + + + + + + + endstream endobj 3 0 obj <> endobj 7 0 obj <>/Resources<>/Properties<>>>/Thumb 11 0 R/TrimBox[0.0 0.0 163.861 163.861]/Type/Page>> endobj 8 0 obj <>stream +HDAnB1 D>/qb;ɖߪ+T!tQK5H"xg\yٮ7o+ӕ2Wtםfp_8-̧;]YpUthF^x~ϔDZmʩ8jIGz *ʿuH+< -&Du.yF;&PM'yo6dG 8 endstream endobj 11 0 obj <>stream +8;X.hYmg[e#Qld\rugc0*GH@PRaD3E.6#dEWW>[;PuIj31RZ@4=Pd8)cJNYpeY\=d +!!<3'pNRS~> endstream endobj 12 0 obj [/Indexed/DeviceRGB 255 13 0 R] endobj 13 0 obj <>stream +8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 5 0 obj <> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 10 0 obj <> endobj 9 0 obj <> endobj 16 0 obj <> endobj 17 0 obj <>stream +%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 24.0 %%AI8_CreatorVersion: 24.0.1 %%For: (jiosh) () %%Title: (play-button-arrowhead.svg) %%CreationDate: 11/12/19 3:57 pm %%Canvassize: 16383 %%BoundingBox: 8 -1 156 164 %%HiResBoundingBox: 8.10700035095215 -0.000301661795675 155.753498077393 163.861001247196 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 14.0 %AI12_BuildNumber: 341 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 0 163.860992431641 163.860992431641 %AI3_TemplateBox: 82.5 81.3609924316406 82.5 81.3609924316406 %AI3_TileBox: -224.06950378418 -314.06950378418 387.93049621582 477.93049621582 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 2 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI9_OpenToView: -750 516.860992431641 1 1668 921 26 0 0 6 43 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 7 %%PageOrigin:-223 -315.139007568359 %AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 18 0 obj <>stream +%AI24_ZStandard_Data(/XZ*`𻯓:SSy@X/,sYt +O]Z-緆c3_ yTSr y$Zv x|KT= q6neUKy-VVwߖ9FKr8U+c8Ҝ}\nۢC_!=r*~ɪ[Czo7ҰᐞTx՟a7iV2ԗWYU>~w{N jN[2ֱJEWVE[ Bvˡ]NV3] UU +?v+9^ڻ*}S)rpY ~:&U;o&+yUy}ZXo}R5RX+lkI:cҬWûaV,R<$YY^6_}?[Xj5@WOl#j3~Smh>giuLvſN)-,ӯKkYU;qk H륵vЋ$bpJڗaYjEReiuL]$vwv;g~ò*{}4X'y~iӑ?h koT%뷙- m,mhںnN~1NdD)k7^SD-s+ҸƳHۙ6h\Kж6lHۙDm#/7%7n 5K,;i(ɓ$͒3:ra[+MDII@IFVmzՈTñv)]brL fԞKPtTz4ۖGs~0ga ^__^yb~۰-\2y_e`dsbYscdXe etKVx̓ Ψc_-\$?Kn2P3Xb%g>~j!QHB\H+%V{K6y$~xrK2:$ pH|t~!9Ħ\qܐ,,x&v>"eCe*?~8æѫCYJ˓e . +'$7n x #!82N:H0h8d9 7P9Ħ =Y/8\!B0/MC.$(&0]꽒0YA,ե~IKb&}I`f˔Nԃ5~M:e;L:he]z↺,CY=.YA7z* +TnMI+-_邺RBXO͜N?ʹ AhW^6s9~@ xk@( M:ps"vj/:pd4@sencU)<$ˆ$L`\v]Af#5o@ \dQmp`l.JA4"M[hH39D/|Nׂd+2+"lDq'3#"3`y $F! sSG NTUNʮH(PF ȧ&j1q\6񤕛't[v^Td)uO#pҥP$6j'6Wowi(pObBL!(wmI9z2O;B FI*ŁJ 樫i5\&AY=@=6Ph[B\7ve""lgdR=Թ6{= V$p1[BB: 9 XL*—i +r~ㆈT۫*eٝJ0dt9r eͤoQL9W蹉VI!}k ֵVA=Yͺ;# M: ++nh5M.cB; Գ1e5_ +jQ*\F!:O"izAe-m4| + wLg['`gB\X܏Ġx &]gT*Ha\VjB)@H.Ba8S90M{^Jԃ==SbOG&z3Zp7u]Adq!Mp¤n-Sd1@:{bH)NI64$ >Q[H!wR+6*=}j +}۹B)6O 5Dȕ@r4J̟$H2՟,ݣC@y`9SB(eeN +u+C="|pRlmF RoNBeTl-z:+J,.]Q&2: +F3Ǻ'n1x Tz\iޕURꑈZC!W6N=\$*keC#l!_}ρ}/gwBtꀷ6c9C֬5wֱw/n,uJ唤w: e_icUߺԱ\~?ex?~8>n=_X~5c2ſRɱya:֍1$H<'/FC)oPme~S" crcd1 ncJ|Vkbzyn:&ha}5jYk>b/k߫oZ,kq ZLi +'n5x3P r9%Є 8^{ED-zŋ@ԿP]IP'>v;SvG UF*-_(҈u&2ȈZ L7l" +Y*S؁͠O2JT겥rPy$zwy[poS +E3D'RW +w/ˠ:T9Fוb 2m(rHwlSM)%rLqDPJܟe&ՒprtQᢑ{||"RaOPpىB1"MUJĬB)z' +bF~w{e }]8"p#,o +-?1&e초p@wXqRWPD/SY70`AZ. +F֭e $4F~I7 +sֺZR5<'?ROa)SoSv{/0a2Rgaө"n.e.[OX+o-6(m(7I9lPmB $DpD&FqJFjӘWF'Fh۩ Ōa4fժ'ʎ$FO =P$ڰmQn.4`r47LBhZ攩>d2؆E P©`CBsM`y8bcBl, &!ݝPc!/. ш9dڛB`w!`Іګ ڡ얇7zaIsl-`7+$-&]u +K$n-)I):Ol54 GoGBOGZx64~oO ~t}q#z,[*DY#  AƭA0 Hi@хFE%AѹEz$P:ݰC0'oXM3Ĭ6-$8N"!8݇p7d5PcSӀ?YJ@XolMDg)UfU +hD ȢUv"gil& *tQ\Ck!Aom.<J㞾͔|=}6۸`ܸ J͓6ơm}RSbMzDv>F ,p DBFbIl +D*,%V(L=X;9'p2Tm2D2D T 4b?em{G:J?pr(DbQ.Jő,X!<8"E2 +TesXP*>| AUP^Rc9X8h\~TZ&,gH&PaFǷEGM|)|(;Kq#gL C,1 VhL 4TG)n:p;׽>̃b(\"Y*[ f} 8RGX|Y8YBSpERhWQD<]ƸqYL`hrTHa61G)dN +aR(&7J (f E +T7&-ƒ ?ڂ߈ M*So<ѥeaH4bRh9Gp FAZyg@Y6v#eo.*YHZ(#+z!6.SD-TE2.[hla{.򐍮x']*ӵaJ}$E3 kU|RkPmQBCǹ^. \e㺀P86_gѠLTW(IJBh +TȞ?f41X'e\e']SulfĊR@8 CZ>FD(aqĵ53< xP̰o݁ oqY;6MBޡ|#SD3lZl\e\eR?RN-#81QO˃ !c%JZ +D Rbɀpt UJ)Lb +yPl,x;\q޶M nd2ARo$Dp$p듅BS6 Ue&|$q'(=̬e\F'!'\U[3-Fl# I48L _?չK_'@I[i@j1L V (5( U%#qdtf- +)1]HG`m$w +ըTTUJ! 0 J&:{F:&JJL22" 8, a$A1唃GHNcPŞ˒ej.CPi4dCG{ūPF$םi +]i 6 .;w&sqFy)ŀs*d{8UtT=I 1#UNhUb)|8$ۑmJm s'No]M7[38DLк܄UQ%5 HdMz\dՃQ, }-qtIf|L"|J7{aJ*LyG6i;-}ZRaib;u?pvZJZϽ@b䠨[?-hiCi +cg>Ӓا%-:-t# evZ~ZhN+J :FﻩTgz{)ݦ{(ebNclەw9,0qC9ާD 7S;ssH|izQyD'qM|$=@n8V0DZռl͆`#祥?!)'Po,7;& +ѾqBcΘГ"]FImB3I9-ѣ6P#3dBKv㊬7)PH$c+7u+c̙s(|szWJ@wBV!S6n"ڔu\FOB(f - CZk'X@.7Ct)3#X-X\^5Kݵ|YXDw-k=)ʙq /ZKqֶ%k8]qW`~_R? ,XxXQ6] IDŽE<=A`a!gʩ~dp^Cat1Jp*EPaz/wBts D7%O&&=ҷB W,)F/lfk1;$E~~7CHJQXtf2kvf' _6r3r@}K=2Bs^XĮ^;bFYuh3: aXlO9$?BƌK)_M͵@J!: w{g&%%9DrpI䶢5xOعZ%rT +||G||E9G+rQߘA !M*ogލp.q/ uW6HZF%,(.bgp)3Uf +25O*1<6g8 BP>C3Hf@&orB@pSZP4oBB5@T 3(}R5{W zT=PM§i9I; t:\ΰ2H z+ \͗Ob~5[3Rbtv]oI8U +;Q5 +e$ uX`$ms;? +D%tx]M00gӗWޔ+[Vȇ08 + 8u7Rnz7 6\.) s=F#nRRzNc>^0|x&+2{ejţeFEӻ]ƪ{ ʻFΧ D9{7̧m:-^Ieo 6K,wq(PGکZFѥK!6Rѻæ7US$ߊ!8W7K>$VVՖ6 @Z^S3|*>\̿D'U{R5#j'5@.>ipSd9N"끾etWF"*:~?t+2 OU2#Y!M7lH18)/%pY =]: ھDS7k!,kr_os\ȭp 4BNƒ?,ջc]]|K0 Tݠ\t.R d%l rh ru_^A+K,M$Z#bv)@ۄ.(FoYrLFͽ:D7iQKZavXEVH%A֚ǪHhV/GŇ{=!c^q!:6ɮG:bPlYo+lQΪ`j6=_Slc4؛Xg(vaIWDLj'ZV7f͕ /}؄Pd{N_179P?-q^4fdɏI]!~Ԗ:e0jU5~Cڙ%ZRͨX51̐Ұ/b3pZJp_L2~ _kQK饻&QKKq@3oh= +ٯؠc_! }z-2gW_[G;>Xwb.ߡxue~'u|m:1=dc@d)y 1\|I~|޷8p.dOZP)RE~ e50ptV~]E\kmWU?qٟ\[ =,p0xe߶NVg>&-߸i$nۯ#r] !~7Ȣd4w-2/HHy}g2m+S@nZzWuu}5& J8*8ns< +(i+ۯ~Ut+p!9Xi)miMf;3H2_RGv EPsœ۷.T42hMod:(v̛g/wAZI~c=Qچ2lB ۯDaU~O1n M)daY70pR|fwBWlKL͖~Jqc:|N/dpښV^RK:g‘Ci{m\ԸR9e1u7 4¤h#wLΓNOi؉rb5Ɉ?!Hb:|Fo8o4X "+|Ne궗,-@Dwf0|"BkTz4%4j2RPU#\.A*mՎ +`v@7}sfQL j|,;"Ï<60vQYvO +c@χg-o9sHQ$ ?c$e=DT8j* (:<]^;ODwsʡq.h"9>e\AW0ySee@^ϟjҽ8!ytbo3xzg%2e*SA Y4O30D\oK3Ȉw`CQcx\^7BCjڶT>/7:A얋DwĹ-_cюOJtֱ'87Kv`;zMlF,LT(E)prww"t]T)cŠ箚d5L$؂=:,>xˌӘLfd2"Ƅu>w )M1I|igIfS&W*#P|c+Qmq(a7/f|UuvZr?RkWjⵢn9(KA.wJ+77A _ƛ e"n7ſ!?"!}؟H/u !h6vE8}4lLbe4î#1x0'#-Њ!,36a.C4Lz f*& u+2gTw8v3 Rp4K%fOd+RkX_o9}Ge!R )ԅ|$Le7_xҌE9Ffͫc*d!;fw.AK'塙 +쮷;'QCGbQt>8>䀢hi_ZGHħJ!]PcAq 'ABp3T MF+ *ýٜwJA0*N_PT-"ⷰ(0"P+L)a zk> 9tEp:ԆS1.CW)T={14i]f!runP+*.~]ftcQ\ )݅zcĘ$ J^'R.1+ktZӖ:nEOp,t$z>/3LރĀ cDb@1S6Ng {X볓~||!)K+5@<!XJĔw\cf|tI0FV$|}kj>]"RQ7UIY:kzM|VaԽes˱nQwtJV%.np4ϸ48!.\ZE=QWue(C'&vUBVԨfvuo,2 =G݄є;Vr,8" }0EQ73q +>F$(QgF=%]T)S, ]=#tfBl D1 bǘ6&dɩ -1B*5͔ʚY&O\v"?lNJتi\&u\r\$Xљ%sn% +>*2ƀObaxKpXeԶ!:.~+`;O= 3C/XR\pTdl~Q)k* w7Sس*_צe~qkT:}Xjbe| %p .HӸu4N)e}ya֕\ 3khw*2m1y ;2U*gٶ' ++) EOBan\fDh r* m=됗v.:\VRuD0@ uOC85ɓ(aGՒ/&8U.ӣlu| +& BS#Zu냦eӎ8\>WrXn:ĽR7b&kkWx\آޒ=}`Ղ+^:`EJnDwye-(V1PAK80_c) +Tu-;.#d1E,w$Q_'*⸢u)RUd j+DD@0,CR{Ża;$[l5>!0N}>xqU#T3H\9ňY7c $Ї.6 +NB72r6/ѯsP2juη|%ܞ [8ӏ{3NHy*CPM\t&Y3:[L9ĕiy*w^1y_L,Uj +v$E]M3cW~7$#cORw׌tĩA}}:]m?38ә0HNкf@ދIņmmÉ?-XՒc8.&e"`Qw }Vi3{yaw1 jO}PGm*VGstTҹ8S(p Ox,M~ -;We1 V_߁FJD`܅ 8f*os2]LVQS*F-?#nhs==t.ڋ+;JxVAc͸+p~[%aM.gCIXWyRn.ֳ#3"/)!5iM&.1)wqx +C~>*hSDkAu3]J5ˍv$,ŠE'J, +}xdAfa21oPH5B5c4+P 7sz}ij*NDžStZvAw3ʯ*@pVLyPL%˗|bF9^b`FGKg:xza3~;*10uЗA@tڑdc#>­!{s +2c.TJ!ֳ"vo1Tzܺ?Ia[`%-re-+2pm;0N -P|fS!eݫh)2S&AU)Y`*tBb6Lǐ"6`&Ԋ`A|x:bp%ލ"Ȩ +WZLUǀ5m}X tP2/?K2eYtѵyk]Nnn vPt랣+8+6eo%m6Y >oG;tE˶縣^)G]#v{ +Pt;e^Ϯ.Ozh*71hNn'>& lL,6/})ՂpV@-#9#"S%!Y88yCdqS\/[ә/5F X!k[Mp:$n濞0zh +^Uإg1oo% +ט|( ^eBwXPZN3mڼV=K|,O/$Ih! P;bִ_0H@x8|8$uʴ=tkIшa"ϊ)0oޑ\(*K)O业OUVb"Uc|ۋ%|]^ oDqd׈3,T (\^Z˄-'RS%ѦWԇ+vK0 ({v,@Z1t/u!DR"=N"vIޏcj5cPQZ9<|)؏ܪJ#?I-ك48[ET"]<.εd\MDM@~5YjPGɻ@4g +Bs|&TC2 +C #OJ%X/;!!  !Tw};AJ*MuԈ5^(G{A"Ê^_^6Wc8671..1 {܄;&=0ڋg͕[_ +SslY槚17R#h^9@jhhDL1XQ!,=ӿ!x +k5qlԔ5 y:/36y%cG$^pW۟l*p=7IHnwC 5UyMo>#:7ěP,>! +F|O(;Д{Pӑz-0}x$1SB)gԡ&ɍ[AU)&%E7{j 7?s FgJ+m鑟џhL>@"MHaG:$DC헨`wdR<.J骐!iks%<Km0CձlE΅M5rdnoޕvh]5v5JbA#$MEh%ѱw݊%|xGMd0*j'0ޕ7s.+͓ t;L%\0[Ԧ;dj aGuլ]Ĝ۝Sop_z3x4OICҀ%Z=:Ӝ鳟qX\2 +t}=Sa#~?:@j=8i^©NTl:EnX Dy[/ <^>{ -xɳ@ 4ξ8oķ'yO6ϯ&`97I v[@:~g/64~BU[8IW5v>jK o< ;r bk*e@I@dl`=aR\x^4 @ᫀ}xXwvUk e,7LϑꪰF e;`S6WXtd8%7))=XB9 I<IS2ۅO ~-ik(Ȧd%Xg>z2_#n M_x.v3sq*,k?G$vͨb@g^q()_m*1vlVXdK[ 2udZH6૨ CdiNِBAGPWbbȍ eU01=n IJ8:'L I-I+µ(xl`Ql'(gW iQE2ᗹ_ +_iG*SY* sk >0򊸘 SI#npaV +LheQW? N !sL!0fВ m3~1iɑKj|jk : 9/T3 GE +r[mHsO4&Aa^m]gY#v,Ӂ% >fan5b'y̵k1𹑖pPTrYA95\& ʵU> 3F)i)Betk;:.'/lUa=oS8UIJ׋O/3oIJ s8)%euN:Fiz(Jr(e&6SKX%@kQ*= + dRZ ˦` :~7VjJ>\V&RӔ,pۣس:;Ob)8t99/"b9[1C[~dpCRV$݊`.k49=D`/v;FMm"=9[ ߿^oB!iݟ|wj endstream endobj 6 0 obj [5 0 R] endobj 19 0 obj <> endobj xref +0 20 +0000000000 65535 f +0000000016 00000 n +0000000144 00000 n +0000012777 00000 n +0000000000 00000 f +0000014241 00000 n +0000038668 00000 n +0000012828 00000 n +0000013203 00000 n +0000014539 00000 n +0000014426 00000 n +0000013463 00000 n +0000013680 00000 n +0000013728 00000 n +0000014310 00000 n +0000014341 00000 n +0000014612 00000 n +0000014756 00000 n +0000015998 00000 n +0000038691 00000 n +trailer <]>> startxref 38892 %%EOF \ No newline at end of file diff --git a/Signal/src/Loki/Redesign/Components/ConversationCell.swift b/Signal/src/Loki/Redesign/Components/ConversationCell.swift index 80f5490ac..77dc64c18 100644 --- a/Signal/src/Loki/Redesign/Components/ConversationCell.swift +++ b/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 { diff --git a/Signal/src/Loki/Redesign/Components/ProfilePictureView.swift b/Signal/src/Loki/Redesign/Components/ProfilePictureView.swift index c0aa704a5..71aa18db9 100644 --- a/Signal/src/Loki/Redesign/Components/ProfilePictureView.swift +++ b/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 diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 2746f866e..02621fec3 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/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() } diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m index 565d44b34..42f260004 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m +++ b/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) { diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index fe5e92175..1614f70c7 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/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)) diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index f78c4dba9..ecfc375b4 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/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) } }