Update main menu and stories icons.

This commit is contained in:
John Preston 2023-07-03 11:33:28 +04:00
parent ef1f1846a4
commit f0ab6e5690
51 changed files with 39 additions and 37 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 613 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 685 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 758 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 567 B

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -477,10 +477,10 @@ void FillSourceMenu(
controller->showSection(Info::Stories::Make( controller->showSection(Info::Stories::Make(
peer, peer,
Info::Stories::Tab::Archive)); Info::Stories::Tab::Archive));
}, &st::menuIconStoriesArchive); }, &st::menuIconStoriesArchiveSection);
add(tr::lng_stories_my_title(tr::now), [=] { add(tr::lng_stories_my_title(tr::now), [=] {
controller->showSection(Info::Stories::Make(peer)); controller->showSection(Info::Stories::Make(peer));
}, &st::menuIconStoriesSaved); }, &st::menuIconStoriesSavedSection);
} else { } else {
add(tr::lng_profile_send_message(tr::now), [=] { add(tr::lng_profile_send_message(tr::now), [=] {
controller->showPeerHistory(peer); controller->showPeerHistory(peer);
@ -508,7 +508,7 @@ void FillSourceMenu(
if (in(Data::StorySourcesList::Hidden)) { if (in(Data::StorySourcesList::Hidden)) {
add(tr::lng_stories_show_in_chats(tr::now), [=] { add(tr::lng_stories_show_in_chats(tr::now), [=] {
toggle(true); toggle(true);
}, &st::menuIconAddToFolder); }, &st::menuIconStoriesToChats);
} }
} }
} }

View file

@ -176,12 +176,12 @@ infoTopBarDelete: IconButton(infoTopBarForward) {
iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
} }
infoTopBarSaveStories: IconButton(infoTopBarForward) { infoTopBarSaveStories: IconButton(infoTopBarForward) {
icon: icon {{ "menu/stories_saved", boxTitleCloseFg }}; icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }};
iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }};
} }
infoTopBarArchiveStories: IconButton(infoTopBarForward) { infoTopBarArchiveStories: IconButton(infoTopBarForward) {
icon: icon {{ "menu/archive", boxTitleCloseFg }}; icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
} }
infoTopBar: InfoTopBar { infoTopBar: InfoTopBar {
height: infoTopBarHeight; height: infoTopBarHeight;
@ -251,12 +251,12 @@ infoLayerTopBarDelete: IconButton(infoLayerTopBarForward) {
iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
} }
infoLayerTopBarSaveStories: IconButton(infoLayerTopBarForward) { infoLayerTopBarSaveStories: IconButton(infoLayerTopBarForward) {
icon: icon {{ "menu/stories_saved", boxTitleCloseFg }}; icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }};
iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }};
} }
infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) { infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) {
icon: icon {{ "menu/archive", boxTitleCloseFg }}; icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }}; iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
} }
infoLayerTopBar: InfoTopBar(infoTopBar) { infoLayerTopBar: InfoTopBar(infoTopBar) {
height: infoLayerTopBarHeight; height: infoLayerTopBarHeight;

View file

@ -1029,7 +1029,9 @@ void ListWidget::showContextMenu(
? tr::lng_mediaview_save_to_profile ? tr::lng_mediaview_save_to_profile
: tr::lng_archived_add)(tr::now), : tr::lng_archived_add)(tr::now),
crl::guard(this, [this] { toggleStoryPinSelected(); }), crl::guard(this, [this] { toggleStoryPinSelected(); }),
(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive)); (pin
? &st::menuIconStoriesSave
: &st::menuIconStoriesArchive));
} }
if (canForwardAll()) { if (canForwardAll()) {
_contextMenu->addAction( _contextMenu->addAction(
@ -1070,7 +1072,9 @@ void ListWidget::showContextMenu(
crl::guard(this, [=] { crl::guard(this, [=] {
toggleStoryPin({ 1, globalId.itemId }); toggleStoryPin({ 1, globalId.itemId });
}), }),
(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive)); (pin
? &st::menuIconStoriesSave
: &st::menuIconStoriesArchive));
} }
if (selectionData.canForward) { if (selectionData.canForward) {
_contextMenu->addAction( _contextMenu->addAction(

View file

@ -93,13 +93,7 @@ settingsIconThemes: icon {{ "settings/palette", settingsIconFg }};
settingsIconGroup: icon {{ "settings/group", settingsIconFg }}; settingsIconGroup: icon {{ "settings/group", settingsIconFg }};
settingsIconChannel: icon {{ "settings/channel", settingsIconFg }}; settingsIconChannel: icon {{ "settings/channel", settingsIconFg }};
settingsIconUser: icon {{ "settings/user", settingsIconFg }}; settingsIconUser: icon {{ "settings/user", settingsIconFg }};
settingsIconSavedMessages: icon {{ "settings/saved_messages", settingsIconFg }};
settingsIconStories: icon {{ "settings/stories", settingsIconFg }};
settingsIconKey: icon {{ "settings/key", settingsIconFg }}; settingsIconKey: icon {{ "settings/key", settingsIconFg }};
settingsIconReload: icon {{ "settings/reload", settingsIconFg }};
settingsIconNight: icon {{ "settings/night", settingsIconFg }};
settingsIconSettings: icon {{ "settings/settings", settingsIconFg }};
settingsIconArchive: icon {{ "settings/archive", settingsIconFg }};
settingsIconPlus: icon {{ "settings/plus", settingsIconFg }}; settingsIconPlus: icon {{ "settings/plus", settingsIconFg }};
settingsIconMinus: icon {{ "settings/minus", settingsIconFg }}; settingsIconMinus: icon {{ "settings/minus", settingsIconFg }};
settingsIconTimer: icon {{ "settings/timer", settingsIconFg }}; settingsIconTimer: icon {{ "settings/timer", settingsIconFg }};

View file

@ -104,8 +104,15 @@ menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }};
menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }}; menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }};
menuIconPhone: icon {{ "menu/phone", menuIconColor }}; menuIconPhone: icon {{ "menu/phone", menuIconColor }};
menuIconChannel: icon {{ "menu/channel", menuIconColor }}; menuIconChannel: icon {{ "menu/channel", menuIconColor }};
menuIconStoriesSaved: icon {{ "menu/stories_saved", menuIconColor }}; menuIconStoriesSavedSection: icon {{ "menu/stories_saved_section", menuIconColor }};
menuIconStoriesArchiveSection: icon {{ "menu/stories_archive_section", menuIconColor }};
menuIconStoriesSave: icon {{ "menu/stories_save", menuIconColor }};
menuIconStoriesArchive: icon {{ "menu/stories_archive", menuIconColor }}; menuIconStoriesArchive: icon {{ "menu/stories_archive", menuIconColor }};
menuIconArchiveOpen: icon {{ "menu/archive_open", menuIconColor }};
menuIconGroups: icon {{ "menu/groups", menuIconColor }};
menuIconSavedMessages: icon {{ "menu/saved_messages", menuIconColor }};
menuIconNightMode: icon {{ "menu/night_mode", menuIconColor }};
menuIconStoriesToChats: icon {{ "menu/stories_to_chats", menuIconColor }};
menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
menuIconTTLAnyTextPosition: point(11px, 22px); menuIconTTLAnyTextPosition: point(11px, 22px);
@ -126,8 +133,8 @@ mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }};
mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }}; mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }};
mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }}; mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }};
mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }}; mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }};
mediaMenuIconSaveStory: icon {{ "menu/stories_saved", mediaviewMenuFg }}; mediaMenuIconSaveStory: icon {{ "menu/stories_save", mediaviewMenuFg }};
mediaMenuIconArchiveStory: icon {{ "menu/archive", mediaviewMenuFg }}; mediaMenuIconArchiveStory: icon {{ "menu/stories_archive", mediaviewMenuFg }};
menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }}; menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }}; menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};

