diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 9a0def1ca..0f0ff77e1 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -743,6 +743,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_sure_delete_channel" = "Are you sure, you want to delete this channel? All members will be removed and all messages will be lost."; "lng_sure_leave_group" = "Are you sure, you want to leave\nthis group?"; "lng_sure_delete_group" = "Are you sure, you want to delete this group? All members will be removed and all messages will be lost."; +"lng_sure_delete_saved_messages" = "Are you sure, you want to delete all your saved messages?\n\nThis action cannot be undone."; "lng_message_empty" = "Empty Message"; "lng_message_unsupported" = "This message is not supported by your version of Telegram Desktop. Please update to the last version in Settings or install it from {link}"; @@ -975,7 +976,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_unblock_button" = "Unblock"; "lng_channel_mute" = "Mute"; "lng_channel_unmute" = "Unmute"; -"lng_saved_messages" = "Saved messages"; +"lng_saved_messages" = "Saved Messages"; "lng_saved_short" = "Saved"; "lng_saved_forward_here" = "Forward messages here for quick access"; diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp index 869ba0cd3..a6c866f79 100644 --- a/Telegram/SourceFiles/info/info_top_bar.cpp +++ b/Telegram/SourceFiles/info/info_top_bar.cpp @@ -524,7 +524,8 @@ void TopBar::performDelete() { rpl::producer TitleValue( const Section §ion, - not_null peer) { + not_null peer, + bool isStackBottom) { return Lang::Viewer([&] { switch (section.type()) { case Section::Type::Profile: @@ -542,6 +543,9 @@ rpl::producer TitleValue( Unexpected("Bad peer type in Info::TitleValue()"); case Section::Type::Media: + if (peer->isSelf() && isStackBottom) { + return lng_profile_shared_media; + } switch (section.mediaType()) { case Section::MediaType::Photo: return lng_media_type_photos; diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h index 252af10c1..4c9c714cb 100644 --- a/Telegram/SourceFiles/info/info_top_bar.h +++ b/Telegram/SourceFiles/info/info_top_bar.h @@ -43,7 +43,8 @@ class Section; rpl::producer TitleValue( const Section §ion, - not_null peer); + not_null peer, + bool isStackBottom); class TopBar : public Ui::RpWidget { public: diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index 85c4e2ed5..78890f858 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -315,7 +315,8 @@ void WrapWidget::createTopBar() { _topBar->setTitle(TitleValue( _controller->section(), - _controller->peer())); + _controller->peer(), + !hasStackHistory())); if (wrapValue == Wrap::Narrow || hasStackHistory()) { _topBar->enableBackButton(); _topBar->backRequest() diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index cf8c71b2c..b398dd415 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -453,53 +453,20 @@ void ActionsFiller::addDeleteContactAction( } void ActionsFiller::addClearHistoryAction(not_null user) { - auto callback = [user] { - auto confirmation = lng_sure_delete_history( - lt_contact, - App::peerName(user)); - auto confirmCallback = [user] { - Ui::hideLayer(); - Auth().api().clearHistory(user); - Ui::showPeerHistory(user, ShowAtUnreadMsgId); - }; - auto box = Box( - confirmation, - lang(lng_box_delete), - st::attentionBoxButton, - std::move(confirmCallback)); - Ui::show(std::move(box)); - }; AddActionButton( _wrap, Lang::Viewer(lng_profile_clear_history), rpl::single(true), - std::move(callback)); + Window::ClearHistoryHandler(user)); } void ActionsFiller::addDeleteConversationAction( not_null user) { - auto callback = [user] { - auto confirmation = lng_sure_delete_history( - lt_contact, - App::peerName(user)); - auto confirmButton = lang(lng_box_delete); - auto confirmCallback = [user] { - Ui::hideLayer(); - Ui::showChatsList(); - App::main()->deleteConversation(user); - }; - auto box = Box( - confirmation, - confirmButton, - st::attentionBoxButton, - std::move(confirmCallback)); - Ui::show(std::move(box)); - }; AddActionButton( _wrap, Lang::Viewer(lng_profile_delete_conversation), rpl::single(true), - std::move(callback)); + Window::DeleteAndLeaveHandler(user)); } void ActionsFiller::addBotCommandActions(not_null user) { diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index e4f67a386..e3b5f6c48 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -88,51 +88,6 @@ History *FindWastedPin() { return nullptr; } -auto ClearHistoryHandler(not_null peer) { - return [peer] { - auto text = peer->isUser() - ? lng_sure_delete_history(lt_contact, peer->name) - : lng_sure_delete_group_history(lt_group, peer->name); - Ui::show(Box(text, lang(lng_box_delete), st::attentionBoxButton, [peer] { - if (!App::main()) return; - - Ui::hideLayer(); - Auth().api().clearHistory(peer); - })); - }; -} - -auto DeleteAndLeaveHandler(not_null peer) { - return [peer] { - auto warningText = peer->isUser() ? lng_sure_delete_history(lt_contact, peer->name) : - peer->isChat() ? lng_sure_delete_and_exit(lt_group, peer->name) : - lang(peer->isMegagroup() ? lng_sure_leave_group : lng_sure_leave_channel); - auto confirmText = lang(peer->isUser() ? lng_box_delete : lng_box_leave); - auto &confirmStyle = peer->isChannel() ? st::defaultBoxButton : st::attentionBoxButton; - Ui::show(Box(warningText, confirmText, confirmStyle, [peer] { - if (!App::main()) return; - - Ui::hideLayer(); - if (App::wnd()->controller()->activePeer.current() == peer) { - Ui::showChatsList(); - } - if (peer->isUser()) { - App::main()->deleteConversation(peer); - } else if (auto chat = peer->asChat()) { - App::main()->deleteAndExit(chat); - } else if (auto channel = peer->asChannel()) { - // Don't delete old history by default, - // because Android app doesn't. - // - //if (auto migrateFrom = channel->migrateFrom()) { - // App::main()->deleteConversation(migrateFrom); - //} - Auth().api().leaveChannel(channel); - } - })); - }; -} - Filler::Filler( not_null controller, not_null peer, @@ -566,6 +521,76 @@ void PeerMenuAddChannelMembers(not_null channel) { Auth().api().requestChannelMembersForAdd(channel, callback); } +base::lambda ClearHistoryHandler(not_null peer) { + return [peer] { + const auto weak = std::make_shared>(); + const auto text = peer->isSelf() + ? lang(lng_sure_delete_saved_messages) + : peer->isUser() + ? lng_sure_delete_history(lt_contact, peer->name) + : lng_sure_delete_group_history(lt_group, peer->name); + auto callback = [=] { + if (auto strong = *weak) { + strong->closeBox(); + } + Auth().api().clearHistory(peer); + }; + *weak = Ui::show( + Box( + text, + lang(lng_box_delete), + st::attentionBoxButton, + std::move(callback)), + LayerOption::KeepOther); + }; +} + +base::lambda DeleteAndLeaveHandler(not_null peer) { + return [peer] { + const auto warningText = peer->isSelf() + ? lang(lng_sure_delete_saved_messages) + : peer->isUser() + ? lng_sure_delete_history(lt_contact, peer->name) + : peer->isChat() + ? lng_sure_delete_and_exit(lt_group, peer->name) + : lang(peer->isMegagroup() + ? lng_sure_leave_group + : lng_sure_leave_channel); + const auto confirmText = lang(peer->isUser() + ? lng_box_delete + : lng_box_leave); + const auto &confirmStyle = peer->isChannel() + ? st::defaultBoxButton + : st::attentionBoxButton; + auto callback = [peer] { + Ui::hideLayer(); + if (App::wnd()->controller()->activePeer.current() == peer) { + Ui::showChatsList(); + } + if (peer->isUser()) { + App::main()->deleteConversation(peer); + } else if (auto chat = peer->asChat()) { + App::main()->deleteAndExit(chat); + } else if (auto channel = peer->asChannel()) { + // Don't delete old history by default, + // because Android app doesn't. + // + //if (auto migrateFrom = channel->migrateFrom()) { + // App::main()->deleteConversation(migrateFrom); + //} + Auth().api().leaveChannel(channel); + } + }; + Ui::show( + Box( + warningText, + confirmText, + confirmStyle, + std::move(callback)), + LayerOption::KeepOther); + }; +} + void FillPeerMenu( not_null controller, not_null peer, diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h index c4bb25a40..db8e13187 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.h +++ b/Telegram/SourceFiles/window/window_peer_menu.h @@ -45,6 +45,9 @@ void PeerMenuShareContactBox(not_null user); void PeerMenuAddContact(not_null user); void PeerMenuAddChannelMembers(not_null channel); +base::lambda ClearHistoryHandler(not_null peer); +base::lambda DeleteAndLeaveHandler(not_null peer); + void ShowForwardMessagesBox( MessageIdsList &&items, base::lambda_once &&successCallback = nullptr);