From b9fb9af74fb6e7b8ceff11ebe055ef25af48fa1d Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 21 Sep 2017 22:21:33 +0300 Subject: [PATCH] Info shared media and common groups counters. --- Telegram/Resources/langs/lang.strings | 2 + Telegram/SourceFiles/apiwrap.cpp | 23 +- Telegram/SourceFiles/boxes/boxes.style | 1 + .../history/history_shared_media.cpp | 49 ++- Telegram/SourceFiles/info/info.style | 81 ++-- .../info/info_profile_inner_widget.cpp | 337 ++++++++++------ .../info/info_profile_inner_widget.h | 14 +- .../SourceFiles/info/info_profile_lines.cpp | 364 +++++++++++++----- .../SourceFiles/info/info_profile_lines.h | 87 +++-- Telegram/SourceFiles/info/info_top_bar.cpp | 3 +- Telegram/SourceFiles/mediaview.cpp | 2 + Telegram/SourceFiles/rpl/event_stream.h | 50 ++- Telegram/SourceFiles/rpl/filter.h | 57 ++- .../SourceFiles/rpl/{single.h => range.h} | 36 ++ Telegram/SourceFiles/rpl/rpl.h | 2 +- .../storage/storage_shared_media.cpp | 15 +- Telegram/SourceFiles/ui/twidget.h | 2 +- Telegram/SourceFiles/ui/widgets/checkbox.cpp | 96 ++++- Telegram/SourceFiles/ui/widgets/checkbox.h | 12 +- Telegram/SourceFiles/ui/widgets/widgets.style | 4 +- Telegram/SourceFiles/ui/wrap/padding_wrap.h | 21 +- Telegram/SourceFiles/ui/wrap/slide_wrap.cpp | 111 +++--- Telegram/SourceFiles/ui/wrap/slide_wrap.h | 102 +++-- .../SourceFiles/window/section_widget.cpp | 2 +- Telegram/gyp/settings_win.gypi | 8 +- Telegram/gyp/tests/tests.gyp | 2 +- 26 files changed, 1048 insertions(+), 435 deletions(-) rename Telegram/SourceFiles/rpl/{single.h => range.h} (63%) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 40417aeb6..f4ad6b2ff 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -599,6 +599,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_profile_files_header" = "Files"; "lng_profile_audios#one" = "{count} voice message"; "lng_profile_audios#other" = "{count} voice messages"; +"lng_profile_rounds#one" = "{count} video message"; +"lng_profile_rounds#other" = "{count} video messages"; "lng_profile_audios_header" = "Voice messages"; "lng_profile_shared_links#one" = "{count} shared link"; "lng_profile_shared_links#other" = "{count} shared links"; diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 756d54dc2..994f5cd5f 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -286,6 +286,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt App::feedUsers(d.vusers); App::feedChats(d.vchats); + using UpdateFlag = Notify::PeerUpdate::Flag; if (auto chat = peer->asChat()) { if (d.vfull_chat.type() != mtpc_chatFull) { LOG(("MTP Error: bad type in gotChatFull for chat: %1").arg(d.vfull_chat.type())); @@ -305,11 +306,14 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt } break; } } + auto newPhotoId = 0; if (auto photo = App::feedPhoto(f.vchat_photo)) { - chat->photoId = photo->id; + newPhotoId = photo->id; photo->peer = chat; - } else { - chat->photoId = 0; + } + if (chat->photoId != newPhotoId) { + chat->photoId = newPhotoId; + Notify::peerUpdatedDelayed(chat, UpdateFlag::PhotoChanged); } chat->setInviteLink((f.vexported_invite.type() == mtpc_chatInviteExported) ? qs(f.vexported_invite.c_chatInviteExported().vlink) : QString()); chat->fullUpdated(); @@ -327,11 +331,14 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt auto canEditStickers = channel->canEditStickers(); channel->flagsFull = f.vflags.v; + auto newPhotoId = 0; if (auto photo = App::feedPhoto(f.vchat_photo)) { - channel->photoId = photo->id; + newPhotoId = photo->id; photo->peer = channel; - } else { - channel->photoId = 0; + } + if (channel->photoId != newPhotoId) { + channel->photoId = newPhotoId; + Notify::peerUpdatedDelayed(channel, UpdateFlag::PhotoChanged); } if (f.has_migrated_from_chat_id()) { if (!channel->mgInfo) { @@ -402,14 +409,14 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt stickersChanged = true; } if (stickersChanged) { - Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelStickersChanged); + Notify::peerUpdatedDelayed(channel, UpdateFlag::ChannelStickersChanged); } } channel->fullUpdated(); if (canViewAdmins != channel->canViewAdmins() || canViewMembers != channel->canViewMembers()) { - Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelRightsChanged); + Notify::peerUpdatedDelayed(channel, UpdateFlag::ChannelRightsChanged); } notifySettingReceived(MTP_inputNotifyPeer(peer->input), f.vnotify_settings); diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 8b335b0e9..679d0c1f5 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -627,6 +627,7 @@ adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) { adminLogFilterSkip: 32px; adminLogFilterUserCheckbox: Checkbox(defaultBoxCheckbox) { margin: margins(8px, 6px, 8px, 6px); + checkPosition: point(8px, 6px); } rightsCheckbox: Checkbox(defaultBoxCheckbox) { diff --git a/Telegram/SourceFiles/history/history_shared_media.cpp b/Telegram/SourceFiles/history/history_shared_media.cpp index 7979011db..ad10ec73d 100644 --- a/Telegram/SourceFiles/history/history_shared_media.cpp +++ b/Telegram/SourceFiles/history/history_shared_media.cpp @@ -91,6 +91,8 @@ private: After, }; void requestMessages(RequestDirection direction); + void requestMessagesCount(); + void fillSkippedAndSliceToLimits(); void sliceToLimits(); void mergeSliceData( @@ -244,11 +246,15 @@ bool SharedMediaSliceBuilder::applyUpdate(const SliceUpdate &update) { return false; } auto intersects = [](MsgRange range1, MsgRange range2) { - return (range1.from <= range2.till) && (range2.from <= range1.till); + return (range1.from <= range2.till) + && (range2.from <= range1.till); }; - if (!intersects(update.range, { - _ids.empty() ? _key.messageId : _ids.front(), - _ids.empty() ? _key.messageId : _ids.back() })) { + auto needMergeMessages = (update.messages != nullptr) + && intersects(update.range, { + _ids.empty() ? _key.messageId : _ids.front(), + _ids.empty() ? _key.messageId : _ids.back() + }); + if (!needMergeMessages && !update.count) { return false; } auto skippedBefore = (update.range.from == 0) @@ -259,7 +265,9 @@ bool SharedMediaSliceBuilder::applyUpdate(const SliceUpdate &update) { : base::optional {}; mergeSliceData( update.count, - update.messages ? *update.messages : base::flat_set {}, + needMergeMessages + ? *update.messages + : base::flat_set {}, skippedBefore, skippedAfter); return true; @@ -322,7 +330,7 @@ void SharedMediaSliceBuilder::mergeSliceData( _skippedBefore = _skippedAfter = 0; } } - sliceToLimits(); + fillSkippedAndSliceToLimits(); return; } if (count) { @@ -359,7 +367,10 @@ void SharedMediaSliceBuilder::mergeSliceData( } else { _skippedAfter = base::none; } + fillSkippedAndSliceToLimits(); +} +void SharedMediaSliceBuilder::fillSkippedAndSliceToLimits() { if (_fullCount) { if (_skippedBefore && !_skippedAfter) { _skippedAfter = *_fullCount @@ -371,11 +382,17 @@ void SharedMediaSliceBuilder::mergeSliceData( - int(_ids.size()); } } - sliceToLimits(); } void SharedMediaSliceBuilder::sliceToLimits() { + if (!_key.messageId) { + if (!_fullCount) { + requestMessagesCount(); + } + return; + } + auto requestedSomething = false; auto aroundIt = base::lower_bound(_ids, _key.messageId); auto removeFromBegin = (aroundIt - _ids.begin() - _limitBefore); auto removeFromEnd = (_ids.end() - aroundIt - _limitAfter - 1); @@ -384,7 +401,9 @@ void SharedMediaSliceBuilder::sliceToLimits() { if (_skippedBefore) { *_skippedBefore += removeFromBegin; } - } else if (removeFromBegin < 0 && (!_skippedBefore || *_skippedBefore > 0)) { + } else if (removeFromBegin < 0 + && (!_skippedBefore || *_skippedBefore > 0)) { + requestedSomething = true; requestMessages(RequestDirection::Before); } if (removeFromEnd > 0) { @@ -392,12 +411,18 @@ void SharedMediaSliceBuilder::sliceToLimits() { if (_skippedAfter) { *_skippedAfter += removeFromEnd; } - } else if (removeFromEnd < 0 && (!_skippedAfter || *_skippedAfter > 0)) { + } else if (removeFromEnd < 0 + && (!_skippedAfter || *_skippedAfter > 0)) { + requestedSomething = true; requestMessages(RequestDirection::After); } + if (!_fullCount && !requestedSomething) { + requestMessagesCount(); + } } -void SharedMediaSliceBuilder::requestMessages(RequestDirection direction) { +void SharedMediaSliceBuilder::requestMessages( + RequestDirection direction) { using SliceType = ApiWrap::SliceType; auto requestAroundData = [&]() -> AroundData { if (_ids.empty()) { @@ -410,6 +435,10 @@ void SharedMediaSliceBuilder::requestMessages(RequestDirection direction) { _insufficientMediaAround.fire(requestAroundData()); } +void SharedMediaSliceBuilder::requestMessagesCount() { + _insufficientMediaAround.fire({ 0, ApiWrap::SliceType::Around }); +} + SharedMediaSlice SharedMediaSliceBuilder::snapshot() const { return SharedMediaSlice( _key, diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 1752cdd4d..cfa4400d7 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -23,6 +23,30 @@ using "basic.style"; using "boxes/boxes.style"; using "ui/widgets/widgets.style"; +InfoToggle { + color: color; + duration: int; + size: pixels; + skip: pixels; + stroke: pixels; + rippleAreaPadding: pixels; +} + +infoToggleCheckbox: Checkbox(defaultCheckbox) { + margin: margins(0px, 0px, 0px, 0px); + rippleBgActive: windowBgOver; + checkPosition: point(16px, 8px); + rippleAreaPosition: point(-8px, -8px); +} +infoToggle: InfoToggle { + color: menuIconFg; + duration: slideWrapDuration; + size: 24px; + skip: 5px; + stroke: 2px; + rippleAreaPadding: 8px; +} + infoScroll: ScrollArea(defaultScrollArea) { bottomsh: 0px; topsh: 0px; @@ -85,27 +109,11 @@ infoProfilePhotoLeft: 19px; infoProfilePhotoTop: 18px; infoProfilePhotoBottom: 18px; -infoProfileNameLeft: 109px; -infoProfileNameRight: 20px; -infoProfileNameTop: 32px; -infoProfileNameLabel: FlatLabel(defaultFlatLabel) { - margin: margins(10px, 5px, 10px, 5px); - width: 160px; - maxHeight: 24px; - textFg: windowBoldFg; - style: TextStyle(defaultTextStyle) { - font: font(16px semibold); - linkFont: font(16px semibold); - linkFontOver: font(16px semibold underline); - } -} - -infoProfileStatusLeft: infoProfileNameLeft; -infoProfileStatusRight: infoProfileNameRight; +infoProfileStatusLeft: 109px; +infoProfileStatusRight: 20px; infoProfileStatusTop: 58px; -infoProfileStatusLabel: FlatLabel(infoProfileNameLabel) { - margin: margins(10px, 5px, 10px, 5px); - width: 160px; +infoProfileStatusLabel: FlatLabel(defaultFlatLabel) { + width: 0px; maxHeight: 18px; textFg: windowSubTextFg; style: TextStyle(defaultTextStyle) { @@ -118,8 +126,18 @@ infoProfileStatusLabel: FlatLabel(infoProfileNameLabel) { } } -infoProfileToggleRight: 12px; -infoProfileToggleTop: 40px; +infoProfileNameLeft: infoProfileStatusLeft; +infoProfileNameRight: infoProfileStatusRight; +infoProfileNameTop: 32px; +infoProfileNameLabel: FlatLabel(infoProfileStatusLabel) { + maxHeight: 24px; + textFg: windowBoldFg; + style: TextStyle(defaultTextStyle) { + font: font(16px semibold); + linkFont: font(16px semibold); + linkFontOver: font(16px semibold underline); + } +} infoProfileSkip: 12px; @@ -131,11 +149,15 @@ infoProfileSeparatorPadding: margins( infoProfileSkip); infoIconFg: menuIconFg; -infoIconPosition: point(25px, 12px); +infoIconPosition: point(20px, 12px); infoIconInformation: icon {{ "info_information", infoIconFg }}; infoIconMembers: icon {{ "info_members", infoIconFg }}; infoIconNotifications: icon {{ "info_notifications", infoIconFg }}; infoIconActions: icon {{ "info_actions", infoIconFg }}; +infoIconMediaPhoto: icon {{ "info_media_photo", infoIconFg }}; +infoInformationIconPosition: point(25px, 12px); +infoNotificationsIconPosition: point(20px, 5px); +infoSharedMediaIconPosition: point(20px, 24px); infoLabeledOneLine: FlatLabel(defaultFlatLabel) { width: 0px; // No need to set minWidth in one-line text. @@ -182,8 +204,19 @@ infoProfileButton: InfoProfileButton { infoNotificationsButton: InfoProfileButton(infoProfileButton) { padding: margins(79px, 13px, 8px, 9px); } -infoNotificationsIconPosition: point(20px, 5px); infoMainButton: InfoProfileButton(infoProfileButton) { textFg: lightButtonFg; textFgOver: lightButtonFgOver; } +infoSharedMediaCoverHeight: 62px; +infoSharedMediaLabelPosition: point(79px, 22px); +infoSharedMediaLabel: FlatLabel(infoProfileStatusLabel) { + textFg: windowBoldFg; + style: TextStyle(defaultTextStyle) { + font: semiboldFont; + linkFont: semiboldFont; + linkFontOver: semiboldFont; + } +} +infoSharedMediaButton: infoProfileButton; +infoSharedMediaBottomSkip: 12px; diff --git a/Telegram/SourceFiles/info/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/info_profile_inner_widget.cpp index 2947b2465..3ca801e8b 100644 --- a/Telegram/SourceFiles/info/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/info_profile_inner_widget.cpp @@ -21,12 +21,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "info/info_profile_inner_widget.h" #include +#include +#include #include "boxes/abstract_box.h" #include "boxes/add_contact_box.h" #include "mainwidget.h" #include "info/info_profile_widget.h" #include "info/info_profile_lines.h" #include "window/window_controller.h" +#include "storage/storage_shared_media.h" #include "lang/lang_keys.h" #include "styles/style_info.h" #include "ui/widgets/buttons.h" @@ -46,24 +49,37 @@ InnerWidget::InnerWidget( setupContent(); } +bool InnerWidget::canHideDetailsEver() const { + return (_peer->isChat() || _peer->isMegagroup()); +} + +rpl::producer InnerWidget::canHideDetails() const { + using namespace rpl::mappers; + return MembersCountViewer(_peer) + | rpl::map($1 > 0); +} + void InnerWidget::setupContent() { - auto hideDetails = (_peer->isChat() || _peer->isMegagroup()); - auto cover = _content->add(object_ptr(this, _peer)); - if (hideDetails) { - auto hiddenDetailsContent = setupDetailsContent(_content); - auto hiddenDetails = _content->add(object_ptr>( + auto cover = _content->add(object_ptr( + this, + _peer) + ); + cover->setOnlineCount(rpl::single(0)); + auto details = setupDetails(_content); + if (canHideDetailsEver()) { + cover->setToggleShown(canHideDetails()); + _content->add(object_ptr>( this, - std::move(hiddenDetailsContent))); - cover->setHasToggle(true); - cover->toggled() - | rpl::start([=](bool expanded) { - hiddenDetails->toggleAnimated(expanded); - }, _lifetime); - hiddenDetails->hideFast(); + std::move(details)) + )->toggleOn(cover->toggledValue()); } else { - _content->add(setupDetailsContent(_content)); + _content->add(std::move(details)); } + _content->add(setupSharedMedia(_content)); _content->add(object_ptr(this)); + if (auto user = _peer->asUser()) { + _content->add(setupUserActions(_content, user)); + } _content->heightValue() | rpl::start([this](int height) { @@ -71,104 +87,25 @@ void InnerWidget::setupContent() { }, _lifetime); } -object_ptr InnerWidget::setupDetailsContent( +object_ptr InnerWidget::setupDetails( RpWidget *parent) const { auto result = object_ptr(parent); - result->add(object_ptr(result)); result->add(createSkipWidget(result)); - result->add(setupInfoLines(result)); + result->add(setupInfo(result)); result->add(setupMuteToggle(result)); if (auto user = _peer->asUser()) { - setupMainUserButtons(result, user); + setupUserButtons(result, user); + //} else if (auto channel = _peer->asChannel()) { + // if (!channel->isMegagroup()) { + // setupChannelButtons(result, channel); + // } } result->add(createSkipWidget(result)); - return std::move(result); } -object_ptr InnerWidget::setupMuteToggle( - RpWidget *parent) const { - auto result = object_ptr(parent); - auto button = result->add(object_ptr