diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index dd8719298..a610e0d1f 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -1078,40 +1078,6 @@ ringtonesBoxButton: SettingsButton(defaultSettingsButton) { } ringtonesBoxSkip: 7px; -premiumBubblePadding: margins(14px, 0px, 14px, 0px); -premiumBubblePenWidth: 6; -premiumBubbleHeight: 40px; -premiumBubbleSkip: 8px; -premiumBubbleWidthLimit: 80px; -premiumBubbleTextSkip: 3px; -premiumBubbleSlideDuration: 1000; -premiumBubbleTailSize: size(21px, 7px); -premiumBubbleFont: font(19px); -premiumLineTextSkip: 11px; -premiumInfographicPadding: margins(0px, 10px, 0px, 15px); - -premiumIconChats: icon {{ "limits/chats", settingsIconFg }}; -premiumIconFiles: icon {{ "limits/files", settingsIconFg }}; -premiumIconFolders: icon {{ "limits/folders", settingsIconFg }}; -premiumIconGroups: icon {{ "limits/groups", settingsIconFg }}; -premiumIconLinks: icon {{ "limits/links", settingsIconFg }}; -premiumIconPins: icon {{ "limits/pins", settingsIconFg }}; -premiumIconAccounts: icon {{ "limits/accounts", settingsIconFg }}; - -premiumAccountsCheckbox: RoundImageCheckbox(defaultPeerListCheckbox) { - imageRadius: 27px; - imageSmallRadius: 23px; - check: RoundCheckbox(defaultRoundCheckbox) { - size: 0px; - } -} -premiumAccountsLabelSize: size(22px, 15px); -premiumAccountsLabelPadding: margins(2px, 2px, 2px, 2px); -premiumAccountsLabelRadius: 6; -premiumAccountsNameTop: 13px; -premiumAccountsPadding: margins(0px, 20px, 0px, 14px); -premiumAccountsHeight: 105px; - gradientButtonGlareDuration: 700; gradientButtonGlareTimeout: 2000; gradientButtonGlareWidth: 100px; diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp index 5b8bc827f..cbd5a637a 100644 --- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp +++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp @@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_premium.h" #include "base/unixtime.h" #include "apiwrap.h" +#include "styles/style_premium.h" #include "styles/style_boxes.h" #include "styles/style_layers.h" #include "styles/style_info.h" diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp index 5cf2413ef..1f817f2c9 100644 --- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp @@ -42,7 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_premium.h" #include "apiwrap.h" #include "styles/style_layers.h" -#include "styles/style_chat_helpers.h" +#include "styles/style_premium.h" #include "styles/style_settings.h" #include diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 7aa4832d4..84516b7fd 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -279,55 +279,4 @@ manageEmojiStatusTop: 25px; inlineRadialSize: 44px; inlineFileSize: 44px; -premiumPreviewBox: Box(defaultBox) { - buttonPadding: margins(18px, 18px, 18px, 18px); - buttonHeight: 44px; - button: RoundButton(defaultActiveButton) { - height: 44px; - textTop: 12px; - font: font(13px semibold); - } -} -premiumPreviewDoubledLimitsBox: Box(premiumPreviewBox) { - buttonPadding: margins(12px, 12px, 12px, 12px); -} -premiumPreviewAboutTitlePadding: margins(18px, 19px, 18px, 0px); -premiumPreviewAboutTitle: FlatLabel(defaultFlatLabel) { - minWidth: 240px; - textFg: windowBoldFg; - align: align(top); - style: TextStyle(defaultTextStyle) { - font: font(17px semibold); - linkFont: font(17px semibold); - linkFontOver: font(17px semibold); - } -} -premiumPreviewAbout: FlatLabel(defaultFlatLabel) { - minWidth: 240px; - textFg: membersAboutLimitFg; - align: align(top); -} -premiumPreviewAboutPadding: margins(18px, 8px, 18px, 8px); -premiumPreviewButtonLabel: FlatLabel(defaultFlatLabel) { - textFg: premiumButtonFg; - style: semiboldTextStyle; -} -premiumSlideDuration: 200; -premiumVideoStarSize: size(77px, 73px); - stickersPremiumLock: icon{{ "emoji/premium_lock", premiumButtonFg }}; - -premiumPreviewHeight: 312px; - -premiumReactionWidthSkip: 64px; -premiumReactionHeightSkip: 75px; -premiumReactionSize: 108px; -premiumReactionAround: 164px; -premiumReactionsMiddle: 148px; -premiumReactionScale: 0.70; -premiumReactionInfoTop: 260px; - -premiumDot: 6px; -premiumDotPadding: margins(4px, 4px, 4px, 4px); -premiumDotsMargin: margins(0px, 5px, 0px, 6px); -premiumVideoWidth: 182px; diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 42ccac1f5..44d8734be 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -40,7 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "api/api_premium.h" #include "styles/style_boxes.h" -#include "styles/style_chat_helpers.h" +#include "styles/style_premium.h" #include "styles/style_info.h" #include "styles/style_intro.h" #include "styles/style_layers.h" diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style new file mode 100644 index 000000000..60424da01 --- /dev/null +++ b/Telegram/SourceFiles/ui/effects/premium.style @@ -0,0 +1,97 @@ +/* +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 +*/ +using "ui/basic.style"; +using "ui/widgets/widgets.style"; + +// Preview. +premiumPreviewBox: Box(defaultBox) { + buttonPadding: margins(18px, 18px, 18px, 18px); + buttonHeight: 44px; + button: RoundButton(defaultActiveButton) { + height: 44px; + textTop: 12px; + font: font(13px semibold); + } +} +premiumPreviewDoubledLimitsBox: Box(premiumPreviewBox) { + buttonPadding: margins(12px, 12px, 12px, 12px); +} +premiumPreviewAboutTitlePadding: margins(18px, 19px, 18px, 0px); +premiumPreviewAboutTitle: FlatLabel(defaultFlatLabel) { + minWidth: 240px; + textFg: windowBoldFg; + align: align(top); + style: TextStyle(defaultTextStyle) { + font: font(17px semibold); + linkFont: font(17px semibold); + linkFontOver: font(17px semibold); + } +} +premiumPreviewAbout: FlatLabel(defaultFlatLabel) { + minWidth: 240px; + textFg: membersAboutLimitFg; + align: align(top); +} +premiumPreviewAboutPadding: margins(18px, 8px, 18px, 8px); +premiumPreviewButtonLabel: FlatLabel(defaultFlatLabel) { + textFg: premiumButtonFg; + style: semiboldTextStyle; +} +premiumSlideDuration: 200; +premiumVideoStarSize: size(77px, 73px); + +premiumPreviewHeight: 312px; + +premiumReactionWidthSkip: 64px; +premiumReactionHeightSkip: 75px; +premiumReactionSize: 108px; +premiumReactionAround: 164px; +premiumReactionsMiddle: 148px; +premiumReactionScale: 0.70; +premiumReactionInfoTop: 260px; + +premiumDot: 6px; +premiumDotPadding: margins(4px, 4px, 4px, 4px); +premiumDotsMargin: margins(0px, 5px, 0px, 6px); +premiumVideoWidth: 182px; + +// Graphics. + +premiumBubblePadding: margins(14px, 0px, 14px, 0px); +premiumBubblePenWidth: 6; +premiumBubbleHeight: 40px; +premiumBubbleSkip: 8px; +premiumBubbleWidthLimit: 80px; +premiumBubbleTextSkip: 3px; +premiumBubbleSlideDuration: 1000; +premiumBubbleTailSize: size(21px, 7px); +premiumBubbleFont: font(19px); +premiumLineTextSkip: 11px; +premiumInfographicPadding: margins(0px, 10px, 0px, 15px); + +premiumIconChats: icon {{ "limits/chats", settingsIconFg }}; +premiumIconFiles: icon {{ "limits/files", settingsIconFg }}; +premiumIconFolders: icon {{ "limits/folders", settingsIconFg }}; +premiumIconGroups: icon {{ "limits/groups", settingsIconFg }}; +premiumIconLinks: icon {{ "limits/links", settingsIconFg }}; +premiumIconPins: icon {{ "limits/pins", settingsIconFg }}; +premiumIconAccounts: icon {{ "limits/accounts", settingsIconFg }}; + +premiumAccountsCheckbox: RoundImageCheckbox(defaultPeerListCheckbox) { + imageRadius: 27px; + imageSmallRadius: 23px; + check: RoundCheckbox(defaultRoundCheckbox) { + size: 0px; + } +} +premiumAccountsLabelSize: size(22px, 15px); +premiumAccountsLabelPadding: margins(2px, 2px, 2px, 2px); +premiumAccountsLabelRadius: 6; +premiumAccountsNameTop: 13px; +premiumAccountsPadding: margins(0px, 20px, 0px, 14px); +premiumAccountsHeight: 105px; diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp index f590ba877..2a0db7c55 100644 --- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp +++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp @@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/checkbox.h" #include "ui/wrap/padding_wrap.h" #include "ui/wrap/vertical_layout.h" +#include "styles/style_premium.h" #include "styles/style_boxes.h" #include "styles/style_settings.h" #include "styles/style_layers.h" diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index 8813ecd3c..9724f709a 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -16,6 +16,7 @@ set(style_files ui/filter_icons.style ui/menu_icons.style ui/chat/chat.style + ui/effects/premium.style boxes/boxes.style dialogs/dialogs.style chat_helpers/chat_helpers.style