diff --git a/Telegram/Resources/icons/boosts/boost_unclaimed.png b/Telegram/Resources/icons/boosts/boost_unclaimed.png new file mode 100644 index 000000000..fb093176f Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unclaimed.png differ diff --git a/Telegram/Resources/icons/boosts/boost_unclaimed@2x.png b/Telegram/Resources/icons/boosts/boost_unclaimed@2x.png new file mode 100644 index 000000000..30d5bd6bc Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unclaimed@2x.png differ diff --git a/Telegram/Resources/icons/boosts/boost_unclaimed@3x.png b/Telegram/Resources/icons/boosts/boost_unclaimed@3x.png new file mode 100644 index 000000000..f63cca1c9 Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unclaimed@3x.png differ diff --git a/Telegram/Resources/icons/boosts/boost_unknown.png b/Telegram/Resources/icons/boosts/boost_unknown.png new file mode 100644 index 000000000..78f642852 Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unknown.png differ diff --git a/Telegram/Resources/icons/boosts/boost_unknown@2x.png b/Telegram/Resources/icons/boosts/boost_unknown@2x.png new file mode 100644 index 000000000..ad22dc971 Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unknown@2x.png differ diff --git a/Telegram/Resources/icons/boosts/boost_unknown@3x.png b/Telegram/Resources/icons/boosts/boost_unknown@3x.png new file mode 100644 index 000000000..bbf4532a2 Binary files /dev/null and b/Telegram/Resources/icons/boosts/boost_unknown@3x.png differ diff --git a/Telegram/Resources/icons/boosts/mini_gift.png b/Telegram/Resources/icons/boosts/mini_gift.png new file mode 100644 index 000000000..1008e5124 Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_gift.png differ diff --git a/Telegram/Resources/icons/boosts/mini_gift@2x.png b/Telegram/Resources/icons/boosts/mini_gift@2x.png new file mode 100644 index 000000000..462d38764 Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_gift@2x.png differ diff --git a/Telegram/Resources/icons/boosts/mini_gift@3x.png b/Telegram/Resources/icons/boosts/mini_gift@3x.png new file mode 100644 index 000000000..8858b4fff Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_gift@3x.png differ diff --git a/Telegram/Resources/icons/boosts/mini_giveaway.png b/Telegram/Resources/icons/boosts/mini_giveaway.png new file mode 100644 index 000000000..79ffc0f1d Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_giveaway.png differ diff --git a/Telegram/Resources/icons/boosts/mini_giveaway@2x.png b/Telegram/Resources/icons/boosts/mini_giveaway@2x.png new file mode 100644 index 000000000..bb5e94a65 Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_giveaway@2x.png differ diff --git a/Telegram/Resources/icons/boosts/mini_giveaway@3x.png b/Telegram/Resources/icons/boosts/mini_giveaway@3x.png new file mode 100644 index 000000000..c9f853452 Binary files /dev/null and b/Telegram/Resources/icons/boosts/mini_giveaway@3x.png differ diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp index 494df7a99..7de9f4908 100644 --- a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp +++ b/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp @@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_common.h" #include "statistics/widgets/chart_header_widget.h" #include "ui/boxes/boost_box.h" -#include "ui/controls/invite_link_buttons.h" #include "ui/controls/invite_link_label.h" #include "ui/rect.h" #include "ui/widgets/buttons.h" @@ -181,8 +180,35 @@ void FillShareLink( ) | rpl::start_with_next(copyLink, label->lifetime()); const auto copyShareWrap = content->add( object_ptr(content)); - Ui::AddCopyShareLinkButtons(copyShareWrap, copyLink, shareLink); - copyShareWrap->widgetAt(0)->showChildren(); + { + const auto wrap = content->add( + object_ptr( + content, + st::inviteLinkButton.height), + st::inviteLinkButtonsPadding); + const auto copy = CreateChild( + wrap, + tr::lng_group_invite_context_copy(), + st::inviteLinkCopy); + copy->setTextTransform(Ui::RoundButton::TextTransform::NoTransform); + copy->setClickedCallback(copyLink); + const auto share = CreateChild( + wrap, + tr::lng_group_invite_context_share(), + st::inviteLinkShare); + share->setTextTransform(Ui::RoundButton::TextTransform::NoTransform); + share->setClickedCallback(shareLink); + + wrap->widthValue( + ) | rpl::start_with_next([=](int width) { + const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2; + copy->setFullWidth(buttonWidth); + share->setFullWidth(buttonWidth); + copy->moveToLeft(0, 0, width); + share->moveToRight(0, 0, width); + }, wrap->lifetime()); + wrap->showChildren(); + } ::Settings::AddSkip(content, st::boostsLinkFieldPadding.bottom()); } @@ -366,6 +392,7 @@ void InnerWidget::fill() { ::Settings::AddDividerText(inner, tr::lng_boosts_list_subtext()); } + ::Settings::AddSkip(inner); ::Settings::AddSkip(inner); AddHeader(inner, tr::lng_boosts_link_title); ::Settings::AddSkip(inner, st::boostsLinkSkip); diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp index 6d8c4307e..43606f195 100644 --- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp +++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp @@ -476,6 +476,11 @@ PaintRoundImageCallback BoostRow::generatePaintUserpicCallback(bool force) { } return [=](Painter &p, int x, int y, int outerWidth, int size) mutable { _userpic.paintCircle(p, x, y, outerWidth, size); + (_boost.isUnclaimed + ? st::boostsListUnclaimedIcon + : st::boostsListUnknownIcon).paintInCenter( + p, + { x, y, size, size }); }; } diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style index 036fb16e5..8fce0f2b9 100644 --- a/Telegram/SourceFiles/statistics/statistics.style +++ b/Telegram/SourceFiles/statistics/statistics.style @@ -159,9 +159,11 @@ boostsListBadgeHeight: 16px; boostsListRightBadgeTextStyle: TextStyle(defaultTextStyle) { font: font(12px semibold); } -boostsListRightBadgeTextPadding: margins(16px, 1px, 6px, 0px); -boostsListRightBadgePadding: margins(4px, 5px, 8px, 0px); +boostsListRightBadgeTextPadding: margins(22px, 1px, 8px, 0px); +boostsListRightBadgePadding: margins(4px, 5px, 12px, 0px); boostsListRightBadgeHeight: 20px; -boostsListGiftMiniIconPadding: margins(1px, 2px, 0px, 0px); -boostsListGiftMiniIcon: icon{{ "boosts/boost_mini2", historyPeer8UserpicBg2 }}; -boostsListGiveawayMiniIcon: icon{{ "boosts/boost_mini2", historyPeer4UserpicBg2 }}; +boostsListGiftMiniIconPadding: margins(4px, 2px, 0px, 0px); +boostsListGiftMiniIcon: icon{{ "boosts/mini_gift", historyPeer8UserpicBg2 }}; +boostsListGiveawayMiniIcon: icon{{ "boosts/mini_giveaway", historyPeer4UserpicBg2 }}; +boostsListUnclaimedIcon: icon{{ "boosts/boost_unknown", premiumButtonFg }}; +boostsListUnknownIcon: icon{{ "boosts/boost_unclaimed", premiumButtonFg }};