From 7312e34f46b046bec62b61d75d2a667c5baa3ad2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 21 Mar 2025 18:04:03 +0400 Subject: [PATCH] Update icons for gifts privacy. --- Telegram/Resources/icons/chat/input_gift.png | Bin 0 -> 670 bytes Telegram/Resources/icons/chat/input_gift@2x.png | Bin 0 -> 1073 bytes Telegram/Resources/icons/chat/input_gift@3x.png | Bin 0 -> 1422 bytes Telegram/Resources/icons/settings/mini_gift.png | Bin 0 -> 472 bytes .../Resources/icons/settings/mini_gift@2x.png | Bin 0 -> 748 bytes .../Resources/icons/settings/mini_gift@3x.png | Bin 0 -> 1059 bytes Telegram/SourceFiles/api/api_global_privacy.h | 6 +++--- .../SourceFiles/chat_helpers/chat_helpers.style | 4 ++-- Telegram/SourceFiles/history/history_widget.cpp | 1 + Telegram/SourceFiles/settings/settings.style | 4 ++-- .../settings/settings_privacy_controllers.cpp | 2 +- 11 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Telegram/Resources/icons/chat/input_gift.png create mode 100644 Telegram/Resources/icons/chat/input_gift@2x.png create mode 100644 Telegram/Resources/icons/chat/input_gift@3x.png create mode 100644 Telegram/Resources/icons/settings/mini_gift.png create mode 100644 Telegram/Resources/icons/settings/mini_gift@2x.png create mode 100644 Telegram/Resources/icons/settings/mini_gift@3x.png diff --git a/Telegram/Resources/icons/chat/input_gift.png b/Telegram/Resources/icons/chat/input_gift.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f42e5e8428e9ac31dbe7601fe50edfdf9f0662 GIT binary patch literal 670 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfr-P@#WBP} z@NJ0o8O1<}zqZX90*Z^KdX!Azy7sDM3Y{ zoFl(?s{fz6_szfAe^XcAP02Sb-e>%L&dm3-Xa4^7Eq_gcg^dJ{*=*n4cg<#>HJiQm z`s>{7x9j%5|5y?CR#AXs&Gpw6HhJ4`pMLu3W5u4h^*3|G3QwjK?Z0n5_uTYNQoU|! zlNVlE|GsudE2e$`jzjF zU8UaO>Lwz8H5#!|bzaY7NH% zi##Wsf6mR;yfTD~S&hfmN`~)2)LJ)5rXxv(8X~jKrtOS*SGY1lCroRq``?y*d)BKz zVocN&;aZYrtZw$Z#?D@4y<&uc@S@ZxYZ<<(y>=5leAI+58TVew+IpaF|9m5c538?c z&GozfvV`M2kMw%A`R5;7$nfb;KfT#~Y0$zse#_6Rq^-Z0G2zkIs!TEE19RVhw|@6I zhvDDT9);!^HaZuLjeni|!~XRDg7fX)W?anM-W;PMRGarpPg!hHJxlNL#}_k1I$b{W z{;}g`I-$_ksx^~;(iOGIE92HDUp^q_A{w+(q+)ASpqtXf2mTwP)~*ffo@CF`*m^d@ szopr0M=ayW&i*H literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/chat/input_gift@2x.png b/Telegram/Resources/icons/chat/input_gift@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..79bacc11a51dbb3a71c5ae1554024930c8af8b23 GIT binary patch literal 1073 zcmV-11kU@3P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFn@L1LR9Fe^Sj$T~Q55!-AXX$6 z35C1f6txMA$Y^Ou{RKhw7nFNx+a@%;zy$XeV$qM{W1$ujX*VfifPEHbu#P#*{&d$#C^t4*7 zrW%Y!J<>lp6D)l3}qS0taN5}a1_`}14DERaC z_U3dt%U{#N!UB=KzrSy9Z=>rQ8yhz_H{`s%y-g;QWCw#mx7)q6v;?VG2WDqy%UM%j zUmuZ$!{Mf;CI+q1Xy)eTD1`gx=cnCnXHghEJw14{2z`Hlo6TlERFaMU5o>2>rx@t? z_?V)bo15b3@bEB2CnhGuQL#rQcKrcQfv@cA>#OuvrYuko4C4HW_M+XK58XFrK1aN`g+Szr-O+|k5+K5uC7i^O$nlzM<@@4A;3`WEj7Z)+}vZS&b00#wNK?hPE z|5rgeosMF!udjSkC2U5)NQvcFL6smb7E>-LpJEz5;pyp#9qbshNLMgBqPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<_(?=TRA>e5TgxkTT^M)GrCf3^ z3`B;6f!ro2WI&k7t(1Y3QkeJyFi~c5ix|m>M7boFl!42{r6h8XlKb`je($$G&%5?I z`*xh;*xqlQ$@#5kJ!?I`=Xv&8d+&9g6%82QM!#xw$hlGmDCfGBPs4!^3@jeXp;tkB*L(mX^lH z$0sHx-rwIj{cmWxySulvwA|d>{8IVc-`}^kwt9McO620=;#OBzRdj!g_xARRi;KU( z6V{}^zdypP!IHX=z0lCm{QUgK$43%sfS#TnS65fomg6uCFD@=}&2Upw6RAny_VzY0F;P+9 z!^4A(#r*udqS_YrMbB|QU>Vk?9|YQZ^);lkL?jn4P}ik7mYrRuCTB$ z>cvVUtOyns7FhZE`a0X>@YB=N^767Ibar;emcuC+Y<|+Q)6-KjfVD(e5u~T5v-0@( zc(%!5q$njNMG_)!*j+eFVmjTohoF0E7v| zK+iIQ`V!=Uy#<@ZC6)&08M#;@{M?gRThT*BAzP{e-@gD>5ESj90TwPsFE4Hets=vSgqhIeEFMO1i zii!$7b^ZRs!$WC80DWye4NxL_psJ_N^lxu(OC#^@?kF})ztzybj)4-0Nen?%kqy6t zOG@6}-V(r-gG*6yY^ zr#E~6yG%$2mBu;z*2F0a-2qJw)DC=<*VyRjsCAL}K5gr$;?)bULnhA^=z*l=TcQ+X z<%eLY4~H8H$X_<6-`m$e8(aBxfixCXa{tTOwoT&yk#=$e27H=5PIvGlr5i%1=;G5Mc)c z)--A$b*<}X?D+VYW=Tp)BJ5zmnm#!>v4i!9hzL4Gfs<@4p7GgjJj{Vnm?j#aWZblt zCaNxI(xIUtwcoQfrm)2^n1fLwKqX`v=8Sgb=H}A80JF2RF)=Yl2mh=0X~$p)=2+`E z=QLtk>%f#9KQJ&*R#wJJ4h{}BH#bp*#|qVOUS1x`c+iWj2zAq30Yfkcqt-fLbd6cgi(-qwz(BiHfmlus32Gkj7Yh>>V<@r}LJ^CBZEsfKSrW>!lrr(_VO0w-{-u7v!wsQSPlM-)#%P=X5-M+H&@awNqZ_lPp zUY03yeD&2+pKUIi%vM_G*|q3F<-Y5$3uW4K8Rq&e*Ezjx*|Fb$|NX269HK0Wo|DRc2mkrICCv&G449~M;D&DZ?@gUf5NM$`Tlqbzopr0QMNVIRF3v literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/mini_gift@2x.png b/Telegram/Resources/icons/settings/mini_gift@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7a5e301e1ad0f82e5c013a1428275a36ca364f16 GIT binary patch literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z zXaU(A42G$TlC0TWzSVF5FO4N|zKE$K4@15=o%i(`lf z@7pl%)0u%1W!gKvRg8_<*cSa^@KF&y>N8Vw|A7++9A-*trY@M$n4+et)-}^;@(c;j zC)0kvo%1|$+g6<=bjgL%<@qa3e*ts zc(gO7FG7ZoUFY$~8KF(bg$sVHyRN;bXs3+s{PXGz5o(hKr+F=9+7Y9-0G=0cJB6Qp$$=MwWfM0O|+QncjVKJWtTInX01=`xKL_;hCw}c_0=ky zd2#FA`4@diF=9M6cY#hx!q%wltx|n$e#;l%zHjLHbMJWveU^f`N^SqN+tjBUh;S8Z z*Ge7mdjI|R`dpp4tb)H74|@!AJzE2 X#_7$Yrgs&3pp@q6>gTe~DWM4ftavPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFjY&j7R9Fe^SUXEAK@>JIDh3oA zMFb^~$`@!ML`g7(Xkn2uAXZw5nnDFD5mXSxO3_r>n8F{Rh1VcxNJ>Fa1i=t21WgPf zTKM*UIOH(Q?ra|Jy?D91MRK0sIeTX2%*+-Q8PESw0gJ_AwOVEGT3J~sQ|T-(DJhwp zoIE)>d3t(!e}BKcyxiE>sIIPNVcOf<_xAQ~Z*M<8KU1kxC=~K~y*g*W!y)k5*%^Wf zPcoTwyWOLsqi=6-f(q>6;bD1sIgg_cZ8n<^4h|^Z>+9>|<0G+&MB?S;g;z(Yer7(0{6(APe+k`N#QfdB=_i&$P> z7N9g(ld2AVZ)|L=udmN;w`1}$8!WWi+FE5lL_;brE`|-VBx8b2r_*gsBL ze;;!ZjwIJ2N=r+_;c#9xD8LvY5J)Qz(#_4y6%e2R7X+f9M5qiICT4SUGc1;tmbSLG zFpJ4rl^7o%XRCU3bya8zN_&hu+Sv5;G*sv3=PfNQN*hr^J3x*lot>R!c3C_xP&YkHCS0$(a@5rv$K=Yy}iA{PC_={ zBBIe~0c*Gb7X->F(Sd;hT4)7?$yO)5P}f|0@l z_Se@#awRc5Jj`}kzu&*UzK%Ymw2?~s`}^6u?(XhNjlLAQ_aQ(rOn}QUf7~iF5|Ry7 zMs8FnQwiC>Q6X7nGIFCrnM%n1|D6h<$FrAEJ=e+JPg_n<1g^A~Rwy2iGwY_NCgp8Q z36xa=5I`|A0#|xT6FNOTeRz0)LqkKu)YO#HGhYcn00l3=0$k=UJu%`azOb->n-Dy4 z7smb^iA3m=0}qFg&>hA7la(o(~bG~4ig~c7}`1qI|81(uDAYiiu z)==XPwYa#b%K;J~fXaH;Q$H~ZDPrtW>hKXlQ02lRm7ANJU@&-neVvQFVPjOl dsK6hsz;9^KHZfu^yaWIM002ovPDHLkV1k0I!K45H literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/api/api_global_privacy.h b/Telegram/SourceFiles/api/api_global_privacy.h index fe35c7df5c..7346f2ff00 100644 --- a/Telegram/SourceFiles/api/api_global_privacy.h +++ b/Telegram/SourceFiles/api/api_global_privacy.h @@ -25,10 +25,10 @@ enum class UnarchiveOnNewMessage { }; enum class DisallowedGiftType : uchar { - Premium = 0x01, + Limited = 0x01, Unlimited = 0x02, - Limited = 0x04, - Unique = 0x08, + Unique = 0x04, + Premium = 0x08, SendHide = 0x10, }; inline constexpr bool is_flag_type(DisallowedGiftType) { return true; } diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 809f2eeace..9c0369d1c8 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -1132,8 +1132,8 @@ historyScheduledToggle: IconButton(historyAttach) { }; } historyGiftToUser: IconButton(historyAttach) { - icon: icon {{ "menu/gift_premium", historyComposeIconFg }}; - iconOver: icon {{ "menu/gift_premium", historyComposeIconFgOver }}; + icon: icon {{ "chat/input_gift", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_gift", historyComposeIconFgOver }}; } historyAttachEmojiInner: IconButton(historyAttach) { diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index da5b538d81..f5d2868148 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -3044,6 +3044,7 @@ void HistoryWidget::refreshSendGiftToggle() { && !user->isSelf() && !user->isBot() && ((disallowed & Type::SendHide) + || (session().user()->disallowedGiftTypes() & Type::SendHide) || Data::IsBirthdayToday(user->birthday())) && ((disallowed & all) != all); if (!_giftToUser && has) { diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 22dee0c6f0..3e199f2588 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -686,6 +686,6 @@ settingsChatLinkField: InputField(defaultInputField) { settingsQuickDialogActionsTriggerFont: font(11px); settingsGiftIconEmoji: IconEmoji { - icon: icon{{ "menu/gift_premium", windowFg }}; - padding: margins(0px, 1px, 0px, 0px); + icon: icon{{ "settings/mini_gift", windowFg }}; + padding: margins(1px, 2px, 1px, 0px); } diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp index 00a09723fb..c64c2c5ccc 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp @@ -1734,8 +1734,8 @@ object_ptr GiftsAutoSavePrivacyController::setupBelowWidget( content, tr::lng_edit_privacy_gifts_types()); const auto types = base::flat_map>{ - { Type::Unlimited, tr::lng_edit_privacy_gifts_unlimited() }, { Type::Limited, tr::lng_edit_privacy_gifts_limited() }, + { Type::Unlimited, tr::lng_edit_privacy_gifts_unlimited() }, { Type::Unique, tr::lng_edit_privacy_gifts_unique() }, { Type::Premium, tr::lng_edit_privacy_gifts_premium() }, };