From 155b8765a84ca6f07a78d2ce3a958a711a54f79c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 29 May 2020 16:51:42 +0300 Subject: [PATCH] Update embedded stickers icon --- .../Sources/Items/ChatImageGalleryItem.swift | 2 +- .../Items/UniversalVideoGalleryItem.swift | 2 +- .../Stickers.imageset/Contents.json | 20 +++++------------- .../GalleryEmbeddedStickersIcon@2x.png | Bin 1735 -> 0 bytes .../GalleryEmbeddedStickersIcon@3x.png | Bin 2635 -> 0 bytes .../Stickers.imageset/ic_sticker.pdf | Bin 0 -> 4570 bytes 6 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@2x.png delete mode 100644 submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@3x.png create mode 100644 submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/ic_sticker.pdf diff --git a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift index 0854e75a42..b76652241b 100644 --- a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift @@ -261,7 +261,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { self._ready.set(.single(Void())) } if imageReference.media.flags.contains(.hasStickers) { - let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) + let rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/Stickers"), color: .white), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) self._rightBarButtonItems.set(.single([rightBarButtonItem])) } else { self._rightBarButtonItems.set(.single([])) diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift index 7316e2f355..910c6d3339 100644 --- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift @@ -680,7 +680,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { var barButtonItems: [UIBarButtonItem] = [] if hasLinkedStickers { - let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) + let rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/Stickers"), color: .white), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) barButtonItems.append(rightBarButtonItem) } if !isAnimated && !disablePlayerControls && !disablePictureInPicture { diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/Contents.json index 3b767d8bbe..2f1f654004 100644 --- a/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/Contents.json @@ -1,22 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "GalleryEmbeddedStickersIcon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "GalleryEmbeddedStickersIcon@3x.png", - "scale" : "3x" + "filename" : "ic_sticker.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@2x.png b/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@2x.png deleted file mode 100644 index dce30d8177961f762d0e39ba46765fd5f4d2671b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1735 zcmV;&1~~bNP)A~ni-=rOS`$~Op}eJ|I~k$cK)%|%$d~G&8U&U zalFcl=Xu~nTHd^h)E1Z(z>#ywwLN!@@&nS%QqWJf1fkLzo{5`uJ#l15z^G#KM3)$hmZ6mDssqSQW< z{97!kV~%X?#%i4Z#h{B6;#$2a7|UQvASudsW2KVbpHRqIVK@N|^-*~rWga!`g2Z+G zPO|b2R!0BUh?^W&Qa^-WEkEh(q^k4)q=FK1MwmAtaOR+UlcZHij)q^wuRnHB)$4#) z{1%5GbBqXF?qy0B&Ok$DAAO85P}N$<+hYinIp~p_tm=n`gq=cAWv+rxb|UE(`X~e@ z<4=^5-iL$N12~u0bQt5kfvk=CjTlq;>L6MO6i{Lzova08wpK!Cdhww zATUMcWRD%sX!`TmJiWSY&{R}T_Bjxk>_pNjVk6*lJ%)m+yz9_pI7$kk3qv4cBWDG9 ztq!V$pUw)Z9=dd)&=ecNF5XQ4B?41iL%KxbK6rguP1RE+Y1O-(O?G4GpKfqGr!YwYc z*P#o8AOFarkL@h*?|0@Ea>P}VW{8Ajh%7o>Q9WpY;it7_zh1B{RN?)GF zqB7sS)#4JA9(>>YBWStVMJewxUQp6ZPAQp3pz0kYyJw-{{LcD*N>-)%H2lj5X?{Wq zk$VBpse3%Fr2HPL`e;f8$FYQ*V-_c+*8Z~B;EyiszLiu&-WPbr-N|#u;Pd?m*=5Bt z#BZ+dq%`2TydD0;g|}NNmDF$@e6rKw^X*mat&qd6l(*rJDfruVN~3Pm2|TBI{ZkKFdIMgy zkErUOuKY3lGDOb`vTN294F7TrbAnQxCFwmZkavm{B7Hl&Qa(@wRgGiNkoB1&Nb_}Q zNqDzqf|4TsWicJg2!U7Q5ZU?!KKWnMC-Vq2+-M``MQjALT}m5p(ra329;{xU5n>Z$ zp$Q9QrFG5I>zh_+&__80nR@|CF$G^ryEjQevKq)bNGW3no}=HE^q%ewETL(Htm(t@ z=(puuC_fBby-E(dpeg_BQIB0rC@put+ly!1yiYb*5SWG`vi1Qq8BS8=6lH(I0?ngj zRWAZF<{^tNK@-=tS*db}^q)hOvdb;V>=*4#DrUnc7RMEYGK;4bCz_7b01;ls`|*r zVW@PW4WnFOPF!n@3x`U#wZ}#Zk(+_lxTq&*MO-*k=Aet`o5u&8ea^b!%X#`J_#|&1 zaF8yMlY-UJh1vvJ`W=>#ePTi(ZNhXMt5;k>y2aT8@GEI!SqlYeRSbu)7E(9#*vTPR z>OL&$;;9}RrS|F6Jy_)*T>UQmKbV7b dp{8I2;6JVWR@$;fr@sII002ovPDHLkV1kUDPCozu diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@3x.png b/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/GalleryEmbeddedStickersIcon@3x.png deleted file mode 100644 index 6fe4d5e5c33e642e88fdcefc3ba425d7e4389d16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2635 zcmV-R3bgf!P)TLiXE04>+D2nGS7(f-XzC+KB?BC{DyWMys4?A*- zo(0A0tGgtI5N_5djW7f_TSZUT*)7)`2r$ZO?&TCEf2@9)1kJ+q_;Wq*sriEF5-IG1#N0nNOtue4r)-++`~rCUam$WTMDRnW{rWUX;bf{#Nw zT%?Ys$EvymPGSwO(afn_(>(y6VU~AV9Zj+%z9TVkjmw`rG<0;gIa zoPCR?pJm}iJAB$lledyWnx&%*T>UkgZs{BEdm(sPzBTcAnu6jhcz_kJr0HZ#7-JBA za2r0PDblX=GH})=nm%T;#2}oz6Bk2Ipu8QNhaLG9O%JmX3_?K_R3zKEUmp6$zWw{N zGPFr=K}EvO^$;v4X*#5Bml!z4va(4w+i#j18H3-+1oE*BfV<&_ioz}7%|V6-nAu3O zo!sh@5Wvf{i^*qiDumQ+6kaK_nw$_06_RYGwWAC{D!Rx|H@jB?SJ6e`b?7*R@-~vq z5^>dqAmc1CmI9PCf^#zM3lu(aF@qAg8}9gdB-@@8gvdThK~g?}kfEmV$;pRc(vbqT z0R&=sRtf=Cj~84;CxuU=6WsMNQb4=F&ERJnO#PB3P;v!auLKo^NBoNt1DAK26w%Bv zY)p?g=~KT{FQP{-Ai3qF$gx^*b}xkoRJ{_o z@^%UVRhAV)twQ`2G} zk^m1Imh7G@J>}o$ZcB@yCjpgh079mg6x#ji1&5cxr){+0a}q3T+6OTqFS~rN&}jJu zO_gr-2m|Mk)Qd2;c#f2-y$hl6EXk6#9ij4wLzI08g6&RLEQQ#= zw(NA53juERH+(=!X&2x1;sIvbK{8x*A;5riv{D~MTyqA5x=wne%y-T-x)}VrZZy70 z%A{`fFmQt`X)QfQ@>ckbu{>*B3<(`SAMt|w!KIr`lS*DtRAl$!zgY8`_GnTf#{%Jw zN4tb3RZs&T+hD>P@@p!Bkh_g!(99_+8Is^L;TZ9!=uX0E83u#z^wJ z_==l>Yw9K0k{6WLj5GK&x1XL*a_OV$dm;S0UmZ=4ZTnpHX$lTy^hppHD=8znG)r%~AzbQ< zn@M_>hGt_B6;Fpth2+X ztR;RPO~U*a2*-|+Pi7o~*s5+ukxcr+exmJS*IG|bIYCn89kD<8Qdt_6+=FW z&)X#gxo`u|kxc4Ex7-kN%p~8w6eq)v*qN?`RWt!(WWNNi`Z@*3%0Y;%9FlGK+d~q# z0ZF}x56u=VE=tPh~N&PCxwqFOq+C@qjBaal0F!)I9 z+^tNlW)AsTTfhxU`X~yL@cLaZg5+6Afx3GT^nWB}v@5M$jKR;v>gI^Jqc`_d(FDpz!FIz?GaQMd};~FyuM&H=01U8G>dZg+s~; z2nThf$et7gky!3m^bl(&xB&?&3WuzC2>NBDh%vHd1VMTw%|Z$i7c;`ZRo|rWIQBib z0f`hdY+?*SN?R#Ni48)=7Ze^9*TA(pX$lS&Ac&XgmXTlT28n^YJV4=M>jihVi>72x za-W0%IYs1SiD-6$^D@JF3YYG2aK+W+r+%3fP|w|KD!p2D=luPu+l95sTgm50K7^t= z3ZFg+Tz)b6naxRC=m{C#9%bNqJnCo)9~T36D2x2|?Y};zo=Z<4Wmd~D1k(-*AE>~< zWv7u}=666vH&irb$EzTeHB&fQA|MBnwz@4~6Q4bvpGX;jHD1pOCSuh-S5+M z(JhCNS3*G!9F`a+!YaCT%PB-&5d<$YZl~$g?FMJ-qY!CdJ0t{gv+@r8dlUky;#vq^ zX5LBD>v%OdH`6Ym5W3kWy|vpm*gjV0C}}e3(WosI!9`WrkQ%B>gjo7ec>e{5#EzCGG%w|swU6Q_ttOgoH`^z6|s t+q?6~iGS4>*Pp1#J#N~Ou!{bF{0H6kYIsfQMb7{L002ovPDHLkV1m&W@T&j- diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/ic_sticker.pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/Stickers.imageset/ic_sticker.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f33ba95d42fd3807f4b41c2d5fd487cbe9af33ca GIT binary patch literal 4570 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