From 9529a6234b70163274d10c306a7aa40a23c0189e Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 18 Sep 2020 22:00:55 +0400 Subject: [PATCH] Change block context menu icon --- .../Context Menu/Block.imageset/Contents.json | 12 ++++++++++++ .../Context Menu/Block.imageset/ic_blocked.pdf | Bin 0 -> 4690 bytes .../Chat/Context Menu/Contents.json | 6 +++--- .../Sources/ChatInterfaceStateContextMenus.swift | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/Contents.json create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/ic_blocked.pdf diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/Contents.json new file mode 100644 index 0000000000..746d2ea01b --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "ic_blocked.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/ic_blocked.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Block.imageset/ic_blocked.pdf new file mode 100644 index 0000000000000000000000000000000000000000..76c94516eb28ad09ca7bc5197e87668d73a5eca1 GIT binary patch literal 4690 zcmai&2UJr_*M=#P5)e=kq^L)vh*A^G6q6kQnCeoxRA_CHjf`arW zqHqblsDPBvJ4hAzg4esQ_q+eUzO&BCne2IIugRV{?|L$PI!Y?SP!Vx3UkhoSw2-s$ ztgEFJ3uAmIg#M@y<5xwg8+Q(gQ?Q>>Sg9+8wWi#}aUOKvov)=I)9| zJAu6^4HLDBS)q)<+kO$|0W34b&eT(-6BHLOJfz{>Tozp$RwD*jLtn-ZiR64d5b)FT zk5fIDM;cJsON4#y86ZjdT9ysKdpcg3nhAe%bV}s6!>5(0YQ(HYYpDA!MmlFlodz6%JA0m@nLR*+BUZ{YFO@$P;)6ZE%~9BC=g^g=Q6%7e{BrvKIkgcu54x^0{U^#D8xcY zS^Rd9;}z&mZKsGgw=^NVhFeD9k{{DDvMA`>m|VwIqhmfoXQvsz;?~+X^>`$cx0N=8p*sgaEoz*c6!@cddEoj zrV4^~!y7GYf0e%Z6VinMA?Ej}ns#wTq;zU7}uv}+TY=}}i^q%;XKp>&sR&LIs*?I+7<={j*{12F5y{<-F=qh)2XoArM@ zJ{%IE&~fg>?t4wJ1;mUBAFfJu=mew>Q8i5R(yW+KEbpTzD}1KTKOWt`=uZ>de#ll? zaaSWvqQ9$AHM4~XiZZGL{b;+@?A@jo3z5AR0s zaK+-?0Es^XNP@FFx!(;qavi-RH~E$CsQ)h)(s3nV_3`e289Awv3Sa?*NWEDjd0)Gug@jQ6;>m9Tu;LQvBa0m-fiZ zK!2Dmj94pK+jWu$;M?T%r3ZShsh$SuhN}hWP=yBbdnz4MVLc&egfnQMM1}ESm01~r z?qLS$*I9I08+DbGNh47X^eaX1jnUMD_a~w0`o7o7q@?7kww7%ziv-}RKMU3C@VgBh`p5D} zB6(>jz{>p+(s%jUNmL2?W$!q|4nZF`69vUWp<-+q^v?@X_lra10ky zX60B8U#Fs=OK3sVxH3iVB5a>hc)zfjiU5VHVP2dVOtvGiQ{7?i34)*UK_dg>cK+ADA&4Ja{!-~Q$1ff%@ zM%zY^p+H`w=5?0yrSe-aV}XL(>S}C@VoTg&#C(6u?44&Yk8mE>RN&E{-eQcwx$-?1 z;>a8ec5I|N`HE{ah581MqQxpeS zxJ>DMkP13dtkmz2;SX8j+!5=p}g#Ryn-p^ zfd*>!JQn;i{IwV2KU~G3T+f)uTWS~crUO=d%yDu$377a;wbi+m6^E}Q)Zfbc$on9( z^^WH{_ZjCWSEZS1*DCp``-!6B#gjIYCO;I#7sNUwE+pON(@q#n@=CH2Nf)rX;IIDU z#rH}o-A4IF{lLspqYRbt@+O%OHRaUjiJ1GCR7^M~XafFDm#-!+Fs|aHcAorPX%Aoa z1y04@Y@eRWa;@^KpYWd`XHk+_`@QjV?>5iR)^5_{`S50>OC)X*C#meC9!(SE=8m`? zM|MxbYlU;9 zI;Va}C8f^5-j~~&GQ0+vl1yh_TS5|3mOBir`N|>@8AZiQIl|qtStA89McCXjW1GzD zWu2!i;zZ0O6)Mat^t}|dHAIa?tx9xPGGukri_){|QT1m29~-)WPd6hK9yjJ@L}b*X zpQ1Czu^01W3%W07nr2>WmBPMpiCB}JG~+J~Pg9Fii~gXcKh!sBaI=b7PGoeLw&jNv zz^mUsFa2U-Qm8WU4ACszb|=&4@$MA{nMmWvG`0~oE1@MJec=V6^Cp5O$BdoI=S%mR zKeePfSYZ9$huTkK%Q|0-OusJ56CU%dU-G+_YEe4ER(-vixW%-^v(LW|rIiWu4y$F_ z9&-1*R2}Tse_~;Fys~pGYLZsqw!q6?wVbgulTN|TcDevWMgo3W^Zs`8zcoPq@M+6fmA?7 zw6Y9h^e2ybfSMaA8>{b~7wxg)HSc4iQv8ne43VaXGg_S9b2}p<1S{lU^rSiAzP|dW7>M!P?6DW8f;!FA5ia<`%zlTx0REWHIj^lOvoeK?itYtn_Qd#PcDmyn?EXB{N(zYl-EuyerVNb;&S;M*ZH$!EQjHzn(|1R#hX@d zy-1+J`0B9zxS7@~Gtp}nJNWOhprqhe!QDzpEf(QewPLl?YLisj3a`I_PI<2)A3CD+iiNn0K&@yqEE9sP`e@g`Yf{GM zG{31v@jm7YGGQpQe>G}@!l!@K?Km;LIh8u)+)E%!C z?lfa^eCK%DacRW5tjPXz5|3r~H%$9P#Dq5Am$-#76Tcg~BOP18OSRcs+528!J?Xr@ zjLcPS7^h%NEQh;_zgiTLI@X`BS5)6vtTRHJx!h#7i^0W|i{-wmRWGqe_2&Kk@dnu!--_gpRW96>#Z`;;!C{l2GhyF5N*i2k_K3`RD<8S4! zw4}NgOGJgBvfnqwc=TWE8GGa%@bw$=_Njt79r4V!J0PhGh_#9L zJLgxPGD;8oMEK>;2^^$vz3DQIFwGeFG7$bIOTzB9=Iyb$fZnvToo9vR9v|M>jM_>` zE&FJrL5%G@{p2ws-RthUVr$4+WH@`+)f?`zRpnDXX~m_*qwRr7C6;S%UGqNI?teE- zDzGU=SX}c<^Q&D7J%}DSSN-&n)#6>dxz{UBwR5-14jxSwJ*Ye8H?wE4FFLwasQg{2%@{7!z-{?U%Z633wT!*jJf$afyaq_tUSo`wRe7T~7{+&VVyxPsh zXM;D1W%q4jLMxG?hl#r-+Rev^dBiI!2A`~%dH)_Q9<>tH9_Nb)Z$&h-%A8)o3 zy9?6qdhOTRU_P|0I&?3j$f=L!)* zfYk#m{*oL)^j}Q;H)Fd2qFQ*I9a@p#4VXd55-}M0{t3w*Wb%drq8fHMH!?gQAv!tR zZ-5LvlK(R!677z5B-s3k?{2@i{ckLX{x*P&36B?_n4;bNH-Rua?02Cqu zg^Nf4=9d&b>>P0b6oC?hh(XN-0bLKYtGh2ihWMY{@9i!~W_R-8fjfDa5*ft7mz1uO zr4R@LDg~8r$M|0RFV(%Thp4Tb8u%51 zL1E;QA6>2ZG)x>yK0@MC I)>Z-k2TyTCr2qf` literal 0 HcmV?d00001 diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Contents.json index 38f0c81fc2..6e965652df 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Contents.json @@ -1,9 +1,9 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "provides-namespace" : true } -} \ No newline at end of file +} diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift index daf27a1ce9..235f17be82 100644 --- a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift @@ -838,8 +838,8 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: interfaceInteraction.reportMessages(selectAll ? messages : [message], controller) }))) } else if message.id.peerId.isReplies { - actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_ContextMenuBlock, icon: { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Report"), color: theme.actionSheet.primaryTextColor) + actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_ContextMenuBlock, textColor: .destructive, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Block"), color: theme.actionSheet.destructiveActionTextColor) }, action: { controller, f in interfaceInteraction.blockMessageAuthor(message, controller) })))