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

Moved formatting of dialog last date to td_ui.

Browse source
This commit is contained in:
23rd 2024-05-02 01:44:52 +03:00
parent 47800ee02d
commit 26e8c29f40
3 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
View file

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_window.h" #include "styles/style_window.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "ui/empty_userpic.h" #include "ui/empty_userpic.h"
#include "ui/text/format_values.h"
#include "ui/text/text_options.h" #include "ui/text/text_options.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
#include "ui/unread_badge.h" #include "ui/unread_badge.h"
@ -44,8 +45,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Dialogs::Ui { namespace Dialogs::Ui {
namespace { namespace {
// Show all dates that are in the last 20 hours in time format.
constexpr int kRecentlyInSeconds = 20 * 3600;
const auto kPsaBadgePrefix = "cloud_lng_badge_psa_"; const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
[[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) { [[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) {
@ -81,29 +80,6 @@ void PaintRowTopRight(
text); text);
} }
void PaintRowDate(
QPainter &p,
QDateTime date,
QRect &rectForName,
const PaintContext &context) {
const auto now = QDateTime::currentDateTime();
const auto &lastTime = date;
const auto nowDate = now.date();
const auto lastDate = lastTime.date();
const auto dt = [&] {
if ((lastDate == nowDate)
|| (qAbs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
} else if (qAbs(lastDate.daysTo(nowDate)) < 7) {
return langDayOfWeek(lastDate);
} else {
return QLocale().toString(lastDate, QLocale::ShortFormat);
}
}();
PaintRowTopRight(p, dt, rectForName, context);
}
int PaintBadges( int PaintBadges(
QPainter &p, QPainter &p,
const PaintContext &context, const PaintContext &context,
@ -444,7 +420,8 @@ void PaintRow(
|| (supportMode || (supportMode
&& entry->session().supportHelper().isOccupiedBySomeone(history))) { && entry->session().supportHelper().isOccupiedBySomeone(history))) {
if (!promoted) { if (!promoted) {
PaintRowDate(p, date, rectForName, context); const auto dateString = Ui::FormatDialogsDate(date);
PaintRowTopRight(p, dateString, rectForName, context);
} }
auto availableWidth = namewidth; auto availableWidth = namewidth;
@ -566,7 +543,8 @@ void PaintRow(
} }
} else if (!item->isEmpty()) { } else if (!item->isEmpty()) {
if ((thread || sublist) && !promoted) { if ((thread || sublist) && !promoted) {
PaintRowDate(p, date, rectForName, context); const auto dateString = Ui::FormatDialogsDate(date);
PaintRowTopRight(p, dateString, rectForName, context);
} }
paintItemCallback(nameleft, namewidth); paintItemCallback(nameleft, namewidth);

18
Telegram/SourceFiles/ui/text/format_values.cpp
View file

@ -484,4 +484,22 @@ QString FormatResetCloudPasswordIn(float64 sec) {
return (sec >= 3600) ? FormatTTL(sec) : FormatDurationText(sec); return (sec >= 3600) ? FormatTTL(sec) : FormatDurationText(sec);
} }
QString FormatDialogsDate(const QDateTime &lastTime) {
// Show all dates that are in the last 20 hours in time format.
constexpr int kRecentlyInSeconds = 20 * 3600;
const auto now = QDateTime::currentDateTime();
const auto nowDate = now.date();
const auto lastDate = lastTime.date();
if ((lastDate == nowDate)
|| (std::abs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
} else if (std::abs(lastDate.daysTo(nowDate)) < 7) {
return langDayOfWeek(lastDate);
} else {
return QLocale().toString(lastDate, QLocale::ShortFormat);
}
}
} // namespace Ui } // namespace Ui

1
Telegram/SourceFiles/ui/text/format_values.h
View file

@ -31,6 +31,7 @@ inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL;
[[nodiscard]] QString FormatMuteFor(float64 sec); [[nodiscard]] QString FormatMuteFor(float64 sec);
[[nodiscard]] QString FormatMuteForTiny(float64 sec); [[nodiscard]] QString FormatMuteForTiny(float64 sec);
[[nodiscard]] QString FormatResetCloudPasswordIn(float64 sec); [[nodiscard]] QString FormatResetCloudPasswordIn(float64 sec);
[[nodiscard]] QString FormatDialogsDate(const QDateTime &lastTime);
struct CurrencyRule { struct CurrencyRule {
const char *international = ""; const char *international = "";