void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added line with converted currency amount to point details widget.

Browse source
This commit is contained in:
23rd 2024-04-01 01:44:33 +03:00 • committed by John Preston
parent d3cd3bb0a4
commit 5dd974f2ab
4 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View file

@ -5017,6 +5017,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_channel_earn_learn_close" = "Got it"; "lng_channel_earn_learn_close" = "Got it";
"lng_channel_earn_chart_top_hours" = "Ad impressions"; "lng_channel_earn_chart_top_hours" = "Ad impressions";
"lng_channel_earn_chart_revenue" = "Ad revenue"; "lng_channel_earn_chart_revenue" = "Ad revenue";
"lng_channel_earn_chart_overriden_detail_currency" = "Revenue in TON";
"lng_channel_earn_chart_overriden_detail_usd" = "Revenue in USD";
"lng_contact_add" = "Add"; "lng_contact_add" = "Add";
"lng_contact_send_message" = "message"; "lng_contact_send_message" = "message";

2
Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
View file

@ -430,7 +430,7 @@ void InnerWidget::fill() {
object_ptr<Statistic::ChartWidget>(container), object_ptr<Statistic::ChartWidget>(container),
st::statisticsLayerMargins); st::statisticsLayerMargins);
widget->setChartData(data.topHoursGraph.chart, Type::Linear); widget->setChartData(data.topHoursGraph.chart, Type::Bar);
widget->setTitle(tr::lng_channel_earn_chart_top_hours()); widget->setTitle(tr::lng_channel_earn_chart_top_hours());
} }
if (data.revenueGraph.chart) { if (data.revenueGraph.chart) {

2
Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
View file

@ -42,7 +42,7 @@ void ChartRulersView::setChartData(
return FormatF(value / float64(Data::kEarnMultiplier)); return FormatF(value / float64(Data::kEarnMultiplier));
}; };
_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) { _rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
return Info::ChannelEarn::ToUsd(v, rate).mid(1); return Info::ChannelEarn::ToUsd(v, rate);
}; };
_rightPen = QPen(st::windowSubTextFg); _rightPen = QPen(st::windowSubTextFg);
} }

31
Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
View file

@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "statistics/widgets/point_details_widget.h" #include "statistics/widgets/point_details_widget.h"
#include "data/data_channel_earn.h" // Data::kEarnMultiplier. #include "data/data_channel_earn.h" // Data::kEarnMultiplier.
#include "info/channel_statistics/earn/earn_format.h"
#include "lang/lang_keys.h"
#include "statistics/statistics_common.h" #include "statistics/statistics_common.h"
#include "statistics/statistics_format_values.h" #include "statistics/statistics_format_values.h"
#include "statistics/view/stack_linear_chart_common.h" #include "statistics/view/stack_linear_chart_common.h"
@ -237,7 +239,7 @@ void PointDetailsWidget::setLineAlpha(int lineId, float64 alpha) {
void PointDetailsWidget::resizeHeight() { void PointDetailsWidget::resizeHeight() {
resize( resize(
width(), width(),
lineYAt(_chartData.lines.size()) lineYAt(_chartData.lines.size() + (_chartData.currencyRate ? 1 : 0))
+ st::statisticsDetailsPopupMargins.bottom()); + st::statisticsDetailsPopupMargins.bottom());
} }
@ -282,11 +284,30 @@ void PointDetailsWidget::setXIndex(int xIndex) {
textLine.name.setText(_textStyle, dataLine.name); textLine.name.setText(_textStyle, dataLine.name);
textLine.value.setText( textLine.value.setText(
_textStyle, _textStyle,
_chartData.currencyRate QString("%L1").arg(dataLine.y[xIndex]));
? QString::number(dataLine.y[xIndex] / multiplier)
: QString("%L1").arg(dataLine.y[xIndex]));
hasPositiveValues |= (dataLine.y[xIndex] > 0); hasPositiveValues |= (dataLine.y[xIndex] > 0);
textLine.valueColor = QColor(dataLine.color); textLine.valueColor = QColor(dataLine.color);
if (_chartData.currencyRate) {
auto copy = Line();
copy.id = dataLine.id * 100;
copy.valueColor = QColor(dataLine.color);
copy.name.setText(
_textStyle,
tr::lng_channel_earn_chart_overriden_detail_currency(
tr::now));
copy.value.setText(
_textStyle,
QString::number(dataLine.y[xIndex] / multiplier));
_lines.push_back(std::move(copy));
textLine.name.setText(
_textStyle,
tr::lng_channel_earn_chart_overriden_detail_usd(tr::now));
textLine.value.setText(
_textStyle,
Info::ChannelEarn::ToUsd(
dataLine.y[xIndex],
_chartData.currencyRate));
}
_lines.push_back(std::move(textLine)); _lines.push_back(std::move(textLine));
} }
const auto clickable = _zoomEnabled && hasPositiveValues; const auto clickable = _zoomEnabled && hasPositiveValues;
@ -387,7 +408,7 @@ void PointDetailsWidget::paintEvent(QPaintEvent *e) {
.outerWidth = _textRect.width(), .outerWidth = _textRect.width(),
.availableWidth = valueWidth, .availableWidth = valueWidth,
}; };
if (_valueIcon) { if (!i && _valueIcon) {
_valueIcon->paint( _valueIcon->paint(
p, p,
valueContext.position.x() - _valueIcon->width(), valueContext.position.x() - _valueIcon->width(),