Update API scheme to layer 175. Business promo.
|
@ -1295,6 +1295,8 @@ PRIVATE
|
||||||
settings/settings_advanced.h
|
settings/settings_advanced.h
|
||||||
settings/settings_blocked_peers.cpp
|
settings/settings_blocked_peers.cpp
|
||||||
settings/settings_blocked_peers.h
|
settings/settings_blocked_peers.h
|
||||||
|
settings/settings_business.cpp
|
||||||
|
settings/settings_business.h
|
||||||
settings/settings_chat.cpp
|
settings/settings_chat.cpp
|
||||||
settings/settings_chat.h
|
settings/settings_chat.h
|
||||||
settings/settings_calls.cpp
|
settings/settings_calls.cpp
|
||||||
|
|
BIN
Telegram/Resources/art/business_logo.png
Normal file
After Width: | Height: | Size: 47 KiB |
BIN
Telegram/Resources/icons/menu/shop.png
Normal file
After Width: | Height: | Size: 687 B |
BIN
Telegram/Resources/icons/menu/shop@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/shop@3x.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 662 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 499 B |
After Width: | Height: | Size: 928 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 426 B |
After Width: | Height: | Size: 765 B |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 454 B |
After Width: | Height: | Size: 845 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 615 B |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 497 B After Width: | Height: | Size: 568 B |
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.6 KiB |
|
@ -2056,6 +2056,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
"lng_premium_summary_about_animated_userpics" = "Video avatars animated in chat lists and chats to allow for additional self-expression.";
|
"lng_premium_summary_about_animated_userpics" = "Video avatars animated in chat lists and chats to allow for additional self-expression.";
|
||||||
"lng_premium_summary_subtitle_translation" = "Real-Time Translation";
|
"lng_premium_summary_subtitle_translation" = "Real-Time Translation";
|
||||||
"lng_premium_summary_about_translation" = "Real-time translation of channels and chats into other languages.";
|
"lng_premium_summary_about_translation" = "Real-time translation of channels and chats into other languages.";
|
||||||
|
"lng_premium_summary_subtitle_business" = "Telegram Business";
|
||||||
|
"lng_premium_summary_about_business" = "Upgrade your account with business features such as location, opening hours and quick replies.";
|
||||||
"lng_premium_summary_bottom_subtitle" = "About Telegram Premium";
|
"lng_premium_summary_bottom_subtitle" = "About Telegram Premium";
|
||||||
"lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
|
"lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
|
||||||
"lng_premium_summary_button" = "Subscribe for {cost} per month";
|
"lng_premium_summary_button" = "Subscribe for {cost} per month";
|
||||||
|
@ -2154,6 +2156,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
"lng_premium_gifts_terms" = "By gifting Telegram Premium, you agree to the Telegram {link} and {policy}.";
|
"lng_premium_gifts_terms" = "By gifting Telegram Premium, you agree to the Telegram {link} and {policy}.";
|
||||||
"lng_premium_gifts_terms_policy" = "Privacy Policy";
|
"lng_premium_gifts_terms_policy" = "Privacy Policy";
|
||||||
|
|
||||||
|
"lng_business_title" = "Telegram Business";
|
||||||
|
"lng_business_about" = "Turn your account to a business page with these additional features.";
|
||||||
|
"lng_business_unlocked" = "You have now unlocked these additional business features.";
|
||||||
|
"lng_business_subtitle_location" = "Location";
|
||||||
|
"lng_business_about_location" = "Display the location of your business on your account.";
|
||||||
|
"lng_business_subtitle_opening_hours" = "Opening Hours";
|
||||||
|
"lng_business_about_opening_hours" = "Show to your customers when you are open for business.";
|
||||||
|
"lng_business_subtitle_quick_replies" = "Quick Replies";
|
||||||
|
"lng_business_about_quick_replies" = "Set up shortcuts up to 20 messages each to respond to customers faster.";
|
||||||
|
"lng_business_subtitle_greeting_messages" = "Greeting Messages";
|
||||||
|
"lng_business_about_greeting_messages" = "Create greetings that will be automatically sent to new customers.";
|
||||||
|
"lng_business_subtitle_away_messages" = "Away Messages";
|
||||||
|
"lng_business_about_away_messages" = "Define messages that are automatically sent when you are off.";
|
||||||
|
"lng_business_subtitle_chatbots" = "Chatbots";
|
||||||
|
"lng_business_about_chatbots" = "Add any third party chatbots that will process customer interactions.";
|
||||||
|
|
||||||
"lng_boost_channel_button" = "Boost Channel";
|
"lng_boost_channel_button" = "Boost Channel";
|
||||||
"lng_boost_group_button" = "Boost Group";
|
"lng_boost_group_button" = "Boost Group";
|
||||||
"lng_boost_again_button" = "Boost Again";
|
"lng_boost_again_button" = "Boost Again";
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
<file alias="art/background.tgv">../../art/background.tgv</file>
|
<file alias="art/background.tgv">../../art/background.tgv</file>
|
||||||
<file alias="art/bg_thumbnail.png">../../art/bg_thumbnail.png</file>
|
<file alias="art/bg_thumbnail.png">../../art/bg_thumbnail.png</file>
|
||||||
<file alias="art/bg_initial.jpg">../../art/bg_initial.jpg</file>
|
<file alias="art/bg_initial.jpg">../../art/bg_initial.jpg</file>
|
||||||
|
<file alias="art/business_logo.png">../../art/business_logo.png</file>
|
||||||
<file alias="art/logo_256.png">../../art/logo_256.png</file>
|
<file alias="art/logo_256.png">../../art/logo_256.png</file>
|
||||||
<file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
|
<file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
|
||||||
<file alias="art/themeimage.jpg">../../art/themeimage.jpg</file>
|
<file alias="art/themeimage.jpg">../../art/themeimage.jpg</file>
|
||||||
|
|
|
@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "ui/boxes/confirm_box.h"
|
#include "ui/boxes/confirm_box.h"
|
||||||
#include "ui/painter.h"
|
#include "ui/painter.h"
|
||||||
#include "ui/vertical_list.h"
|
#include "ui/vertical_list.h"
|
||||||
|
#include "settings/settings_business.h"
|
||||||
#include "settings/settings_premium.h"
|
#include "settings/settings_premium.h"
|
||||||
#include "lottie/lottie_single_player.h"
|
#include "lottie/lottie_single_player.h"
|
||||||
#include "history/view/media/history_view_sticker.h"
|
#include "history/view/media/history_view_sticker.h"
|
||||||
|
@ -128,6 +129,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
|
||||||
return tr::lng_premium_summary_subtitle_animated_userpics();
|
return tr::lng_premium_summary_subtitle_animated_userpics();
|
||||||
case PremiumPreview::RealTimeTranslation:
|
case PremiumPreview::RealTimeTranslation:
|
||||||
return tr::lng_premium_summary_subtitle_translation();
|
return tr::lng_premium_summary_subtitle_translation();
|
||||||
|
case PremiumPreview::Business:
|
||||||
|
return tr::lng_premium_summary_subtitle_business();
|
||||||
}
|
}
|
||||||
Unexpected("PremiumPreview in SectionTitle.");
|
Unexpected("PremiumPreview in SectionTitle.");
|
||||||
}
|
}
|
||||||
|
@ -170,6 +173,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
|
||||||
return tr::lng_premium_summary_about_animated_userpics();
|
return tr::lng_premium_summary_about_animated_userpics();
|
||||||
case PremiumPreview::RealTimeTranslation:
|
case PremiumPreview::RealTimeTranslation:
|
||||||
return tr::lng_premium_summary_about_translation();
|
return tr::lng_premium_summary_about_translation();
|
||||||
|
case PremiumPreview::Business:
|
||||||
|
return tr::lng_premium_summary_about_business();
|
||||||
}
|
}
|
||||||
Unexpected("PremiumPreview in SectionTitle.");
|
Unexpected("PremiumPreview in SectionTitle.");
|
||||||
}
|
}
|
||||||
|
@ -1219,6 +1224,13 @@ void Show(
|
||||||
DecorateListPromoBox(box, show, descriptor);
|
DecorateListPromoBox(box, show, descriptor);
|
||||||
}));
|
}));
|
||||||
return;
|
return;
|
||||||
|
} else if (descriptor.section == PremiumPreview::Business) {
|
||||||
|
const auto window = show->resolveWindow(
|
||||||
|
ChatHelpers::WindowUsage::PremiumPromo);
|
||||||
|
if (window) {
|
||||||
|
Settings::ShowBusiness(window);
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
auto &list = Preloads();
|
auto &list = Preloads();
|
||||||
for (auto i = begin(list); i != end(list);) {
|
for (auto i = begin(list); i != end(list);) {
|
||||||
|
|
|
@ -64,6 +64,7 @@ enum class PremiumPreview {
|
||||||
TagsForMessages,
|
TagsForMessages,
|
||||||
LastSeen,
|
LastSeen,
|
||||||
MessagePrivacy,
|
MessagePrivacy,
|
||||||
|
Business,
|
||||||
|
|
||||||
kCount,
|
kCount,
|
||||||
};
|
};
|
||||||
|
|
|
@ -402,6 +402,7 @@ updateBotMessageReactions#9cb7759 peer:Peer msg_id:int date:int reactions:Vector
|
||||||
updateSavedDialogPinned#aeaf9e74 flags:# pinned:flags.0?true peer:DialogPeer = Update;
|
updateSavedDialogPinned#aeaf9e74 flags:# pinned:flags.0?true peer:DialogPeer = Update;
|
||||||
updatePinnedSavedDialogs#686c85a6 flags:# order:flags.0?Vector<DialogPeer> = Update;
|
updatePinnedSavedDialogs#686c85a6 flags:# order:flags.0?Vector<DialogPeer> = Update;
|
||||||
updateSavedReactionTags#39c67432 = Update;
|
updateSavedReactionTags#39c67432 = Update;
|
||||||
|
updateSmsJob#f16269d4 job_id:string = Update;
|
||||||
|
|
||||||
updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
|
updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
|
||||||
|
|
||||||
|
@ -1653,6 +1654,12 @@ messages.savedReactionTags#3259950a tags:Vector<SavedReactionTag> hash:long = me
|
||||||
|
|
||||||
outboxReadDate#3bb842ac date:int = OutboxReadDate;
|
outboxReadDate#3bb842ac date:int = OutboxReadDate;
|
||||||
|
|
||||||
|
smsjobs.eligibleToJoin#dc8b44cf terms_url:string monthly_sent_sms:int = smsjobs.EligibilityToJoin;
|
||||||
|
|
||||||
|
smsjobs.status#2aee9191 flags:# allow_international:flags.0?true recent_sent:int recent_since:int recent_remains:int total_sent:int total_since:int last_gift_slug:flags.1?string terms_url:string = smsjobs.Status;
|
||||||
|
|
||||||
|
smsJob#e6a1eeb8 job_id:string phone_number:string text:string = SmsJob;
|
||||||
|
|
||||||
---functions---
|
---functions---
|
||||||
|
|
||||||
invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
|
invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
|
||||||
|
@ -2252,4 +2259,12 @@ premium.applyBoost#6b7da746 flags:# slots:flags.0?Vector<int> peer:InputPeer = p
|
||||||
premium.getBoostsStatus#42f1f61 peer:InputPeer = premium.BoostsStatus;
|
premium.getBoostsStatus#42f1f61 peer:InputPeer = premium.BoostsStatus;
|
||||||
premium.getUserBoosts#39854d1f peer:InputPeer user_id:InputUser = premium.BoostsList;
|
premium.getUserBoosts#39854d1f peer:InputPeer user_id:InputUser = premium.BoostsList;
|
||||||
|
|
||||||
// LAYER 174
|
smsjobs.isEligibleToJoin#edc39d0 = smsjobs.EligibilityToJoin;
|
||||||
|
smsjobs.join#a74ece2d = Bool;
|
||||||
|
smsjobs.leave#9898ad73 = Bool;
|
||||||
|
smsjobs.updateSettings#93fa0bf flags:# allow_international:flags.0?true = Bool;
|
||||||
|
smsjobs.getStatus#10a698e8 = smsjobs.Status;
|
||||||
|
smsjobs.getSmsJob#778d902f job_id:string = SmsJob;
|
||||||
|
smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
|
||||||
|
|
||||||
|
// LAYER 175
|
||||||
|
|
|
@ -94,6 +94,7 @@ settingsPremiumIconTranslations: icon {{ "settings/premium/translations", settin
|
||||||
settingsPremiumIconTags: icon {{ "settings/premium/tags", settingsIconFg }};
|
settingsPremiumIconTags: icon {{ "settings/premium/tags", settingsIconFg }};
|
||||||
settingsPremiumIconLastSeen: icon {{ "settings/premium/lastseen", settingsIconFg }};
|
settingsPremiumIconLastSeen: icon {{ "settings/premium/lastseen", settingsIconFg }};
|
||||||
settingsPremiumIconPrivacy: icon {{ "settings/premium/privacy", settingsIconFg }};
|
settingsPremiumIconPrivacy: icon {{ "settings/premium/privacy", settingsIconFg }};
|
||||||
|
settingsPremiumIconBusiness: icon {{ "settings/premium/privacy", settingsIconFg }};
|
||||||
|
|
||||||
settingsStoriesIconOrder: icon {{ "settings/premium/stories_order", premiumButtonBg1 }};
|
settingsStoriesIconOrder: icon {{ "settings/premium/stories_order", premiumButtonBg1 }};
|
||||||
settingsStoriesIconStealth: icon {{ "menu/stealth", premiumButtonBg1 }};
|
settingsStoriesIconStealth: icon {{ "menu/stealth", premiumButtonBg1 }};
|
||||||
|
@ -103,6 +104,13 @@ settingsStoriesIconDownload: icon {{ "menu/download", premiumButtonBg1 }};
|
||||||
settingsStoriesIconCaption: icon {{ "settings/premium/stories_caption", premiumButtonBg1 }};
|
settingsStoriesIconCaption: icon {{ "settings/premium/stories_caption", premiumButtonBg1 }};
|
||||||
settingsStoriesIconLinks: icon {{ "menu/links_profile", premiumButtonBg1 }};
|
settingsStoriesIconLinks: icon {{ "menu/links_profile", premiumButtonBg1 }};
|
||||||
|
|
||||||
|
settingsBusinessIconLocation: icon {{ "settings/premium/business/business_location", settingsIconFg }};
|
||||||
|
settingsBusinessIconHours: icon {{ "settings/premium/business/business_hours", settingsIconFg }};
|
||||||
|
settingsBusinessIconReplies: icon {{ "settings/premium/business/business_quick", settingsIconFg }};
|
||||||
|
settingsBusinessIconGreeting: icon {{ "settings/premium/status", settingsIconFg }};
|
||||||
|
settingsBusinessIconAway: icon {{ "settings/premium/business/business_away", settingsIconFg }};
|
||||||
|
settingsBusinessIconChatbots: icon {{ "settings/premium/business/business_chatbots", settingsIconFg }};
|
||||||
|
|
||||||
settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
|
settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
|
||||||
style: TextStyle(semiboldTextStyle) {
|
style: TextStyle(semiboldTextStyle) {
|
||||||
font: font(10px semibold);
|
font: font(10px semibold);
|
||||||
|
|
568
Telegram/SourceFiles/settings/settings_business.cpp
Normal file
|
@ -0,0 +1,568 @@
|
||||||
|
/*
|
||||||
|
This file is part of Telegram Desktop,
|
||||||
|
the official desktop application for the Telegram messaging service.
|
||||||
|
|
||||||
|
For license and copyright information please follow this link:
|
||||||
|
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
*/
|
||||||
|
#include "settings/settings_business.h"
|
||||||
|
|
||||||
|
#include "boxes/premium_preview_box.h"
|
||||||
|
#include "core/click_handler_types.h"
|
||||||
|
#include "data/data_peer_values.h" // AmPremiumValue.
|
||||||
|
#include "info/info_wrap_widget.h" // Info::Wrap.
|
||||||
|
#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
|
||||||
|
#include "lang/lang_keys.h"
|
||||||
|
#include "main/main_session.h"
|
||||||
|
#include "settings/settings_common_session.h"
|
||||||
|
#include "settings/settings_premium.h"
|
||||||
|
#include "ui/effects/gradient.h"
|
||||||
|
#include "ui/effects/premium_graphics.h"
|
||||||
|
#include "ui/effects/premium_top_bar.h"
|
||||||
|
#include "ui/layers/generic_box.h"
|
||||||
|
#include "ui/text/text_utilities.h"
|
||||||
|
#include "ui/widgets/checkbox.h" // Ui::RadiobuttonGroup.
|
||||||
|
#include "ui/widgets/gradient_round_button.h"
|
||||||
|
#include "ui/wrap/fade_wrap.h"
|
||||||
|
#include "ui/wrap/slide_wrap.h"
|
||||||
|
#include "ui/wrap/vertical_layout.h"
|
||||||
|
#include "ui/vertical_list.h"
|
||||||
|
#include "window/window_session_controller.h"
|
||||||
|
#include "apiwrap.h"
|
||||||
|
#include "api/api_premium.h"
|
||||||
|
#include "styles/style_premium.h"
|
||||||
|
#include "styles/style_info.h"
|
||||||
|
#include "styles/style_layers.h"
|
||||||
|
#include "styles/style_settings.h"
|
||||||
|
|
||||||
|
namespace Settings {
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
struct Entry {
|
||||||
|
const style::icon *icon;
|
||||||
|
rpl::producer<QString> title;
|
||||||
|
rpl::producer<QString> description;
|
||||||
|
BusinessFeature feature = BusinessFeature::Location;
|
||||||
|
};
|
||||||
|
|
||||||
|
using Order = std::vector<QString>;
|
||||||
|
|
||||||
|
[[nodiscard]] Order FallbackOrder() {
|
||||||
|
return Order{
|
||||||
|
u"location"_q,
|
||||||
|
u"opening_hours"_q,
|
||||||
|
u"quick_replies"_q,
|
||||||
|
u"greeting_messages"_q,
|
||||||
|
u"away_messages"_q,
|
||||||
|
u"chatbots"_q,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] base::flat_map<QString, Entry> EntryMap() {
|
||||||
|
return base::flat_map<QString, Entry>{
|
||||||
|
{
|
||||||
|
u"location"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconLocation,
|
||||||
|
tr::lng_business_subtitle_location(),
|
||||||
|
tr::lng_business_about_location(),
|
||||||
|
BusinessFeature::Location,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u"opening_hours"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconHours,
|
||||||
|
tr::lng_business_subtitle_opening_hours(),
|
||||||
|
tr::lng_business_about_opening_hours(),
|
||||||
|
BusinessFeature::OpeningHours,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u"quick_replies"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconReplies,
|
||||||
|
tr::lng_business_subtitle_quick_replies(),
|
||||||
|
tr::lng_business_about_quick_replies(),
|
||||||
|
BusinessFeature::QuickReplies,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u"greeting_messages"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconGreeting,
|
||||||
|
tr::lng_business_subtitle_greeting_messages(),
|
||||||
|
tr::lng_business_about_greeting_messages(),
|
||||||
|
BusinessFeature::GreetingMessages,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u"away_messages"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconAway,
|
||||||
|
tr::lng_business_subtitle_away_messages(),
|
||||||
|
tr::lng_business_about_away_messages(),
|
||||||
|
BusinessFeature::AwayMessages,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u"chatbots"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsBusinessIconChatbots,
|
||||||
|
tr::lng_business_subtitle_chatbots(),
|
||||||
|
tr::lng_business_about_chatbots(),
|
||||||
|
BusinessFeature::Chatbots,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void AddBusinessSummary(
|
||||||
|
not_null<Ui::VerticalLayout*> content,
|
||||||
|
not_null<Window::SessionController*> controller,
|
||||||
|
Fn<void(BusinessFeature)> buttonCallback) {
|
||||||
|
const auto &stDefault = st::settingsButton;
|
||||||
|
const auto &stLabel = st::defaultFlatLabel;
|
||||||
|
const auto iconSize = st::settingsPremiumIconDouble.size();
|
||||||
|
const auto &titlePadding = st::settingsPremiumRowTitlePadding;
|
||||||
|
const auto &descriptionPadding = st::settingsPremiumRowAboutPadding;
|
||||||
|
|
||||||
|
auto entryMap = EntryMap();
|
||||||
|
auto iconContainers = std::vector<Ui::AbstractButton*>();
|
||||||
|
iconContainers.reserve(int(entryMap.size()));
|
||||||
|
|
||||||
|
const auto addRow = [&](Entry &entry) {
|
||||||
|
const auto labelAscent = stLabel.style.font->ascent;
|
||||||
|
const auto button = Ui::CreateChild<Ui::SettingsButton>(
|
||||||
|
content.get(),
|
||||||
|
rpl::single(QString()));
|
||||||
|
|
||||||
|
const auto label = content->add(
|
||||||
|
object_ptr<Ui::FlatLabel>(
|
||||||
|
content,
|
||||||
|
std::move(entry.title) | rpl::map(Ui::Text::Bold),
|
||||||
|
stLabel),
|
||||||
|
titlePadding);
|
||||||
|
label->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||||
|
const auto description = content->add(
|
||||||
|
object_ptr<Ui::FlatLabel>(
|
||||||
|
content,
|
||||||
|
std::move(entry.description),
|
||||||
|
st::boxDividerLabel),
|
||||||
|
descriptionPadding);
|
||||||
|
description->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||||
|
|
||||||
|
const auto dummy = Ui::CreateChild<Ui::AbstractButton>(content.get());
|
||||||
|
dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||||
|
|
||||||
|
content->sizeValue(
|
||||||
|
) | rpl::start_with_next([=](const QSize &s) {
|
||||||
|
dummy->resize(s.width(), iconSize.height());
|
||||||
|
}, dummy->lifetime());
|
||||||
|
|
||||||
|
label->geometryValue(
|
||||||
|
) | rpl::start_with_next([=](const QRect &r) {
|
||||||
|
dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
|
||||||
|
}, dummy->lifetime());
|
||||||
|
|
||||||
|
rpl::combine(
|
||||||
|
content->widthValue(),
|
||||||
|
label->heightValue(),
|
||||||
|
description->heightValue()
|
||||||
|
) | rpl::start_with_next([=,
|
||||||
|
topPadding = titlePadding,
|
||||||
|
bottomPadding = descriptionPadding](
|
||||||
|
int width,
|
||||||
|
int topHeight,
|
||||||
|
int bottomHeight) {
|
||||||
|
button->resize(
|
||||||
|
width,
|
||||||
|
topPadding.top()
|
||||||
|
+ topHeight
|
||||||
|
+ topPadding.bottom()
|
||||||
|
+ bottomPadding.top()
|
||||||
|
+ bottomHeight
|
||||||
|
+ bottomPadding.bottom());
|
||||||
|
}, button->lifetime());
|
||||||
|
label->topValue(
|
||||||
|
) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
|
||||||
|
button->moveToLeft(0, top - padding);
|
||||||
|
}, button->lifetime());
|
||||||
|
const auto arrow = Ui::CreateChild<Ui::IconButton>(
|
||||||
|
button,
|
||||||
|
st::backButton);
|
||||||
|
arrow->setIconOverride(
|
||||||
|
&st::settingsPremiumArrow,
|
||||||
|
&st::settingsPremiumArrowOver);
|
||||||
|
arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||||
|
button->sizeValue(
|
||||||
|
) | rpl::start_with_next([=](const QSize &s) {
|
||||||
|
const auto &point = st::settingsPremiumArrowShift;
|
||||||
|
arrow->moveToRight(
|
||||||
|
-point.x(),
|
||||||
|
point.y() + (s.height() - arrow->height()) / 2);
|
||||||
|
}, arrow->lifetime());
|
||||||
|
|
||||||
|
const auto feature = entry.feature;
|
||||||
|
button->setClickedCallback([=] { buttonCallback(feature); });
|
||||||
|
|
||||||
|
iconContainers.push_back(dummy);
|
||||||
|
};
|
||||||
|
|
||||||
|
auto icons = std::vector<const style::icon *>();
|
||||||
|
icons.reserve(int(entryMap.size()));
|
||||||
|
{
|
||||||
|
const auto &account = controller->session().account();
|
||||||
|
const auto mtpOrder = FallbackOrder();/* session->account().appConfig().get<Order>(
|
||||||
|
"premium_promo_order",
|
||||||
|
FallbackOrder());*/ AssertIsDebug()
|
||||||
|
const auto processEntry = [&](Entry &entry) {
|
||||||
|
icons.push_back(entry.icon);
|
||||||
|
addRow(entry);
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const auto &key : mtpOrder) {
|
||||||
|
auto it = entryMap.find(key);
|
||||||
|
if (it == end(entryMap)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
processEntry(it->second);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
content->resizeToWidth(content->height());
|
||||||
|
|
||||||
|
// Icons.
|
||||||
|
Assert(iconContainers.size() > 2);
|
||||||
|
const auto from = iconContainers.front()->y();
|
||||||
|
const auto to = iconContainers.back()->y() + iconSize.height();
|
||||||
|
auto gradient = QLinearGradient(0, 0, 0, to - from);
|
||||||
|
gradient.setStops(Ui::Premium::FullHeightGradientStops());
|
||||||
|
for (auto i = 0; i < int(icons.size()); i++) {
|
||||||
|
const auto &iconContainer = iconContainers[i];
|
||||||
|
|
||||||
|
const auto pointTop = iconContainer->y() - from;
|
||||||
|
const auto pointBottom = pointTop + iconContainer->height();
|
||||||
|
const auto ratioTop = pointTop / float64(to - from);
|
||||||
|
const auto ratioBottom = pointBottom / float64(to - from);
|
||||||
|
|
||||||
|
auto resultGradient = QLinearGradient(
|
||||||
|
QPointF(),
|
||||||
|
QPointF(0, pointBottom - pointTop));
|
||||||
|
|
||||||
|
resultGradient.setColorAt(
|
||||||
|
.0,
|
||||||
|
anim::gradient_color_at(gradient, ratioTop));
|
||||||
|
resultGradient.setColorAt(
|
||||||
|
.1,
|
||||||
|
anim::gradient_color_at(gradient, ratioBottom));
|
||||||
|
|
||||||
|
const auto brush = QBrush(resultGradient);
|
||||||
|
AddButtonIcon(
|
||||||
|
iconContainer,
|
||||||
|
stDefault,
|
||||||
|
{ .icon = icons[i], .backgroundBrush = brush });
|
||||||
|
}
|
||||||
|
|
||||||
|
Ui::AddSkip(content, descriptionPadding.bottom());
|
||||||
|
}
|
||||||
|
|
||||||
|
class Business : public Section<Business> {
|
||||||
|
public:
|
||||||
|
Business(
|
||||||
|
QWidget *parent,
|
||||||
|
not_null<Window::SessionController*> controller);
|
||||||
|
|
||||||
|
[[nodiscard]] rpl::producer<QString> title() override;
|
||||||
|
|
||||||
|
[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
|
||||||
|
not_null<QWidget*> parent) override;
|
||||||
|
[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
|
||||||
|
not_null<Ui::RpWidget*> parent) override;
|
||||||
|
|
||||||
|
void showFinished() override;
|
||||||
|
|
||||||
|
[[nodiscard]] bool hasFlexibleTopBar() const override;
|
||||||
|
|
||||||
|
void setStepDataReference(std::any &data) override;
|
||||||
|
|
||||||
|
[[nodiscard]] rpl::producer<> sectionShowBack() override final;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void setupContent();
|
||||||
|
|
||||||
|
const not_null<Window::SessionController*> _controller;
|
||||||
|
|
||||||
|
QPointer<Ui::GradientButton> _subscribe;
|
||||||
|
base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
|
||||||
|
base::unique_qptr<Ui::IconButton> _close;
|
||||||
|
rpl::variable<bool> _backToggles;
|
||||||
|
rpl::variable<Info::Wrap> _wrap;
|
||||||
|
Fn<void(bool)> _setPaused;
|
||||||
|
|
||||||
|
std::shared_ptr<Ui::RadiobuttonGroup> _radioGroup;
|
||||||
|
|
||||||
|
rpl::event_stream<> _showBack;
|
||||||
|
rpl::event_stream<> _showFinished;
|
||||||
|
rpl::variable<QString> _buttonText;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
Business::Business(
|
||||||
|
QWidget *parent,
|
||||||
|
not_null<Window::SessionController*> controller)
|
||||||
|
: Section(parent)
|
||||||
|
, _controller(controller)
|
||||||
|
, _radioGroup(std::make_shared<Ui::RadiobuttonGroup>()) {
|
||||||
|
setupContent();
|
||||||
|
_controller->session().api().premium().reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
rpl::producer<QString> Business::title() {
|
||||||
|
return tr::lng_premium_summary_title();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Business::hasFlexibleTopBar() const {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
rpl::producer<> Business::sectionShowBack() {
|
||||||
|
return _showBack.events();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Business::setStepDataReference(std::any &data) {
|
||||||
|
using namespace Info::Settings;
|
||||||
|
const auto my = std::any_cast<SectionCustomTopBarData>(&data);
|
||||||
|
if (my) {
|
||||||
|
_backToggles = std::move(
|
||||||
|
my->backButtonEnables
|
||||||
|
) | rpl::map_to(true);
|
||||||
|
_wrap = std::move(my->wrapValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Business::setupContent() {
|
||||||
|
const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
|
||||||
|
|
||||||
|
Ui::AddSkip(content, st::settingsFromFileTop);
|
||||||
|
|
||||||
|
AddBusinessSummary(content, _controller, [=](BusinessFeature feature) {
|
||||||
|
});
|
||||||
|
|
||||||
|
Ui::ResizeFitChild(this, content);
|
||||||
|
}
|
||||||
|
|
||||||
|
QPointer<Ui::RpWidget> Business::createPinnedToTop(
|
||||||
|
not_null<QWidget*> parent) {
|
||||||
|
auto title = tr::lng_business_title();
|
||||||
|
auto about = [&]() -> rpl::producer<TextWithEntities> {
|
||||||
|
return rpl::conditional(
|
||||||
|
Data::AmPremiumValue(&_controller->session()),
|
||||||
|
tr::lng_business_unlocked(),
|
||||||
|
tr::lng_business_about()
|
||||||
|
) | Ui::Text::ToWithEntities();
|
||||||
|
}();
|
||||||
|
|
||||||
|
const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
|
||||||
|
const auto weak = base::make_weak(_controller);
|
||||||
|
const auto clickContextOther = [=] {
|
||||||
|
return QVariant::fromValue(ClickHandlerContext{
|
||||||
|
.sessionWindow = weak,
|
||||||
|
.botStartAutoSubmit = true,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
return Ui::CreateChild<Ui::Premium::TopBar>(
|
||||||
|
parent.get(),
|
||||||
|
st::defaultPremiumCover,
|
||||||
|
Ui::Premium::TopBarDescriptor{
|
||||||
|
.clickContextOther = clickContextOther,
|
||||||
|
.logo = u"dollar"_q,
|
||||||
|
.title = std::move(title),
|
||||||
|
.about = std::move(about),
|
||||||
|
});
|
||||||
|
}();
|
||||||
|
_setPaused = [=](bool paused) {
|
||||||
|
content->setPaused(paused);
|
||||||
|
if (_subscribe) {
|
||||||
|
_subscribe->setGlarePaused(paused);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
_wrap.value(
|
||||||
|
) | rpl::start_with_next([=](Info::Wrap wrap) {
|
||||||
|
content->setRoundEdges(wrap == Info::Wrap::Layer);
|
||||||
|
}, content->lifetime());
|
||||||
|
|
||||||
|
const auto calculateMaximumHeight = [=] {
|
||||||
|
return st::settingsPremiumTopHeight;
|
||||||
|
};
|
||||||
|
|
||||||
|
content->setMaximumHeight(calculateMaximumHeight());
|
||||||
|
content->setMinimumHeight(st::settingsPremiumTopHeight);// st::infoLayerTopBarHeight);
|
||||||
|
|
||||||
|
content->resize(content->width(), content->maximumHeight());
|
||||||
|
//content->additionalHeight(
|
||||||
|
//) | rpl::start_with_next([=](int additionalHeight) {
|
||||||
|
// const auto wasMax = (content->height() == content->maximumHeight());
|
||||||
|
// content->setMaximumHeight(calculateMaximumHeight()
|
||||||
|
// + additionalHeight);
|
||||||
|
// if (wasMax) {
|
||||||
|
// content->resize(content->width(), content->maximumHeight());
|
||||||
|
// }
|
||||||
|
//}, content->lifetime());
|
||||||
|
|
||||||
|
_wrap.value(
|
||||||
|
) | rpl::start_with_next([=](Info::Wrap wrap) {
|
||||||
|
const auto isLayer = (wrap == Info::Wrap::Layer);
|
||||||
|
_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
|
||||||
|
content,
|
||||||
|
object_ptr<Ui::IconButton>(
|
||||||
|
content,
|
||||||
|
(isLayer
|
||||||
|
? st::settingsPremiumLayerTopBarBack
|
||||||
|
: st::settingsPremiumTopBarBack)),
|
||||||
|
st::infoTopBarScale);
|
||||||
|
_back->setDuration(0);
|
||||||
|
_back->toggleOn(isLayer
|
||||||
|
? _backToggles.value() | rpl::type_erased()
|
||||||
|
: rpl::single(true));
|
||||||
|
_back->entity()->addClickHandler([=] {
|
||||||
|
_showBack.fire({});
|
||||||
|
});
|
||||||
|
_back->toggledValue(
|
||||||
|
) | rpl::start_with_next([=](bool toggled) {
|
||||||
|
const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
|
||||||
|
content->setTextPosition(
|
||||||
|
toggled ? st.back.width : st.titlePosition.x(),
|
||||||
|
st.titlePosition.y());
|
||||||
|
}, _back->lifetime());
|
||||||
|
|
||||||
|
if (!isLayer) {
|
||||||
|
_close = nullptr;
|
||||||
|
} else {
|
||||||
|
_close = base::make_unique_q<Ui::IconButton>(
|
||||||
|
content,
|
||||||
|
st::settingsPremiumTopBarClose);
|
||||||
|
_close->addClickHandler([=] {
|
||||||
|
_controller->parentController()->hideLayer();
|
||||||
|
_controller->parentController()->hideSpecialLayer();
|
||||||
|
});
|
||||||
|
content->widthValue(
|
||||||
|
) | rpl::start_with_next([=] {
|
||||||
|
_close->moveToRight(0, 0);
|
||||||
|
}, _close->lifetime());
|
||||||
|
}
|
||||||
|
}, content->lifetime());
|
||||||
|
|
||||||
|
return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
|
||||||
|
}
|
||||||
|
|
||||||
|
void Business::showFinished() {
|
||||||
|
_showFinished.fire({});
|
||||||
|
}
|
||||||
|
|
||||||
|
QPointer<Ui::RpWidget> Business::createPinnedToBottom(
|
||||||
|
not_null<Ui::RpWidget*> parent) {
|
||||||
|
const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
|
||||||
|
|
||||||
|
const auto session = &_controller->session();
|
||||||
|
|
||||||
|
auto buttonText = _buttonText.value();
|
||||||
|
|
||||||
|
_subscribe = CreateSubscribeButton({
|
||||||
|
_controller,
|
||||||
|
content,
|
||||||
|
[] { return u"business"_q; },
|
||||||
|
std::move(buttonText),
|
||||||
|
std::nullopt,
|
||||||
|
[=, options = session->api().premium().subscriptionOptions()] {
|
||||||
|
const auto value = _radioGroup->value();
|
||||||
|
return (value < options.size() && value >= 0)
|
||||||
|
? options[value].botUrl
|
||||||
|
: QString();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
{
|
||||||
|
const auto callback = [=](int value) {
|
||||||
|
const auto options =
|
||||||
|
_controller->session().api().premium().subscriptionOptions();
|
||||||
|
if (options.empty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Assert(value < options.size() && value >= 0);
|
||||||
|
auto text = tr::lng_premium_subscribe_button(
|
||||||
|
tr::now,
|
||||||
|
lt_cost,
|
||||||
|
options[value].costPerMonth);
|
||||||
|
_buttonText = std::move(text);
|
||||||
|
};
|
||||||
|
_radioGroup->setChangedCallback(callback);
|
||||||
|
callback(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
_showFinished.events(
|
||||||
|
) | rpl::take(1) | rpl::start_with_next([=] {
|
||||||
|
_subscribe->startGlareAnimation();
|
||||||
|
}, _subscribe->lifetime());
|
||||||
|
|
||||||
|
content->widthValue(
|
||||||
|
) | rpl::start_with_next([=](int width) {
|
||||||
|
const auto padding = st::settingsPremiumButtonPadding;
|
||||||
|
_subscribe->resizeToWidth(width - padding.left() - padding.right());
|
||||||
|
}, _subscribe->lifetime());
|
||||||
|
|
||||||
|
rpl::combine(
|
||||||
|
_subscribe->heightValue(),
|
||||||
|
Data::AmPremiumValue(session),
|
||||||
|
session->premiumPossibleValue()
|
||||||
|
) | rpl::start_with_next([=](
|
||||||
|
int buttonHeight,
|
||||||
|
bool premium,
|
||||||
|
bool premiumPossible) {
|
||||||
|
const auto padding = st::settingsPremiumButtonPadding;
|
||||||
|
const auto finalHeight = !premiumPossible
|
||||||
|
? 0
|
||||||
|
: !premium
|
||||||
|
? (padding.top() + buttonHeight + padding.bottom())
|
||||||
|
: 0;
|
||||||
|
content->resize(content->width(), finalHeight);
|
||||||
|
_subscribe->moveToLeft(padding.left(), padding.top());
|
||||||
|
_subscribe->setVisible(!premium && premiumPossible);
|
||||||
|
}, _subscribe->lifetime());
|
||||||
|
|
||||||
|
return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct SectionFactory<Business> : AbstractSectionFactory {
|
||||||
|
object_ptr<AbstractSection> create(
|
||||||
|
not_null<QWidget*> parent,
|
||||||
|
not_null<Window::SessionController*> controller
|
||||||
|
) const final override {
|
||||||
|
return object_ptr<Business>(parent, controller);
|
||||||
|
}
|
||||||
|
bool hasCustomTopBar() const final override {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] static const std::shared_ptr<SectionFactory> &Instance() {
|
||||||
|
static const auto result = std::make_shared<SectionFactory>();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Type BusinessId() {
|
||||||
|
return Business::Id();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShowBusiness(not_null<Window::SessionController*> controller) {
|
||||||
|
if (!controller->session().premiumPossible()) {
|
||||||
|
controller->show(Box(PremiumUnavailableBox));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
controller->showSettings(Settings::BusinessId());
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Settings
|
37
Telegram/SourceFiles/settings/settings_business.h
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
This file is part of Telegram Desktop,
|
||||||
|
the official desktop application for the Telegram messaging service.
|
||||||
|
|
||||||
|
For license and copyright information please follow this link:
|
||||||
|
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "settings/settings_type.h"
|
||||||
|
|
||||||
|
namespace Main {
|
||||||
|
class Session;
|
||||||
|
} // namespace Main
|
||||||
|
|
||||||
|
namespace Window {
|
||||||
|
class SessionController;
|
||||||
|
} // namespace Window
|
||||||
|
|
||||||
|
namespace Settings {
|
||||||
|
|
||||||
|
enum class BusinessFeature {
|
||||||
|
Location,
|
||||||
|
OpeningHours,
|
||||||
|
QuickReplies,
|
||||||
|
GreetingMessages,
|
||||||
|
AwayMessages,
|
||||||
|
Chatbots,
|
||||||
|
|
||||||
|
kCount,
|
||||||
|
};
|
||||||
|
|
||||||
|
[[nodiscard]] Type BusinessId();
|
||||||
|
|
||||||
|
void ShowBusiness(not_null<Window::SessionController*> controller);
|
||||||
|
|
||||||
|
} // namespace Settings
|
|
@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
*/
|
*/
|
||||||
#include "settings/settings_main.h"
|
#include "settings/settings_main.h"
|
||||||
|
|
||||||
|
#include "settings/settings_business.h"
|
||||||
#include "settings/settings_codes.h"
|
#include "settings/settings_codes.h"
|
||||||
#include "settings/settings_chat.h"
|
#include "settings/settings_chat.h"
|
||||||
#include "settings/settings_information.h"
|
#include "settings/settings_information.h"
|
||||||
|
@ -419,6 +420,19 @@ void SetupPremium(
|
||||||
controller->setPremiumRef("settings");
|
controller->setPremiumRef("settings");
|
||||||
showOther(PremiumId());
|
showOther(PremiumId());
|
||||||
});
|
});
|
||||||
|
const auto button = AddButtonWithIcon(
|
||||||
|
container,
|
||||||
|
tr::lng_business_title(),
|
||||||
|
st::settingsButton,
|
||||||
|
{ .icon = &st::menuIconShop });
|
||||||
|
button->addClickHandler([=] {
|
||||||
|
showOther(BusinessId());
|
||||||
|
});
|
||||||
|
constexpr auto kNewExpiresAt = int(1711958400);
|
||||||
|
if (base::unixtime::now() < kNewExpiresAt) {
|
||||||
|
Ui::NewBadge::AddToRight(button);
|
||||||
|
}
|
||||||
|
|
||||||
if (controller->session().premiumCanBuy()) {
|
if (controller->session().premiumCanBuy()) {
|
||||||
const auto button = AddButtonWithIcon(
|
const auto button = AddButtonWithIcon(
|
||||||
container,
|
container,
|
||||||
|
|
|
@ -180,6 +180,7 @@ using Order = std::vector<QString>;
|
||||||
u"stories"_q,
|
u"stories"_q,
|
||||||
u"more_upload"_q,
|
u"more_upload"_q,
|
||||||
u"double_limits"_q,
|
u"double_limits"_q,
|
||||||
|
u"business"_q,
|
||||||
u"last_seen"_q,
|
u"last_seen"_q,
|
||||||
u"voice_to_text"_q,
|
u"voice_to_text"_q,
|
||||||
u"faster_download"_q,
|
u"faster_download"_q,
|
||||||
|
@ -367,6 +368,16 @@ using Order = std::vector<QString>;
|
||||||
PremiumPreview::RealTimeTranslation,
|
PremiumPreview::RealTimeTranslation,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
u"business"_q,
|
||||||
|
Entry{
|
||||||
|
&st::settingsPremiumIconPlay, AssertIsDebug()
|
||||||
|
tr::lng_premium_summary_subtitle_business(),
|
||||||
|
tr::lng_premium_summary_about_business(),
|
||||||
|
PremiumPreview::Business,
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1671,9 +1682,9 @@ void AddSummaryPremium(
|
||||||
icons.reserve(int(entryMap.size()));
|
icons.reserve(int(entryMap.size()));
|
||||||
{
|
{
|
||||||
const auto &account = controller->session().account();
|
const auto &account = controller->session().account();
|
||||||
const auto mtpOrder = account.appConfig().get<Order>(
|
const auto mtpOrder = FallbackOrder();/* session->account().appConfig().get<Order>(
|
||||||
"premium_promo_order",
|
"premium_promo_order",
|
||||||
FallbackOrder());
|
FallbackOrder());*/ AssertIsDebug()
|
||||||
const auto processEntry = [&](Entry &entry) {
|
const auto processEntry = [&](Entry &entry) {
|
||||||
icons.push_back(entry.icon);
|
icons.push_back(entry.icon);
|
||||||
addRow(entry);
|
addRow(entry);
|
||||||
|
|
|
@ -25,6 +25,21 @@ constexpr auto kBodyAnimationPart = 0.90;
|
||||||
constexpr auto kTitleAdditionalScale = 0.15;
|
constexpr auto kTitleAdditionalScale = 0.15;
|
||||||
constexpr auto kMinAcceptableContrast = 4.5; // 1.14;
|
constexpr auto kMinAcceptableContrast = 4.5; // 1.14;
|
||||||
|
|
||||||
|
[[nodiscard]] QImage ScaleTo(QImage image) {
|
||||||
|
using namespace style;
|
||||||
|
const auto size = image.size();
|
||||||
|
const auto scale = DevicePixelRatio() * Scale() / 300.;
|
||||||
|
const auto scaled = QSize(
|
||||||
|
int(base::SafeRound(size.width() * scale)),
|
||||||
|
int(base::SafeRound(size.height() * scale)));
|
||||||
|
image = image.scaled(
|
||||||
|
scaled,
|
||||||
|
Qt::IgnoreAspectRatio,
|
||||||
|
Qt::SmoothTransformation);
|
||||||
|
image.setDevicePixelRatio(DevicePixelRatio());
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
QString Svg() {
|
QString Svg() {
|
||||||
|
@ -157,27 +172,41 @@ TopBar::TopBar(
|
||||||
rpl::producer<TextWithEntities> about,
|
rpl::producer<TextWithEntities> about,
|
||||||
bool light,
|
bool light,
|
||||||
bool optimizeMinistars)
|
bool optimizeMinistars)
|
||||||
|
: TopBar(parent, st, {
|
||||||
|
.clickContextOther = std::move(clickContextOther),
|
||||||
|
.title = std::move(title),
|
||||||
|
.about = std::move(about),
|
||||||
|
.light = light,
|
||||||
|
.optimizeMinistars = optimizeMinistars,
|
||||||
|
}) {
|
||||||
|
}
|
||||||
|
|
||||||
|
TopBar::TopBar(
|
||||||
|
not_null<QWidget*> parent,
|
||||||
|
const style::PremiumCover &st,
|
||||||
|
TopBarDescriptor &&descriptor)
|
||||||
: TopBarAbstract(parent, st)
|
: TopBarAbstract(parent, st)
|
||||||
, _light(light)
|
, _light(descriptor.light)
|
||||||
|
, _logo(descriptor.logo)
|
||||||
, _titleFont(st.titleFont)
|
, _titleFont(st.titleFont)
|
||||||
, _titlePadding(st.titlePadding)
|
, _titlePadding(st.titlePadding)
|
||||||
, _about(this, std::move(about), st.about)
|
, _about(this, std::move(descriptor.about), st.about)
|
||||||
, _ministars(this, optimizeMinistars) {
|
, _ministars(this, descriptor.optimizeMinistars) {
|
||||||
std::move(
|
std::move(
|
||||||
title
|
descriptor.title
|
||||||
) | rpl::start_with_next([=](QString text) {
|
) | rpl::start_with_next([=](QString text) {
|
||||||
_titlePath = QPainterPath();
|
_titlePath = QPainterPath();
|
||||||
_titlePath.addText(0, _titleFont->ascent, _titleFont, text);
|
_titlePath.addText(0, _titleFont->ascent, _titleFont, text);
|
||||||
update();
|
update();
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
if (clickContextOther) {
|
if (const auto other = descriptor.clickContextOther) {
|
||||||
_about->setClickHandlerFilter([=](
|
_about->setClickHandlerFilter([=](
|
||||||
const ClickHandlerPtr &handler,
|
const ClickHandlerPtr &handler,
|
||||||
Qt::MouseButton button) {
|
Qt::MouseButton button) {
|
||||||
ActivateClickHandler(_about, handler, {
|
ActivateClickHandler(_about, handler, {
|
||||||
button,
|
button,
|
||||||
clickContextOther()
|
other()
|
||||||
});
|
});
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
@ -188,7 +217,10 @@ TopBar::TopBar(
|
||||||
) | rpl::start_with_next([=] {
|
) | rpl::start_with_next([=] {
|
||||||
TopBarAbstract::computeIsDark();
|
TopBarAbstract::computeIsDark();
|
||||||
|
|
||||||
if (!_light && !TopBarAbstract::isDark()) {
|
if (_logo == u"dollar"_q) {
|
||||||
|
_dollar = ScaleTo(QImage(u":/gui/art/business_logo.png"_q));
|
||||||
|
_ministars.setColorOverride(st::premiumButtonFg->c);
|
||||||
|
} else if (!_light && !TopBarAbstract::isDark()) {
|
||||||
_star.load(Svg());
|
_star.load(Svg());
|
||||||
_ministars.setColorOverride(st::premiumButtonFg->c);
|
_ministars.setColorOverride(st::premiumButtonFg->c);
|
||||||
} else {
|
} else {
|
||||||
|
@ -232,8 +264,11 @@ rpl::producer<int> TopBar::additionalHeight() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void TopBar::resizeEvent(QResizeEvent *e) {
|
void TopBar::resizeEvent(QResizeEvent *e) {
|
||||||
const auto progress = (e->size().height() - minimumHeight())
|
const auto max = maximumHeight();
|
||||||
/ float64(maximumHeight() - minimumHeight());
|
const auto min = minimumHeight();
|
||||||
|
const auto progress = (max > min)
|
||||||
|
? ((e->size().height() - min) / float64(max - min))
|
||||||
|
: 1.;
|
||||||
_progress.top = 1. -
|
_progress.top = 1. -
|
||||||
std::clamp(
|
std::clamp(
|
||||||
(1. - progress) / kBodyAnimationPart,
|
(1. - progress) / kBodyAnimationPart,
|
||||||
|
@ -291,7 +326,12 @@ void TopBar::paintEvent(QPaintEvent *e) {
|
||||||
}
|
}
|
||||||
p.resetTransform();
|
p.resetTransform();
|
||||||
|
|
||||||
_star.render(&p, _starRect);
|
if (!_dollar.isNull()) {
|
||||||
|
auto hq = PainterHighQualityEnabler(p);
|
||||||
|
p.drawImage(_starRect, _dollar);
|
||||||
|
} else {
|
||||||
|
_star.render(&p, _starRect);
|
||||||
|
}
|
||||||
|
|
||||||
const auto color = _light
|
const auto color = _light
|
||||||
? st::settingsPremiumUserTitle.textFg
|
? st::settingsPremiumUserTitle.textFg
|
||||||
|
|
|
@ -64,6 +64,15 @@ private:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct TopBarDescriptor {
|
||||||
|
Fn<QVariant()> clickContextOther;
|
||||||
|
QString logo;
|
||||||
|
rpl::producer<QString> title;
|
||||||
|
rpl::producer<TextWithEntities> about;
|
||||||
|
bool light = false;
|
||||||
|
bool optimizeMinistars = true;
|
||||||
|
};
|
||||||
|
|
||||||
class TopBar final : public TopBarAbstract {
|
class TopBar final : public TopBarAbstract {
|
||||||
public:
|
public:
|
||||||
TopBar(
|
TopBar(
|
||||||
|
@ -74,6 +83,10 @@ public:
|
||||||
rpl::producer<TextWithEntities> about,
|
rpl::producer<TextWithEntities> about,
|
||||||
bool light = false,
|
bool light = false,
|
||||||
bool optimizeMinistars = true);
|
bool optimizeMinistars = true);
|
||||||
|
TopBar(
|
||||||
|
not_null<QWidget*> parent,
|
||||||
|
const style::PremiumCover &st,
|
||||||
|
TopBarDescriptor &&descriptor);
|
||||||
~TopBar();
|
~TopBar();
|
||||||
|
|
||||||
void setPaused(bool paused) override;
|
void setPaused(bool paused) override;
|
||||||
|
@ -87,11 +100,13 @@ protected:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const bool _light = false;
|
const bool _light = false;
|
||||||
|
const QString _logo;
|
||||||
const style::font &_titleFont;
|
const style::font &_titleFont;
|
||||||
const style::margins &_titlePadding;
|
const style::margins &_titlePadding;
|
||||||
object_ptr<FlatLabel> _about;
|
object_ptr<FlatLabel> _about;
|
||||||
ColoredMiniStars _ministars;
|
ColoredMiniStars _ministars;
|
||||||
QSvgRenderer _star;
|
QSvgRenderer _star;
|
||||||
|
QImage _dollar;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
float64 top = 0.;
|
float64 top = 0.;
|
||||||
|
|
|
@ -137,6 +137,7 @@ menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
|
||||||
menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
|
menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
|
||||||
menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
|
menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
|
||||||
menuIconPremium: icon {{ "menu/premium", menuIconColor }};
|
menuIconPremium: icon {{ "menu/premium", menuIconColor }};
|
||||||
|
menuIconShop: icon {{ "menu/shop", menuIconColor }};
|
||||||
menuIconIpAddress: icon {{ "menu/ip_address", menuIconColor }};
|
menuIconIpAddress: icon {{ "menu/ip_address", menuIconColor }};
|
||||||
menuIconAddress: icon {{ "menu/payment_address", menuIconColor }};
|
menuIconAddress: icon {{ "menu/payment_address", menuIconColor }};
|
||||||
menuIconShowAll: icon {{ "menu/all_media", menuIconColor }};
|
menuIconShowAll: icon {{ "menu/all_media", menuIconColor }};
|
||||||
|
|