diff --git a/Telegram/Resources/icons/info/info_media_stories.png b/Telegram/Resources/icons/info/info_media_stories.png new file mode 100644 index 000000000..5b4cb99be Binary files /dev/null and b/Telegram/Resources/icons/info/info_media_stories.png differ diff --git a/Telegram/Resources/icons/info/info_media_stories@2x.png b/Telegram/Resources/icons/info/info_media_stories@2x.png new file mode 100644 index 000000000..fc0a2f6e3 Binary files /dev/null and b/Telegram/Resources/icons/info/info_media_stories@2x.png differ diff --git a/Telegram/Resources/icons/info/info_media_stories@3x.png b/Telegram/Resources/icons/info/info_media_stories@3x.png new file mode 100644 index 000000000..df8a23bbd Binary files /dev/null and b/Telegram/Resources/icons/info/info_media_stories@3x.png differ diff --git a/Telegram/Resources/icons/mediaview/viewer_share.png b/Telegram/Resources/icons/mediaview/viewer_share.png new file mode 100644 index 000000000..14861b1ee Binary files /dev/null and b/Telegram/Resources/icons/mediaview/viewer_share.png differ diff --git a/Telegram/Resources/icons/mediaview/viewer_share@2x.png b/Telegram/Resources/icons/mediaview/viewer_share@2x.png new file mode 100644 index 000000000..7c6e9341e Binary files /dev/null and b/Telegram/Resources/icons/mediaview/viewer_share@2x.png differ diff --git a/Telegram/Resources/icons/mediaview/viewer_share@3x.png b/Telegram/Resources/icons/mediaview/viewer_share@3x.png new file mode 100644 index 000000000..43310c895 Binary files /dev/null and b/Telegram/Resources/icons/mediaview/viewer_share@3x.png differ diff --git a/Telegram/Resources/icons/settings/stories.png b/Telegram/Resources/icons/settings/stories.png index 5cc794ddc..c41ac06dd 100644 Binary files a/Telegram/Resources/icons/settings/stories.png and b/Telegram/Resources/icons/settings/stories.png differ diff --git a/Telegram/Resources/icons/settings/stories@2x.png b/Telegram/Resources/icons/settings/stories@2x.png index eafc49025..82e24fc67 100644 Binary files a/Telegram/Resources/icons/settings/stories@2x.png and b/Telegram/Resources/icons/settings/stories@2x.png differ diff --git a/Telegram/Resources/icons/settings/stories@3x.png b/Telegram/Resources/icons/settings/stories@3x.png index a1d6678e0..23c70a8cc 100644 Binary files a/Telegram/Resources/icons/settings/stories@3x.png and b/Telegram/Resources/icons/settings/stories@3x.png differ diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index bbd952df0..fc537b734 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1123,6 +1123,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_profile_sure_kick_channel" = "Remove {user} from the channel?"; "lng_profile_sure_remove_admin" = "Remove {user} from admins?"; "lng_profile_loading" = "Loading..."; +"lng_profile_stories#one" = "{count} story"; +"lng_profile_stories#other" = "{count} stories"; "lng_profile_photos#one" = "{count} photo"; "lng_profile_photos#other" = "{count} photos"; "lng_profile_gifs#one" = "{count} GIF"; diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index a106a9586..62febc455 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -367,6 +367,7 @@ infoIconMediaAudio: icon {{ "info/info_media_audio", infoIconFg }}; infoIconMediaLink: icon {{ "info/info_media_link", infoIconFg }}; infoIconMediaGroup: icon {{ "info/info_common_groups", infoIconFg }}; infoIconMediaVoice: icon {{ "info/info_media_voice", infoIconFg }}; +infoIconMediaStories: icon {{ "info/info_media_stories", infoIconFg }}; infoRoundedIconRequests: icon {{ "info/edit/group_manage_join_requests", settingsIconFg }}; infoRoundedIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }}; diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h index 8ba60b121..af1facc58 100644 --- a/Telegram/SourceFiles/info/media/info_media_buttons.h +++ b/Telegram/SourceFiles/info/media/info_media_buttons.h @@ -142,7 +142,7 @@ inline auto AddStoriesButton( parent, std::move(count), [](int count) { - return tr::lng_stories_row_count(tr::now, lt_count, count); + return tr::lng_profile_stories(tr::now, lt_count, count); }, tracker)->entity(); result->addClickHandler([=] { diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 3b85f8989..642b4d422 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -201,7 +201,7 @@ object_ptr InnerWidget::setupSharedMedia( }; if (auto user = _peer->asUser()) { - addStoriesButton(user, st::infoIconMediaGroup); + addStoriesButton(user, st::infoIconMediaStories); } addMediaButton(MediaType::Photo, st::infoIconMediaPhoto); addMediaButton(MediaType::Video, st::infoIconMediaVideo); diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style index bf2f7624e..4137dbce9 100644 --- a/Telegram/SourceFiles/media/view/media_view.style +++ b/Telegram/SourceFiles/media/view/media_view.style @@ -109,7 +109,7 @@ mediaviewRight: icon { { "mediaview/next", mediaviewControlFg } }; mediaviewSave: icon {{ "mediaview/download", mediaviewControlFg }}; -mediaviewShare: icon {{ "mediaview/stories_next", mediaviewControlFg }}; +mediaviewShare: icon {{ "mediaview/viewer_share", mediaviewControlFg }}; mediaviewRotate: icon {{ "mediaview/rotate", mediaviewControlFg }}; mediaviewMore: icon {{ "title_menu_dots", mediaviewControlFg }}; diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 816f918cf..13f4e45bf 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -744,24 +744,6 @@ void MainMenu::setupMenu() { )->setClickedCallback([=] { controller->showNewChannel(); }); - addAction( - tr::lng_menu_contacts(), - { &st::settingsIconUser, kIconRed } - )->setClickedCallback([=] { - controller->show(PrepareContactsBox(controller)); - }); - addAction( - tr::lng_menu_calls(), - { &st::settingsIconCalls, kIconGreen } - )->setClickedCallback([=] { - ShowCallsBox(controller); - }); - addAction( - tr::lng_saved_messages(), - { &st::settingsIconSavedMessages, kIconLightBlue } - )->setClickedCallback([=] { - controller->showPeerHistory(controller->session().user()); - }); const auto wrap = _menu->add( object_ptr>( @@ -772,7 +754,7 @@ void MainMenu::setupMenu() { st::mainMenuButton, IconDescriptor{ &st::settingsIconStories, - kIconLightOrange + kIconDarkBlue }))); const auto stories = &controller->session().data().stories(); if (stories->archiveCount() > 0) { @@ -791,6 +773,25 @@ void MainMenu::setupMenu() { controller->showSection( Info::Stories::Make(controller->session().user())); }); + + addAction( + tr::lng_menu_contacts(), + { &st::settingsIconUser, kIconRed } + )->setClickedCallback([=] { + controller->show(PrepareContactsBox(controller)); + }); + addAction( + tr::lng_menu_calls(), + { &st::settingsIconCalls, kIconGreen } + )->setClickedCallback([=] { + ShowCallsBox(controller); + }); + addAction( + tr::lng_saved_messages(), + { &st::settingsIconSavedMessages, kIconLightBlue } + )->setClickedCallback([=] { + controller->showPeerHistory(controller->session().user()); + }); } else { addAction( tr::lng_profile_add_contact(),