From 2795af8c7fd87e056efbe2805b796a44a94f9741 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 1 Apr 2024 05:55:59 +0300 Subject: [PATCH] Slightly improved style of channel earn info section. --- .../earn/channel_earn.style | 5 +++++ .../earn/info_earn_inner_widget.cpp | 20 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style index 3c20cedbf..01b72005a 100644 --- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style +++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ using "ui/basic.style"; using "boxes/boxes.style"; +using "statistics/statistics.style"; channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px); @@ -34,6 +35,10 @@ channelEarnSemiboldLabel: FlatLabel(channelEarnOverviewMajorLabel) { style: TextStyle(semiboldTextStyle) { } } +channelEarnHeaderLabel: FlatLabel(channelEarnOverviewMajorLabel) { + style: TextStyle(statisticsHeaderTitleTextStyle) { + } +} channelEarnHistorySubLabel: FlatLabel(channelEarnOverviewSubMinorLabel) { style: TextStyle(defaultTextStyle) { font: font(12px); diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp index 2d922d344..89606a2e3 100644 --- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp @@ -124,7 +124,7 @@ void AddHeader( object_ptr( content, text(), - st::channelEarnSemiboldLabel), + st::channelEarnHeaderLabel), st::boxRowPadding); header->resizeToWidth(header->width()); } @@ -515,11 +515,13 @@ void InnerWidget::fill() { widget->setChartData(chart, Type::StackBar); widget->setTitle(tr::lng_channel_earn_chart_revenue()); } + } + if (data.topHoursGraph.chart || data.revenueGraph.chart) { + Ui::AddSkip(container); + Ui::AddSkip(container); + Ui::AddDivider(container); Ui::AddSkip(container); } - Ui::AddSkip(container); - Ui::AddDivider(container); - Ui::AddSkip(container); { AddHeader(container, tr::lng_channel_earn_overview_title); Ui::AddSkip(container, st::channelEarnOverviewTitleSkip); @@ -540,7 +542,7 @@ void InnerWidget::fill() { st::channelEarnOverviewMinorLabel); const auto secondMinorLabel = Ui::CreateChild( line, - ToUsd(value, multiplier), + value ? ToUsd(value, multiplier) : QString(), st::channelEarnOverviewSubMinorLabel); rpl::combine( line->widthValue(), @@ -688,7 +690,7 @@ void InnerWidget::fill() { : tr::lng_channel_earn_balance_about_temp); Ui::AddSkip(container); } - { + if (!data.firstHistorySlice.list.empty()) { AddHeader(container, tr::lng_channel_earn_history_title); Ui::AddSkip(container); @@ -995,10 +997,10 @@ void InnerWidget::fill() { } }); } + Ui::AddSkip(container); + Ui::AddDivider(container); + Ui::AddSkip(container); } - Ui::AddSkip(container); - Ui::AddDivider(container); - Ui::AddSkip(container); if (channel) { constexpr auto kMaxCPM = 50; // Debug. const auto requiredLevel = Data::LevelLimits(session)