From 5285f74b13940d00348282ffddf5386112573759 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 15 Aug 2023 13:07:29 +0200 Subject: [PATCH] Use outline premium icon. --- Telegram/Resources/icons/menu/premium.png | Bin 0 -> 687 bytes Telegram/Resources/icons/menu/premium@2x.png | Bin 0 -> 1416 bytes Telegram/Resources/icons/menu/premium@3x.png | Bin 0 -> 2145 bytes .../boxes/peers/edit_members_visible.cpp | 4 +- Telegram/SourceFiles/info/info.style | 15 ++++-- .../SourceFiles/settings/settings_main.cpp | 43 +++++++++--------- Telegram/SourceFiles/ui/menu_icons.style | 2 +- 7 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 Telegram/Resources/icons/menu/premium.png create mode 100644 Telegram/Resources/icons/menu/premium@2x.png create mode 100644 Telegram/Resources/icons/menu/premium@3x.png diff --git a/Telegram/Resources/icons/menu/premium.png b/Telegram/Resources/icons/menu/premium.png new file mode 100644 index 0000000000000000000000000000000000000000..56e0e0e94905ee2ba207343847721d6c8ed9667f GIT binary patch literal 687 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 Xpvy`M66r?|00000NkvXXu0mjfj-Bf4 literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp index b51451817..ed0a363a2 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp @@ -53,8 +53,8 @@ namespace { tr::lng_profile_hide_participants(), rpl::single(QString()), [] {}, - st::manageGroupTopicsButton, - { &st::menuIconHideMembers } + st::manageGroupNoIconButton, + {} ))->toggleOn(rpl::single( (megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0 ) | rpl::then(state->toggled.events())); diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index b1d81d809..d54deb94b 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -600,15 +600,20 @@ manageGroupTopicsButton: SettingsCountButton(manageGroupTopButtonWithText) { } } } +manageGroupNoIconButtonInner: SettingsButton(infoProfileButton) { + padding: margins(25px, 11px, 24px, 8px); +} +manageGroupNoIconButton: SettingsCountButton(manageGroupTopButtonWithText) { + button: manageGroupNoIconButtonInner; + labelPosition: point(22px, 11px); + iconPosition: point(0px, 0px); +} -manageDeleteGroupButton: SettingsCountButton(manageGroupTopButtonWithText) { - button: SettingsButton(infoProfileButton) { - padding: margins(25px, 11px, 24px, 8px); +manageDeleteGroupButton: SettingsCountButton(manageGroupNoIconButton) { + button: SettingsButton(manageGroupNoIconButtonInner) { textFg: attentionButtonFg; textFgOver: attentionButtonFg; } - labelPosition: point(22px, 11px); - iconPosition: point(0px, 0px); } infoEmptyFg: windowSubTextFg; diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index 9e6c8a2af..f00224827 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -312,9 +312,6 @@ void SetupSections( st::settingsButton, std::move(descriptor) )->addClickHandler([=] { - if (type == PremiumId()) { - controller->setPremiumRef("settings"); - } showOther(type); }); }; @@ -398,27 +395,28 @@ void SetupSections( SetupPowerSavingButton(&controller->window(), container); SetupLanguageButton(&controller->window(), container); - if (controller->session().premiumPossible()) { - AddSkip(container); - AddDivider(container); - AddSkip(container); + AddSkip(container); +} - const auto icon = &st::settingsPremiumIconStar; - auto gradient = QLinearGradient( - 0, - icon->height(), - icon->width() + icon->width() / 3, - 0 - icon->height() / 3); - gradient.setStops(QGradientStops{ - { 0.0, st::premiumButtonBg1->c }, - { 1.0, st::premiumButtonBg3->c }, - }); - addSection( - tr::lng_premium_summary_title(), - PremiumId(), - { .icon = icon, .backgroundBrush = QBrush(gradient) }); +void SetupPremium( + not_null controller, + not_null container, + Fn showOther) { + if (!controller->session().premiumPossible()) { + return; } + AddDivider(container); + AddSkip(container); + AddButton( + container, + tr::lng_premium_summary_title(), + st::settingsButton, + { .icon = &st::menuIconPremium } + )->addClickHandler([=] { + controller->setPremiumRef("settings"); + showOther(PremiumId()); + }); AddSkip(container); } @@ -686,6 +684,9 @@ void Main::setupContent(not_null controller) { SetupInterfaceScale(&controller->window(), content); AddSkip(content); } + SetupPremium(controller, content, [=](Type type) { + _showOther.fire_copy(type); + }); SetupHelp(controller, content); Ui::ResizeFitChild(this, content); diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 13aed59aa..7aaf32213 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -134,7 +134,7 @@ menuIconSigned: icon {{ "menu/signed", menuIconColor }}; menuIconAntispam: icon {{ "menu/antispam", menuIconColor }}; menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }}; menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }}; -menuIconHideMembers: icon {{ "menu/hide_members", menuIconColor }}; +menuIconPremium: icon {{ "menu/premium", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px);