View file

@ -587,7 +587,7 @@ void MainMenu::setupArchive() {
inner, inner,
tr::lng_archived_name(), tr::lng_archived_name(),
st::mainMenuButton, st::mainMenuButton,
{ &st::settingsIconArchive, kIconGray }); { &st::menuIconArchiveOpen });
inner->add( inner->add(
object_ptr<Ui::PlainShadow>(inner), object_ptr<Ui::PlainShadow>(inner),
{ 0, st::mainMenuSkip, 0, st::mainMenuSkip }); { 0, st::mainMenuSkip, 0, st::mainMenuSkip });
@ -734,13 +734,13 @@ void MainMenu::setupMenu() {
if (!_controller->session().supportMode()) { if (!_controller->session().supportMode()) {
addAction( addAction(
tr::lng_create_group_title(), tr::lng_create_group_title(),
{ &st::settingsIconGroup, kIconLightBlue } { &st::menuIconGroups }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->showNewGroup(); controller->showNewGroup();
}); });
addAction( addAction(
tr::lng_create_channel_title(), tr::lng_create_channel_title(),
{ &st::settingsIconChannel, kIconLightOrange } { &st::menuIconChannel }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->showNewChannel(); controller->showNewChannel();
}); });
@ -752,10 +752,7 @@ void MainMenu::setupMenu() {
_menu, _menu,
tr::lng_menu_my_stories(), tr::lng_menu_my_stories(),
st::mainMenuButton, st::mainMenuButton,
IconDescriptor{ IconDescriptor{ &st::menuIconStoriesSavedSection })));
&st::settingsIconStories,
kIconDarkBlue
})));
const auto stories = &controller->session().data().stories(); const auto stories = &controller->session().data().stories();
if (stories->archiveCount() > 0) { if (stories->archiveCount() > 0) {
wrap->toggle(true, anim::type::instant); wrap->toggle(true, anim::type::instant);
@ -776,32 +773,32 @@ void MainMenu::setupMenu() {
addAction( addAction(
tr::lng_menu_contacts(), tr::lng_menu_contacts(),
{ &st::settingsIconUser, kIconRed } { &st::menuIconProfile }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->show(PrepareContactsBox(controller)); controller->show(PrepareContactsBox(controller));
}); });
addAction( addAction(
tr::lng_menu_calls(), tr::lng_menu_calls(),
{ &st::settingsIconCalls, kIconGreen } { &st::menuIconPhone }
)->setClickedCallback([=] { )->setClickedCallback([=] {
ShowCallsBox(controller); ShowCallsBox(controller);
}); });
addAction( addAction(
tr::lng_saved_messages(), tr::lng_saved_messages(),
{ &st::settingsIconSavedMessages, kIconLightBlue } { &st::menuIconSavedMessages }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->showPeerHistory(controller->session().user()); controller->showPeerHistory(controller->session().user());
}); });
} else { } else {
addAction( addAction(
tr::lng_profile_add_contact(), tr::lng_profile_add_contact(),
{ &st::settingsIconUser, kIconRed } { &st::menuIconProfile }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->showAddContact(); controller->showAddContact();
}); });
addAction( addAction(
rpl::single(u"Fix chats order"_q), rpl::single(u"Fix chats order"_q),
{ &st::settingsIconPin, kIconGreen } { &st::menuIconPin }
)->toggleOn(rpl::single( )->toggleOn(rpl::single(
_controller->session().settings().supportFixChatsOrder() _controller->session().settings().supportFixChatsOrder()
))->toggledChanges( ))->toggledChanges(
@ -811,21 +808,21 @@ void MainMenu::setupMenu() {
}, _menu->lifetime()); }, _menu->lifetime());
addAction( addAction(
rpl::single(u"Reload templates"_q), rpl::single(u"Reload templates"_q),
{ &st::settingsIconReload, kIconLightBlue } { &st::menuIconRestore }
)->setClickedCallback([=] { )->setClickedCallback([=] {
_controller->session().supportTemplates().reload(); _controller->session().supportTemplates().reload();
}); });
} }
addAction( addAction(
tr::lng_menu_settings(), tr::lng_menu_settings(),
{ &st::settingsIconSettings, kIconPurple } { &st::menuIconSettings }
)->setClickedCallback([=] { )->setClickedCallback([=] {
controller->showSettings(); controller->showSettings();
}); });
_nightThemeToggle = addAction( _nightThemeToggle = addAction(
tr::lng_menu_night_mode(), tr::lng_menu_night_mode(),
{ &st::settingsIconNight, kIconDarkBlue } { &st::menuIconNightMode }
)->toggleOn(_nightThemeSwitches.events_starting_with( )->toggleOn(_nightThemeSwitches.events_starting_with(
Window::Theme::IsNightMode() Window::Theme::IsNightMode()
)); ));