void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved out value notification settings for filters to separated file.

Browse source
This commit is contained in:
23rd 2024-11-02 17:13:55 +03:00
parent b11b5caeb3
commit b83d943841
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/data/data_unread_value.cpp
View file

@ -7,10 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_unread_value.h" #include "data/data_unread_value.h"
#include "core/application.h"
#include "core/core_settings.h"
#include "data/data_chat_filters.h" #include "data/data_chat_filters.h"
#include "data/data_folder.h" #include "data/data_folder.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "window/notifications_manager.h"
namespace Data { namespace Data {
namespace { namespace {
@ -50,4 +53,16 @@ rpl::producer<Dialogs::UnreadState> UnreadStateValue(
}); });
} }
rpl::producer<bool> IncludeMutedCounterFoldersValue() {
using namespace Window::Notifications;
return rpl::single(rpl::empty_value()) | rpl::then(
Core::App().notifications().settingsChanged(
) | rpl::filter(
rpl::mappers::_1 == ChangeType::IncludeMuted
) | rpl::to_empty
) | rpl::map([] {
return Core::App().settings().includeMutedCounterFolders();
});
}
} // namespace Data } // namespace Data

2
Telegram/SourceFiles/data/data_unread_value.h
View file

@ -25,4 +25,6 @@ namespace Data {
not_null<Main::Session*> session, not_null<Main::Session*> session,
FilterId filterId); FilterId filterId);
[[nodiscard]] rpl::producer<bool> IncludeMutedCounterFoldersValue();
} // namespace Data } // namespace Data

15
Telegram/SourceFiles/window/window_filters_menu.cpp
View file

@ -13,12 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_main_menu.h" #include "window/window_main_menu.h"
#include "window/window_peer_menu.h" #include "window/window_peer_menu.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "core/application.h"
#include "core/core_settings.h"
#include "window/notifications_manager.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_chat_filters.h" #include "data/data_chat_filters.h"
#include "data/data_folder.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_peer_values.h" #include "data/data_peer_values.h"
#include "data/data_premium_limits.h" #include "data/data_premium_limits.h"
@ -53,14 +49,7 @@ FiltersMenu::FiltersMenu(
, _scroll(&_outer) , _scroll(&_outer)
, _container( , _container(
_scroll.setOwnedWidget( _scroll.setOwnedWidget(
object_ptr<Ui::VerticalLayout>(&_scroll))) object_ptr<Ui::VerticalLayout>(&_scroll))) {
, _includeMuted(Core::App().settings().includeMutedCounterFolders()) {
Core::App().notifications().settingsChanged(
) | rpl::filter(
rpl::mappers::_1 == Window::Notifications::ChangeType::IncludeMuted
) | rpl::start_with_next([=] {
_includeMuted = Core::App().settings().includeMutedCounterFolders();
}, _outer.lifetime());
_drag.timer.setCallback([=] { _drag.timer.setCallback([=] {
if (_drag.filterId >= 0) { if (_drag.filterId >= 0) {
@ -276,7 +265,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
if (id >= 0) { if (id >= 0) {
rpl::combine( rpl::combine(
Data::UnreadStateValue(&_session->session(), id), Data::UnreadStateValue(&_session->session(), id),
_includeMuted.value() Data::IncludeMutedCounterFoldersValue()
) | rpl::start_with_next([=]( ) | rpl::start_with_next([=](
const Dialogs::UnreadState &state, const Dialogs::UnreadState &state,
bool includeMuted) { bool includeMuted) {