RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve group appearance box design.

This commit is contained in:
John Preston 2024-02-18 00:25:40 +04:00
parent d4ee45f9ff
commit 89c7147fd9
9 changed files with 124 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Telegram/Resources/animations/palette.tgs Normal file
View File

Binary file not shown.

1
Telegram/Resources/langs/lang.strings
View File

@ -2157,6 +2157,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_boost_channel_button" = "Boost Channel";
"lng_boost_group_button" = "Boost Group";
"lng_boost_again_button" = "Boost Again";
"lng_boost_group_about" = "Boost your group to unlock additional\nappearance settings.";
"lng_boost_level#one" = "Level {count}";
"lng_boost_level#other" = "Level {count}";
"lng_boost_level_unlocks#one" = "Level {count} Unlocks:";

1
Telegram/Resources/qrc/telegram/animations.qrc
View File

@ -13,5 +13,6 @@
<file alias="stats.tgs">../../animations/stats.tgs</file>
<file alias="voice_ttl_idle.tgs">../../animations/voice_ttl_idle.tgs</file>
<file alias="voice_ttl_start.tgs">../../animations/voice_ttl_start.tgs</file>
<file alias="palette.tgs">../../animations/palette.tgs</file>
</qresource>
</RCC>

99
Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
View File

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "info/profile/info_profile_emoji_status_panel.h"
#include "info/info_memento.h"
#include "lang/lang_keys.h"
#include "lottie/lottie_icon.h"
#include "main/main_account.h"
#include "main/main_app_config.h"
#include "main/main_session.h"
@ -686,7 +687,7 @@ int ColorSelector::resizeGetHeight(int newWidth) {
rpl::producer<uint8> colorIndexValue,
rpl::producer<DocumentId> emojiIdValue,
Fn<void(DocumentId)> emojiIdChosen) {
const auto &basicSt = st::settingsButtonNoIcon;
const auto &basicSt = st::peerAppearanceButton;
const auto ratio = style::DevicePixelRatio();
const auto added = st::normalFont->spacew;
const auto emojiSize = Data::FrameSizeFromTag({}) / ratio;
@ -698,10 +699,11 @@ int ColorSelector::resizeGetHeight(int newWidth) {
const auto st = parent->lifetime().make_state<style::SettingsButton>(
basicSt);
st->padding.setRight(rightPadding);
auto result = object_ptr<Ui::SettingsButton>(
auto result = Settings::CreateButtonWithIcon(
parent,
tr::lng_settings_color_emoji(),
*st);
*st,
{ &st::menuBlueIconColorNames });
const auto raw = result.data();
const auto right = Ui::CreateChild<Ui::RpWidget>(raw);
@ -802,7 +804,7 @@ int ColorSelector::resizeGetHeight(int newWidth) {
rpl::producer<DocumentId> statusIdValue,
Fn<void(DocumentId,TimeId)> statusIdChosen,
bool group) {
const auto &basicSt = st::settingsButtonNoIcon;
const auto &basicSt = st::peerAppearanceButton;
const auto ratio = style::DevicePixelRatio();
const auto added = st::normalFont->spacew;
const auto emojiSize = Data::FrameSizeFromTag({}) / ratio;
@ -814,12 +816,13 @@ int ColorSelector::resizeGetHeight(int newWidth) {
const auto st = parent->lifetime().make_state<style::SettingsButton>(
basicSt);
st->padding.setRight(rightPadding);
auto result = object_ptr<Ui::SettingsButton>(
auto result = Settings::CreateButtonWithIcon(
parent,
(group
? tr::lng_edit_channel_status_group()
: tr::lng_edit_channel_status()),
*st);
*st,
{ &st::menuBlueIconEmojiStatus });
const auto raw = result.data();
const auto right = Ui::CreateChild<Ui::RpWidget>(raw);
@ -931,7 +934,38 @@ void EditPeerColorBox(
state->emojiId = peer->backgroundEmojiId();
state->statusId = peer->emojiStatusId();
if (!group) {
if (group) {
const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(
box.get());
const auto verticalLayout = box->verticalLayout()->add(
object_ptr<Ui::VerticalLayout>(box.get()));
auto icon = CreateLottieIcon(
verticalLayout,
{
.name = u"palette"_q,
.sizeOverride = {
st::settingsCloudPasswordIconSize,
st::settingsCloudPasswordIconSize,
},
},
st::peerAppearanceIconPadding);
box->setShowFinishedCallback([animate = std::move(icon.animate)] {
animate(anim::repeat::once);
});
verticalLayout->add(std::move(icon.widget));
verticalLayout->add(
object_ptr<Ui::FlatLabel>(
verticalLayout,
tr::lng_boost_group_about(),
st::peerAppearanceCoverLabel),
st::peerAppearanceCoverLabelMargin);
verticalLayout->geometryValue(
) | rpl::start_with_next([=](const QRect &r) {
divider->setGeometry(r);
}, divider->lifetime());
} else {
box->addRow(object_ptr<PreviewWrap>(
box,
style,
@ -953,9 +987,12 @@ void EditPeerColorBox(
[=](uint8 index) { state->index = index; }),
{ margin, skip, margin, skip });
Ui::AddDividerText(container, peer->isSelf()
? tr::lng_settings_color_about()
: tr::lng_settings_color_about_channel());
Ui::AddDividerText(
container,
(peer->isSelf()
? tr::lng_settings_color_about()
: tr::lng_settings_color_about_channel()),
st::peerAppearanceDividerTextMargin);
Ui::AddSkip(container, st::settingsColorSampleSkip);
@ -968,19 +1005,23 @@ void EditPeerColorBox(
[=](DocumentId id) { state->emojiId = id; }));
Ui::AddSkip(container, st::settingsColorSampleSkip);
Ui::AddDividerText(container, peer->isSelf()
? tr::lng_settings_color_emoji_about()
: tr::lng_settings_color_emoji_about_channel());
Ui::AddDividerText(
container,
(peer->isSelf()
? tr::lng_settings_color_emoji_about()
: tr::lng_settings_color_emoji_about_channel()),
st::peerAppearanceDividerTextMargin);
}
if (const auto channel = peer->asChannel()) {
Ui::AddSkip(container, st::settingsColorSampleSkip);
container->add(object_ptr<Ui::SettingsButton>(
Settings::AddButtonWithIcon(
container,
(group
? tr::lng_edit_channel_wallpaper_group()
: tr::lng_edit_channel_wallpaper()),
st::settingsButtonNoIcon)
st::peerAppearanceButton,
{ &st::menuBlueIconWallpaper }
)->setClickedCallback([=] {
const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
if (const auto strong = show->resolveWindow(usage)) {
@ -989,24 +1030,31 @@ void EditPeerColorBox(
});
Ui::AddSkip(container, st::settingsColorSampleSkip);
Ui::AddDividerText(container, group
? tr::lng_edit_channel_wallpaper_about_group()
: tr::lng_edit_channel_wallpaper_about());
Ui::AddDividerText(
container,
(group
? tr::lng_edit_channel_wallpaper_about_group()
: tr::lng_edit_channel_wallpaper_about()),
st::peerAppearanceDividerTextMargin);
if (group) {
Ui::AddSkip(container, st::settingsColorSampleSkip);
container->add(object_ptr<Ui::SettingsButton>(
Settings::AddButtonWithIcon(
container,
tr::lng_group_emoji(),
st::settingsButtonNoIcon)
st::peerAppearanceButton,
{ &st::menuBlueIconEmojiPack }
)->setClickedCallback([=] {
const auto isEmoji = true;
show->showBox(Box<StickersBox>(show, channel, isEmoji));
});
Ui::AddSkip(container, st::settingsColorSampleSkip);
Ui::AddDividerText(container, tr::lng_group_emoji_description());
Ui::AddDividerText(
container,
tr::lng_group_emoji_description(),
st::peerAppearanceDividerTextMargin);
}
// Preload exceptions list.
@ -1032,9 +1080,12 @@ void EditPeerColorBox(
group));
Ui::AddSkip(container, st::settingsColorSampleSkip);
Ui::AddDividerText(container, group
? tr::lng_edit_channel_status_about_group()
: tr::lng_edit_channel_status_about());
Ui::AddDividerText(
container,
(group
? tr::lng_edit_channel_status_about_group()
: tr::lng_edit_channel_status_about()),
st::peerAppearanceDividerTextMargin);
}
box->addButton(tr::lng_settings_apply(), [=] {

15
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -84,6 +84,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_chat.h"
#include "styles/style_menu_icons.h"
#include "chat_helpers/stickers_emoji_pack.h"
#include <QtGui/QClipboard>
#include <QtWidgets/QApplication>
#include <QtCore/QMimeData>
@ -2320,6 +2322,19 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
? reinterpret_cast<DocumentData*>(
link->property(kDocumentLinkMediaProperty).toULongLong())
: nullptr;
if (const auto media = _dragStateItem->media()) {
if (const auto document = media->document()) {
addDocumentActions(document, _dragStateItem);
}
}
if (_dragStateItem) {
if (const auto emoji = _dragStateItem->mainView()->isolatedEmoji()) {
const auto emojiStickers = &_dragStateItem->history()->session().emojiStickersPack();
if (const auto sticker = emojiStickers->stickerForEmoji(emoji)) {
addDocumentActions(sticker.document, _dragStateItem);
}
}
}
if (lnkPhoto || lnkDocument) {
const auto item = _dragStateItem;
const auto itemId = item ? item->fullId() : FullMsgId();

11
Telegram/SourceFiles/settings/settings.style
View File

@ -574,3 +574,14 @@ messagePrivacySubscribe: SettingsButton(settingsButtonLight) {
iconLeft: 20px;
}
messagePrivacyLock: icon {{ "info/info_rights_lock", checkboxFg }};
peerAppearanceButton: SettingsButton(settingsButtonLight) {
padding: margins(60px, 8px, 22px, 8px);
iconLeft: 20px;
}
peerAppearanceCoverLabel: FlatLabel(boxDividerLabel) {
align: align(top);
}
peerAppearanceCoverLabelMargin: margins(22px, 0px, 22px, 17px);
peerAppearanceIconPadding: margins(0px, 15px, 0px, 5px);
peerAppearanceDividerTextMargin: margins(22px, 8px, 22px, 11px);

4
Telegram/SourceFiles/ui/menu_icons.style
View File

@ -160,6 +160,10 @@ menuIconMuteForAnyTextFont: font(8px semibold);
menuBlueIconPhotoSet: icon {{ "menu/photo_set", lightButtonFg }};
menuBlueIconPremium: icon{{ "menu/premium", lightButtonFg }};
menuBlueIconColorNames: icon{{ "settings/premium/features/feature_color_names", lightButtonFg }};
menuBlueIconWallpaper: icon{{ "settings/premium/features/feature_wallpaper", lightButtonFg }};
menuBlueIconEmojiStatus: icon{{ "settings/premium/features/feature_status", lightButtonFg }};
menuBlueIconEmojiPack: icon{{ "settings/premium/features/feature_emoji_pack", lightButtonFg }};
mediaMenuIconStickers: icon {{ "menu/stickers", mediaviewMenuFg }};
mediaMenuIconCancel: icon {{ "menu/cancel", mediaviewMenuFg }};

13
Telegram/SourceFiles/ui/vertical_list.cpp
View File

@ -30,20 +30,25 @@ void AddDivider(not_null<Ui::VerticalLayout*> container) {
void AddDividerText(
not_null<Ui::VerticalLayout*> container,
rpl::producer<QString> text) {
AddDividerText(container, std::move(text) | Ui::Text::ToWithEntities());
rpl::producer<QString> text,
const style::margins &margins) {
AddDividerText(
container,
std::move(text) | Ui::Text::ToWithEntities(),
margins);
}
void AddDividerText(
not_null<Ui::VerticalLayout*> container,
rpl::producer<TextWithEntities> text) {
rpl::producer<TextWithEntities> text,
const style::margins &margins) {
container->add(object_ptr<Ui::DividerLabel>(
container,
object_ptr<Ui::FlatLabel>(
container,
std::move(text),
st::boxDividerLabel),
st::defaultBoxDividerLabelPadding));
margins));
}
not_null<Ui::FlatLabel*> AddSubsectionTitle(

10
Telegram/SourceFiles/ui/vertical_list.h
View File

@ -11,6 +11,10 @@ namespace style {
struct FlatLabel;
} // namespace style
namespace st {
extern const style::margins &defaultBoxDividerLabelPadding;
} // namespace st
namespace Ui {
class FlatLabel;
@ -21,10 +25,12 @@ void AddSkip(not_null<Ui::VerticalLayout*> container, int skip);
void AddDivider(not_null<Ui::VerticalLayout*> container);
void AddDividerText(
not_null<Ui::VerticalLayout*> container,
rpl::producer<QString> text);
rpl::producer<QString> text,
const style::margins &margins = st::defaultBoxDividerLabelPadding);
void AddDividerText(
not_null<Ui::VerticalLayout*> container,
rpl::producer<TextWithEntities> text);
rpl::producer<TextWithEntities> text,
const style::margins &margins = st::defaultBoxDividerLabelPadding);
not_null<Ui::FlatLabel*> AddSubsectionTitle(
not_null<Ui::VerticalLayout*> container,
rpl::producer<QString> text,