From 728ec0974a0a9311b7d41fe236aafaff0112fbe1 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 3 Mar 2023 13:46:33 +0300 Subject: [PATCH] Slightly improved style of menu for sponsored messages. --- Telegram/Resources/icons/menu/channel.png | Bin 0 -> 610 bytes Telegram/Resources/icons/menu/channel@2x.png | Bin 0 -> 1098 bytes Telegram/Resources/icons/menu/channel@3x.png | Bin 0 -> 1649 bytes Telegram/Resources/icons/menu/info.png | Bin 546 -> 463 bytes Telegram/Resources/icons/menu/info@2x.png | Bin 949 -> 1016 bytes Telegram/Resources/icons/menu/info@3x.png | Bin 1446 -> 1430 bytes .../history/history_inner_widget.cpp | 38 +++++++++--------- Telegram/SourceFiles/ui/chat/chat.style | 7 ++++ Telegram/SourceFiles/ui/menu_icons.style | 1 + 9 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 Telegram/Resources/icons/menu/channel.png create mode 100644 Telegram/Resources/icons/menu/channel@2x.png create mode 100644 Telegram/Resources/icons/menu/channel@3x.png diff --git a/Telegram/Resources/icons/menu/channel.png b/Telegram/Resources/icons/menu/channel.png new file mode 100644 index 0000000000000000000000000000000000000000..df2823788ff692575706e313d6689af80d8ffe11 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?2M<2V~B;| z(_rg<#zc{=X{mziT|`2-I*$l-W*jMTS}f4%qGT1aDEMW-iqL;eeggH4ZVLl5_b71* z_H!sE`hR;o`{Sv18s+*R5SyBzV|npH-Xak@v$z z>ENau1Bo0HDUPqdYj?)1yO^=l zo`3GVb;VD+n6+V>Z|cmy{`%_+lX+7_f}eb?di}L(_0>f^3I`-thOBy8q^U7e|5?wE zH{3IfXPr&6n){BGd(t7vt68S|@5^_(7%c98tt?i&DgJM;ja>ZNFp1-TXZkJoTRwT$ z9sl08a|g1v%JsX)w4Q(8Jhx%x@yD8C-MjDV&GZqvd*1DW>1^LSK9d>(51mLcdT1)b zmAK|Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFv`IukR9Fe^SW75;Q5g3a^2jTU zyz(fskn(JzEKnYe5mtm*jS^*nSWvRCu#gZN7P7M<8;V5IL|zL@krZX&HATwX|5sm~ zuIqH~9dqWty0bWa=lj0%`+fJj_k8C&cLjeY<8ZEtT!Mn-Cd5a^ebl(e(6L&02MUyqNEFD)(6bY^BoAdx00 ztJV7O@IdtQ^YdY0VYF;&Y6{AakB@+W08K#dJNf$h4h;=`eSLxW?d`3jqeF^WTwF|1 zW@KbY^`4UB;^Hh6Y&31o(ui)&O$=lnzy}kYU`I#O_`-tzOudffwxqN@m(Dd}Q-EJq)tE;Qq z+gmOHQ(`A$TVYySTDrcz&h%o0s;VkV$=cdlYHF$$P()8le0+Qq{QsCCY!iTw)0PW9IJ(lS#~ZHZ=4R9(?T0+`92gi-IL=hhGNpuP zXJ;QA955#B!ph1@baXTqS~Vd4DOwe|J&xcA8X1x(R?P=hS%jtSaiGEwG=ii)7Yu`@V0NdE8d@7>+q zvQAAkLz*H+R|MAM8DwOW_+St-grxQTvYo)A^@$nLC zZEda00=>DpAs>wR zys%3Y>H-&pqeKZHQ0zFVIVdQI^i54oQoU3T2?@at#Ur7{n$2dZ$t@Z68r(>GR#p}R zVmHx}k`ktLN8sO{xQLmVnfOb^U@)N3URYQ-J3EVtifU|ZL{orkJa!FUD0iU;mF4B- zV5N7&M${YBKo7DiL&wL*qx9|W?qV~eG|$e?{;mbe2)b3zfSv(813xnG4`J%64A#FX Q#sB~S07*qoM6N<$f}gMcg8%>k literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/menu/channel@3x.png b/Telegram/Resources/icons/menu/channel@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f8e50d3672e3d15187295bcbf0387b2e44f570 GIT binary patch literal 1649 zcmV-%29EiOP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=+et)0RA>e5T3IYzT@h`#WoYYwf+)p6;VZ@}C?5IRbJ7R;7>(B z=T9{xx*bD9Lw|pNM@Pq#lara5nbXr#(I%w!fti_EU0vPx@8AFW{dakJ+1=f3Z*MO( zsv`J2efo55ZSA*53jd+^^z;;AOFGc(?Cf8^ekpjPSorqso1LAVbO;MG!SL(p>0x{E zT|_=19h-Q8WPYHn^8HYX8;pP%32;v!LpFg-o(;o(8_o;-O%zWx09Q(s@7 zs-!EVrly{spR>Js_39N;B8PEdVIg6Be0(^y(kdDm8MU>w5nTvpXJ;>8zEsIFE-sFc zk&%%qF_KUszs=3f5myLbzI@^7isW`9ot-8oCdx?Ch;>Zd zEVQw)L7Iw)h;VarL)z8R(PranqEIXM`Uq){no*Op3C3Q9daz2f3xPMFyt z*G^tpSqTUTP-sa_L2QqyF{7w9H#dL({=Ih8dA=GL7_hLgP;5$VNvvbSLs3^(x3{_)$uV241cr3x1f2ajgz%lG}%F4>fE*2T|9u=i5=<<_80z@WcFkM|;55+4G7I2KF z1fVrFHT+SKRIPwxE-o$%UF@}ynk7Y@pNxQGG!B`=AHOY0)e1O9TyJl0Nq!K5rj9)b zXV@fV$Jo($2(sK`522UX90hvp>gtL?o0^)kKa;*J;Ml>z0pkNs^86=UsktiP*uugB z!x#t6(9lq+vFG6<;Mm)@Z|UQfmKI}UV=78q5OD1C=g(79Q;ZK7jeUK6w8@gVV*=+f zu+PoSot&I}{P;2C*x1WfH2*V?*xtjT0Z%HL zJTi#wG0``kxCL2VU3GA9Kp-zJF7T*Bi@3_rA{@!d$xPMY;2`d{Ag83Hu*c!V#Kemi zFZTEMRa#(_F)=ak-n}DvczBoxtYuY6NeT5#T3Q;vm5`7S0+WZ<*49HqL!^grcz75V z7RF;rY>#O)$2jf1dGm(yVMayDXw@T;t>#IPhJ!ht7DGK-mv{K?efc3q{BJ5x3^G!PFwH>$IXtVl3S zDs?dE(N`2K=9BI1ZDc~u^K@cjB9DhbtCh($IOFH1{Wn-YasbV9qngU%Ec1V}>6?ZEbC- za|!y7A3tJ3s{35hdMhid{QUg&^>vPW*eKx5`p<7||Lq*(1RD-u;l|p9>kUk*<>h5u vjc_n>QI3Ed0XYJ41mp1kVGIfqywkL_t(I5!IACZiGM(L{~N$CUQ>bOOPTW9{@Sva~2S7k(KW0{q)Wh0njbyn4)Lm0m)AM02m;V<}ChqLp^SnIIo2D7Z@zVqeB_Kmb zO`|C4x^5VTs;c5RelbBp3CIwHpS{vFU6uun@B1zrkRb@r+<(yxVJb*PQEbp&R+c5S zn|-l(+GawfeKw&$Xpr~!i;ZLp+!ei>P)5)oBT@KTawu*);JY1xLq@VHRdB!@jRGm( zOt?5?B!WNKj7t{;LErZ>Ajzu)BN6_#v{1UPvn+Fu|HFg`Yyu535{0kjtqb{RLJ7XRkWkP0MeLmC{Iu4KzD{^X ptQY%r!oz00~^~iheOZvOw-(M zw{X=&DT0d}4u?F?ZQGWF(m@as0AQ-hBe)BoFbtc`CXdP%Bmlqw%ZlJF77P4frAnhb z0;K@}23QPo8@I*F)fb`1IGigjV1UI3@@9`lBXoB#%CVP8(C6A5H|mWNz20J9Zikq;8;j8>~vCy8-> zBkXRs+ZDB+ZNNw&h8MzU9LFKyR|Bv*&F`$b@%z5NUau>4)$vQfa~2XMpY|7F5B%Ss z_QCfE_nOUSnuu2T&6p8G%lbMD8S zd(Q0b?VjBV{9`K+*?d09WHOVoG3x&ez>FNIdzWDL-^3rTJS+n=|cPr2Qz*xGwyOX8(`1rWGx;j2Sjz*)abYig> z0APSc3w1eXtAA81FG&$JDpCkSTt7#jEd+&0+qS0Hxi1sw>KE)^ZD7?nKvj% ziX!TeK(&!iEV8T(-%hn!4YKPuj=Fr05U#m*oMJgQOm0JO#8XIQouGx>&wbCa^Ye4r z`?YtR9f);X2U}y!zDSmu>1bumV=@k3*zAYXBG(-vOP|eV43qmQ zQ0NUI$B?@y&>h0|U@+iKCK|dQicrYKkP=G6!+)XM+grwJwc76sj3nKd5JSNZU0+`V zIyg8em&+PDlrFSV0*E1v(_@8ty&k0kxO%;=p+o5kEhaEzN@$gSFx?-EN0mN4X4XkR zptDNQz!PxYG1t?rH4`+rwkw6jp{+~u@rii4MP-njfUpWh$)h(d6qQf1PNY;ENt3i+ z6n%LEmQ#!_Bpa2jij)R>XZ5pz5Wn`%hTuv{JoEV-!;LNZ4Ob?v|B2r*YPE<@#7rrY z*aiOw7+|}CP+78SP)|`RQ8SRGull72z_jdg+BV%XrsU`4(P74TY>*^ a1%3j#2e|6YhRW;!0000^5*CFn_^N7@%@1{f~Gp;TjAES65g53I17Nh`I3Wl_x&Dd@1M>iA1ny#0qnX z3BrK$iKQX4n1o+mUhWf(*pestcFgf0>#kfbOOn0Jn{Q6r88lSF$zHG%>;kZ%$$rB! zaVfMxsZ?Tx)97e=mrT|jKb%I#*4h$iAxAEb48Rv- z%#iYiCx5k#tx_d-cXx6oOsCVQrzaI-2q8Z|KNm-aO39GlfRf3ikghw14|^zY>op*; zKRXLvOxh6`5+P?M8FGe7h9vw{DrKWTOCsd6*~}*VFd#LbwtXgkTz}xm1}Xt@gK0LKK*iFw*;694xKOW3 zN{Bf3gUOw6Yv`q>~c zu{!QP`W^GrY5(WovKsklz~$Qyk+1oxlYcZkp?U300000 LNkvXXu0mjfz50rN diff --git a/Telegram/Resources/icons/menu/info@3x.png b/Telegram/Resources/icons/menu/info@3x.png index 5811442cfd6946120167020dbe1ac3c3e7904f37..e707aa012e548c4a81291e5797ef66e367bf6460 100644 GIT binary patch delta 1318 zcmV+>1=;$h3ziFzfqwu=L_t(&1?`$mD|THJ$M5GMg^-jmAOjHw%77>X6EiR0K*>n? z415Ba$b?Lu%*0q3$bb*vrHn}4QVNl{yPscn_iDAT^KzYi&bcnG&NX12eb)M~|5|6C zv-e(m|N52vvJ7My$TE;+Aj`nd&A>ltQ?IG1X>Dz-t*u4C*MIZ#^V8GQ<>e(ps;-j{ zth~H@U|?W$baZ57q`SMjrKQC)fa~k)larJE{r$bYy`!U}&(BX!wQteb*VnhaynKIu z|0m)P6AUr`7GY=-ot>RqTU!ys@lXc@D2?na$L)$uO-&063o|n_^gxTm+uPgW;o;fY z+4=eTg($}Iy$<#x&{XaD=RB4EBfTx+8UU*x3|`&k`3pHohhK*+tRf<110oNm6}Qnir0ApG40_CW%z!{Z z)&UU9T`2iRV%-=X9+nKTxUlXPq>{tdWC-9qkeZ*PlSL}6!VN4#r#(wLX9 zySr=B^ZNSg_LbLe7+B+vtI(gF;dSGcVP-xw+q8KLoG)5!xVQ0)t)z zGk;N~I3c}xWo1R$-Gr;FD}#pMh9Fju5n`rRDYvxX`;N7>wTT|p7?ItCy1F`JD1sXf zR+d7M=F15=0BzKePTedD`x=N6B!#D`wL#o|Im;P8lmS& zC@3&JMVy$J@U$;*qo$$hMWd16LNk%B7-^vy^u*YM+uYnV$!KV37#|;xmYAfqA%6f3 zg9@=&+t#|6LoLO*I>7d%`FJ?*Q{p1_NFTgh(K5?g6*uA2^7n#Unb zY&Lt@#nK6y-D0`o~dSC+mMRRAQJjdL%O?rqF*zt7Rx zxLq+f4XnH6urp&rb8~a94lR_xj*pMiJM5f%U{)9uZi{j}-J+3QW*NvbkRN3r%RrWa cAC-as0r#E|v}?57IRF3v07*qoM6N<$f&c)KQvd(} delta 1334 zcmV-613Iq2n~rw;fab$A+!>$ zf?kV%LZu`qBt$|%R4Nit5Q&n+uY%ycPu?Ua=ic2r=FaY3-p$_PW`3RT`JOX7vuDn1 zCX@bB52PMQJ&<}J^+4)@ALoIxO2)S&C>>FM$D@#^a8 z;^N}w=H~PBGdTh=Be%4)%+1YhZEZa~Jp8f#7{D+FBN8)-7~#sw$|ff#4-O8P1gkkA zoroZaI3O`niUDe5WaRYpG=y@2O@IIu1EEYNs)u@edzY4$hKGl9*f0qvCnq~QJLl); zmzS6K_xG$W#(%KV>gwv++Sb zBh}Q@bbNfQNgN#=4Gs?aU}ehy0+dEZ5$du>B~wGq^?&uX=w>Y~E-nVwiMMi~0MuJ6 z>Jqn&2Sd-*%gf8e#DupE7C~SE7x$qw*=JI(tJ~XKwnPiLh+TlALTp2IM8Le_Y*V5J zcP46;A%O}#Z;9-aeSLkhv$FsadIEz^MUkvG2*mHr-Q8W8E*5u?L2@mq6V=d&QxRc~ zK(ift?0UETgXCdR^*$|Bc z-2zH*5HjMcrj?ZyL7=d_y!@3!NWYFtpcFEq&?XKPh8E$RU&OSzxv34KS||s`qgvug zD0v`ciEspzO^Hx7tIxSYsICp8>MWWy5CR4VN`Fz$rW|jD6JdCk9_LDBW#!u1n!%w! z)mb!aAOwUA#IpJdt#EWVSiD0VPa^qL{QCFH*Xz;_0eP1~%ta)84A~gTTd?7V4=Qe} z?E4Udo<+H>j~o-(B_qsP*n(2DE};Q2=vnmI3?p+UlAQ3R>`|DWo+hH@H#IfoAub}C zhJU6f1Dp!8v$L{TdwP1DWWokDG&H=uy&0(2*H@}xqnz5HA(WtJk+IE~Jcr2N-Q8JG z>|Grl9TgQ7W(->*Rr`2Luco2t1x0LzncS_Bd47Hl3Olystn!?yBS?^jrWXXU85SJ< zAGO#FGnqhRjNLs&Gg#Bm^nwIzhH-l!0)J#VrTmQrO+(WQQnDGwornmKyOr`c7Bme_ zFG$H|7&kp4Kt@{1-&oKzG`%1tn_=8v$#j!v4+Unhhy!hhrA zD=~7Jo7)dio6nIf+y7 zNS-B=cbLJrQ%d~69*!=N-%+}Or#fFx3Qft1dr1h$ptHIjKC zOY`Cn+qf$!&8u2$E6vMw^FU&oo_{yCV76nA>m`Gx{{hiEJIE+X{F4FAfM-&#HxpP8 z9Qa+wfQ+DyEes$kJT3|~PtP*@q`U(Rm7nv;QIS3pBOhoIc-7U_+-UyvkHlo633K#y zu9-cLe?Vf6n1rHtfryTC0B0QHl0r>F1VO|-;$v^Z1q*W5_!B;zjk?Axb}tjim(<73 s7E{x%)B~vpQV*maNIj5xz|8}H0fjLUq|`!f761SM07*qoM6N<$f_M0EL;wH) diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 16bb719ecf..c8b8416c12 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -158,7 +158,7 @@ void FillSponsoredMessagesMenu( auto item = base::make_unique_q( menu, st::defaultMenu, - st::historyHasCustomEmoji, + st::historySponsorInfoItem, st::historyHasCustomEmojiPosition, base::duplicate(i)); item->clicks( @@ -173,29 +173,14 @@ void FillSponsoredMessagesMenu( CreateAddActionCallback(menu)(MenuCallback::Args{ .text = tr::lng_sponsored_info_menu(tr::now), .handler = nullptr, - .icon = nullptr, + .icon = &st::menuIconChannel, .fillSubmenu = std::move(fillSubmenu), }); - menu->addSeparator(); + menu->addSeparator(&st::expandedMenuSeparator); } - { - auto item = base::make_unique_q( - menu, - st::menuWithIcons, - st::historyHasCustomEmoji, - st::historySponsoredAboutMenuLabelPosition, - TextWithEntities{ tr::lng_sponsored_title(tr::now) }, - &st::menuIconInfo); - item->clicks( - ) | rpl::start_with_next([=] { - controller->show(Box(Ui::AboutSponsoredBox)); - }, item->lifetime()); - menu->addAction(std::move(item)); - } - menu->addSeparator(); menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] { Settings::ShowPremium(controller, "no_ads"); - }, &st::menuIconBlock); + }, &st::menuIconCancel); } } // namespace @@ -2530,6 +2515,21 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { HistoryView::CopyPostLink(controller, itemId, HistoryView::Context::History); }, &st::menuIconLink); } + if (item && item->isSponsored()) { + _menu->addSeparator(&st::expandedMenuSeparator); + auto item = base::make_unique_q( + _menu, + st::menuWithIcons, + st::historyHasCustomEmoji, + st::historySponsoredAboutMenuLabelPosition, + TextWithEntities{ tr::lng_sponsored_title(tr::now) }, + &st::menuIconInfo); + item->clicks( + ) | rpl::start_with_next([=] { + controller->show(Box(Ui::AboutSponsoredBox)); + }, item->lifetime()); + _menu->addAction(std::move(item)); + } if (isUponSelected > 1) { if (selectedState.count > 0 && selectedState.count == selectedState.canForwardCount) { _menu->addAction(tr::lng_context_forward_selected(tr::now), [=] { diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index d5768e3647..e8cc28f473 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -1232,6 +1232,13 @@ msgServiceGiftBoxTitlePadding: margins(0px, 5px, 0px, 2px); msgServiceGiftBoxStickerTop: -19px; msgServiceGiftBoxStickerSize: size(140px, 140px); +historySponsorInfoItem: FlatLabel(defaultFlatLabel) { + style: TextStyle(defaultTextStyle) { + font: font(12px); + } + minWidth: 136px; + maxHeight: 40px; +} historyHasCustomEmoji: FlatLabel(defaultFlatLabel) { style: TextStyle(defaultTextStyle) { font: font(11px); diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index cf78f2bdc6..999df51ada 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -103,6 +103,7 @@ menuIconPhotoSuggest: icon {{ "menu/photo_suggest", menuIconColor }}; menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }}; menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }}; menuIconPhone: icon {{ "menu/phone", menuIconColor }}; +menuIconChannel: icon {{ "menu/channel", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px);