From cb174cb0bf000746c60040b7f71ae1cb8dc2e954 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 2 Feb 2024 17:37:41 +0400 Subject: [PATCH] Add some more premium promo sections. --- .../icons/settings/premium/lastseen.png | Bin 0 -> 553 bytes .../icons/settings/premium/lastseen@2x.png | Bin 0 -> 1015 bytes .../icons/settings/premium/lastseen@3x.png | Bin 0 -> 1455 bytes .../icons/settings/premium/privacy.png | Bin 0 -> 597 bytes .../icons/settings/premium/privacy@2x.png | Bin 0 -> 1108 bytes .../icons/settings/premium/privacy@3x.png | Bin 0 -> 1611 bytes Telegram/Resources/langs/lang.strings | 4 ++ .../SourceFiles/boxes/premium_preview_box.cpp | 10 ++++ .../SourceFiles/boxes/premium_preview_box.h | 2 + Telegram/SourceFiles/settings/settings.style | 2 + .../SourceFiles/settings/settings_premium.cpp | 46 ++++++++++++++---- 11 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 Telegram/Resources/icons/settings/premium/lastseen.png create mode 100644 Telegram/Resources/icons/settings/premium/lastseen@2x.png create mode 100644 Telegram/Resources/icons/settings/premium/lastseen@3x.png create mode 100644 Telegram/Resources/icons/settings/premium/privacy.png create mode 100644 Telegram/Resources/icons/settings/premium/privacy@2x.png create mode 100644 Telegram/Resources/icons/settings/premium/privacy@3x.png diff --git a/Telegram/Resources/icons/settings/premium/lastseen.png b/Telegram/Resources/icons/settings/premium/lastseen.png new file mode 100644 index 0000000000000000000000000000000000000000..9299ed21638a2e254215c442c075c1f2b07d409f GIT binary patch literal 553 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 E0K)x?AV~B;| z+Ys;7j)@|r9#29~UGbU1S=Y#Oc1nH1A_PvxXWh!HS-R6t3)shg{%IrCyYJhk+i#l>Hi$j{yfZ*!$>o=2yU(gH80qhs zb#_^dK=)A{F>eEjD_L8&M)h9#TE*Lb_@WE_85^zmoSfx7+mX0uO5PCwl`_mr_v+}g03=MM`6%=;JL%rRShu|qMS zw#7$HxwA9CUA)0{!j(t<)B6_xIeJ&~~` zLdR?Ar0cIkIo>rEu*dty1paAQbv0}CRVS{+FG{QoC(rnFGNnm-*{c8i^%olXKX0%5 UIcblGIw(p#UHx3vIVCg!08xGRlK=n! literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/premium/privacy@2x.png b/Telegram/Resources/icons/settings/premium/privacy@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f82d78947fa763eeebc6ee84aa704e95f81fdce1 GIT binary patch literal 1108 zcmV-a1grarP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFzDYzuR9Fe^SW75%Q55!mQ}X5~ z1CNxtMG6C@Bm<@7Q4%Gkl$0`&k)e@^x&vZj;1P;a=nk$ZMTr<75(yD`zyJT!soi$g z-skLdyOY1p9j*QC^?hsIb=KZz-Rt9Hf9wj_6|gJdK?MQ=0^;N2gMxxQ;OZ#8y0zjm zGBUEPtgND1l_<;dwA)W^{D)$jHd&=cidFzxKbszmZl-N{X?#<=ujUg5%@kU!kll zuCA`i%gZfCl@aRe>)+nq3=%-u_V)Jf?(PhH@B}+MJ7pm(;Amchj(K=^Xl-o`4-bbT z`WhXxwzeiq3y-g{vC%?o>YAIIdw+i~3xI60v$J(9e}DhU$w?Un->tN?R7X)=;v287 zuF9l=vqw-{TRSy1)!*MA6%_^bxVX6M>uVYD;NT!QI9N3a-mj^tNhS&$^^b^%fPZy$ zHFI;hT$;kr&=3Qu(bLnz2U4<8o|BUks>P7~{e4Xcr<#E8Yx)OPXG;N21u68K$yi`gh`Wo0E>@`f}a9ChB$>vmmToi)v^ ztu0-h`Q`HRa$#Yirid2)!+in+1A!+cB~46B@D!bmuD6yD-ita3w%pv@#MxGno12?s zENX;?hN_7C_`sF&8Pd_wp(s>URmE7;$jr>7I^rG*3k##J48efGY-58pzR*n=MVt_x z7hYaM6)%EkXJ=GRoDlrZ&(Ep17m?T3SK;_3O$evVi{Yu%?(QxHfk+dYnVAt1yanRj zCzO&VgcJMm@gd}R1;i~S)R88HY0K$!3OOMmAwryjvYTdpe*Wm_i29o#v9YnjAyAem zmFw;8rPmMI8NU>$vl7zQ)y}gZ5 z3sVu@!swEoo}QPN=jW$yiP_oNnwlES*OaA-;8*F+&JO*e9v~|#E9(7clpo#|9)#CX z#>U393DYQ&%3e-Rj!xR@^7;80y{HmP$)~%!+iC{P|K;UnU|;~Vky0cTCrrMlr>86c z47b~zpP%2{+>ERI>FJ5zVm1!;($Z2_R~P<=P>I6(n4GfV;o+8+7L9;Za088xkF%47 zdoL?1D>*qCHNf16OAGS`8V-j5x$bkb4T>-lSb_M?1 a3j6~o4iorkU}C5M0000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=wMj%lRA>e5T3IM(Z5X%Ckk1w) z%TT1jhcuF%8_CFWW4ReFTu9B8E1@ViiYTO+3u8&h79~p)5)vg#Da?=|`%-qYjqlg@ zuQTWG{QvL!p5s_9&bfNdvp>&ym*;(-qobodN(Ph+C>c;PpkzSFfRX_v1CPvr?jz+H z#m&sj{`vp8y}dmH#hK}@i{y^Y;A2#Nl7s@G<YH{ajL@8)qSdI!ZavCLqj(gp~oE*LfZ`SS;|ayd`Z^X=O=MxVeoH8thw=_yp_ zM#09$5eCTAE6 zcUxN<_Bsrz{{DVvXJ?KS6BEO(GdDMv6O;|e$jDJktrKQTYfq}uy%nV<4dwbi$ z!a_yGwt>2lPbI)8px?iLFIz}Z1TPN`4hSY6kR~T5IrE=Ce||v4Ye7K)$I#f=C}hxv zX>M-j1POp1fyO7nIV&qGK86f$ZfZQ(*Y|FI;P@ z=Q1QD#KFNq9Vh9nx3^c@R2Jf~(KR$Q1O^6jrr^ZCg2%+k6^0&|si~lY3D(={;4C0yQ=2RB~*%auRhQP{r%(>$|wPNY?!Q z`*&J${?bJ^*FJpsFflPfJ~d!|qg#tgpQW>mp8Lm-AH&1LasBw$F9C#&3*(%+$_wPg zAR;0np0q6{{BE;BKi;Kw &media) { return tr::lng_premium_summary_subtitle_infinite_reactions(); case PremiumPreview::TagsForMessages: return tr::lng_premium_summary_subtitle_tags_for_messages(); + case PremiumPreview::LastSeen: + return tr::lng_premium_summary_subtitle_last_seen(); + case PremiumPreview::MessagePrivacy: + return tr::lng_premium_summary_subtitle_message_privacy(); case PremiumPreview::Stickers: return tr::lng_premium_summary_subtitle_premium_stickers(); case PremiumPreview::AnimatedEmoji: @@ -150,6 +154,10 @@ void PreloadSticker(const std::shared_ptr &media) { return tr::lng_premium_summary_about_infinite_reactions(); case PremiumPreview::TagsForMessages: return tr::lng_premium_summary_about_tags_for_messages(); + case PremiumPreview::LastSeen: + return tr::lng_premium_summary_about_last_seen(); + case PremiumPreview::MessagePrivacy: + return tr::lng_premium_summary_about_message_privacy(); case PremiumPreview::Stickers: return tr::lng_premium_summary_about_premium_stickers(); case PremiumPreview::AnimatedEmoji: @@ -480,6 +488,8 @@ struct VideoPreviewDocument { case PremiumPreview::AnimatedUserpics: return "animated_userpics"; case PremiumPreview::RealTimeTranslation: return "translations"; case PremiumPreview::Wallpapers: return "wallpapers"; + case PremiumPreview::LastSeen: return "last_seen"; + case PremiumPreview::MessagePrivacy: return "message_privacy"; } return ""; }(); diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h index ba6dae46bd..b7fb7a40eb 100644 --- a/Telegram/SourceFiles/boxes/premium_preview_box.h +++ b/Telegram/SourceFiles/boxes/premium_preview_box.h @@ -62,6 +62,8 @@ enum class PremiumPreview { RealTimeTranslation, Wallpapers, TagsForMessages, + LastSeen, + MessagePrivacy, kCount, }; diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index d61f61738c..0df986eb0f 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -92,6 +92,8 @@ settingsPremiumIconVoice: icon {{ "settings/premium/voice", settingsIconFg }}; settingsPremiumIconFiles: icon {{ "settings/premium/files", settingsIconFg }}; settingsPremiumIconTranslations: icon {{ "settings/premium/translations", settingsIconFg }}; settingsPremiumIconTags: icon {{ "settings/premium/tags", settingsIconFg }}; +settingsPremiumIconLastSeen: icon {{ "settings/premium/lastseen", settingsIconFg }}; +settingsPremiumIconPrivacy: icon {{ "settings/premium/privacy", settingsIconFg }}; settingsStoriesIconOrder: icon {{ "settings/premium/stories_order", premiumButtonBg1 }}; settingsStoriesIconStealth: icon {{ "menu/stealth", premiumButtonBg1 }}; diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 337f413acb..cde74eb5ad 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -177,22 +177,26 @@ using Order = std::vector; [[nodiscard]] Order FallbackOrder() { return Order{ - u"wallpapers"_q, u"stories"_q, - u"double_limits"_q, u"more_upload"_q, - u"faster_download"_q, + u"double_limits"_q, + u"last_seen"_q, u"voice_to_text"_q, - u"no_ads"_q, + u"faster_download"_q, + u"translations"_q, + u"animated_emoji"_q, u"emoji_status"_q, u"saved_tags"_q, - u"infinite_reactions"_q, - u"premium_stickers"_q, - u"animated_emoji"_q, - u"advanced_chat_management"_q, + //u"peer_colors"_q, + u"wallpapers"_q, u"profile_badge"_q, + u"message_privacy"_q, + u"advanced_chat_management"_q, + u"no_ads"_q, + //u"app_icons"_q, + u"infinite_reactions"_q, u"animated_userpics"_q, - u"translations"_q, + u"premium_stickers"_q, }; } @@ -208,6 +212,26 @@ using Order = std::vector; true, }, }, + { + u"last_seen"_q, + Entry{ + &st::settingsPremiumIconLastSeen, + tr::lng_premium_summary_subtitle_last_seen(), + tr::lng_premium_summary_about_last_seen(), + PremiumPreview::LastSeen, + true, + }, + }, + { + u"message_privacy"_q, + Entry{ + &st::settingsPremiumIconPrivacy, + tr::lng_premium_summary_subtitle_message_privacy(), + tr::lng_premium_summary_about_message_privacy(), + PremiumPreview::MessagePrivacy, + true, + }, + }, { u"wallpapers"_q, Entry{ @@ -1522,6 +1546,10 @@ not_null CreateSubscribeButton( return PremiumPreview::InfiniteReactions; } else if (s == u"saved_tags"_q) { return PremiumPreview::TagsForMessages; + } else if (s == u"last_seen"_q) { + return PremiumPreview::LastSeen; + } else if (s == u"message_privacy"_q) { + return PremiumPreview::MessagePrivacy; } else if (s == u"premium_stickers"_q) { return PremiumPreview::Stickers; } else if (s == u"animated_emoji"_q) {