diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp index 8e41f95cdb..303dd8f4e4 100644 --- a/Telegram/SourceFiles/api/api_polls.cpp +++ b/Telegram/SourceFiles/api/api_polls.cpp @@ -171,8 +171,8 @@ void Polls::sendVotes( hideSending(); _session->updates().applyUpdates(result); - const auto settings = &AyuSettings::getInstance(); - if (!settings->sendReadMessages && settings->markReadAfterAction && item) + const auto& settings = AyuSettings::getInstance(); + if (!settings.sendReadMessages && settings.markReadAfterAction && item) { readHistory(item); } diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp index d6417e048d..18cbbc3c64 100644 --- a/Telegram/SourceFiles/api/api_send_progress.cpp +++ b/Telegram/SourceFiles/api/api_send_progress.cpp @@ -118,8 +118,8 @@ void SendProgressManager::send(const Key &key, int progress) { } // AyuGram sendUploadProgress - const auto settings = &AyuSettings::getInstance(); - if (!settings->sendUploadProgress) + const auto& settings = AyuSettings::getInstance(); + if (!settings.sendUploadProgress) { DEBUG_LOG(("[AyuGram] Don't send upload progress")); return; diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp index 98ad297caf..9dd15bdfba 100644 --- a/Telegram/SourceFiles/api/api_updates.cpp +++ b/Telegram/SourceFiles/api/api_updates.cpp @@ -997,10 +997,10 @@ void Updates::updateOnline(crl::time lastNonIdleTime, bool gotOtherOffline) { }); // AyuGram sendOnlinePackets - const auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); const auto& config = _session->serverConfig(); bool isOnlineOrig = Core::App().hasActiveWindow(&session()); - bool isOnline = settings->sendOnlinePackets && isOnlineOrig; + bool isOnline = settings.sendOnlinePackets && isOnlineOrig; int updateIn = config.onlineUpdatePeriod; Assert(updateIn >= 0); diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 7d2c1c31f5..6fc701b606 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -302,8 +302,8 @@ void ApiWrap::topPromotionDone(const MTPhelp_PromoData &proxy) { base::unixtime::now(), _topPromotionNextRequestTime); - const auto settings = &AyuSettings::getInstance(); - if (settings->disableAds) { + const auto& settings = AyuSettings::getInstance(); + if (settings.disableAds) { _session->data().setTopPromoted(nullptr, QString(), QString()); return; } @@ -507,8 +507,8 @@ void ApiWrap::toggleHistoryArchived( if (archived) { history->setFolder(_session->data().folder(archiveId)); } else { - const auto settings = &AyuSettings::getInstance(); - if (settings->hideAllChatsFolder) { + const auto& settings = AyuSettings::getInstance(); + if (settings.hideAllChatsFolder) { if (const auto window = Core::App().activeWindow()) { if (const auto controller = window->sessionController()) { const auto filters = &_session->data().chatsFilters(); @@ -1384,7 +1384,7 @@ void ApiWrap::migrateFail(not_null peer, const QString &error) { void ApiWrap::markContentsRead( const base::flat_set> &items) { - const auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); auto markedIds = QVector(); auto channelMarkedIds = base::flat_map< @@ -1398,7 +1398,7 @@ void ApiWrap::markContentsRead( continue; } - if (!settings->sendReadMessages && !passthrough) { + if (!settings.sendReadMessages && !passthrough) { continue; } @@ -1430,8 +1430,8 @@ void ApiWrap::markContentsRead(not_null item) { return; } - const auto settings = &AyuSettings::getInstance(); - if (!settings->sendReadMessages && !passthrough) { + const auto& settings = AyuSettings::getInstance(); + if (!settings.sendReadMessages && !passthrough) { return; } @@ -1833,8 +1833,8 @@ void ApiWrap::joinChannel(not_null channel) { using Flag = ChannelDataFlag; chatParticipants().loadSimilarPeers(channel); - const auto settings = &AyuSettings::getInstance(); - if (!settings->collapseSimilarChannels) { + const auto& settings = AyuSettings::getInstance(); + if (!settings.collapseSimilarChannels) { channel->setFlags(channel->flags() | Flag::SimilarExpanded); } } @@ -3461,8 +3461,8 @@ void ApiWrap::forwardMessages( shared->callback(); } - const auto settings = &AyuSettings::getInstance(); - if (!settings->sendReadMessages && settings->markReadAfterAction && history->lastMessage()) + const auto& settings = AyuSettings::getInstance(); + if (!settings.sendReadMessages && settings.markReadAfterAction && history->lastMessage()) { readHistory(history->lastMessage()); } diff --git a/Telegram/SourceFiles/ayu/ayu_infra.cpp b/Telegram/SourceFiles/ayu/ayu_infra.cpp index 456326a43e..5571b36ec6 100644 --- a/Telegram/SourceFiles/ayu/ayu_infra.cpp +++ b/Telegram/SourceFiles/ayu/ayu_infra.cpp @@ -28,10 +28,10 @@ void initLang() { } void initUiSettings() { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); - AyuUiSettings::setMonoFont(settings->monoFont); - AyuUiSettings::setWideMultiplier(settings->wideMultiplier); + AyuUiSettings::setMonoFont(settings.monoFont); + AyuUiSettings::setWideMultiplier(settings.wideMultiplier); } void initDatabase() { diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp index cb2e4e0737..e3ea5e76ec 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.cpp +++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp @@ -219,6 +219,7 @@ AyuGramSettings::AyuGramSettings() { disableAds = true; disableStories = false; disableCustomBackgrounds = true; + showOnlyAddedEmojisAndStickers = false; collapseSimilarChannels = true; hideSimilarChannels = false; @@ -300,32 +301,32 @@ AyuGramSettings::AyuGramSettings() { voiceConfirmation = false; } -void AyuGramSettings::set_sendReadMessages(bool val) { - sendReadMessages = val; +void set_sendReadMessages(bool val) { + settings->sendReadMessages = val; sendReadMessagesReactive = val; } -void AyuGramSettings::set_sendReadStories(bool val) { - sendReadStories = val; +void set_sendReadStories(bool val) { + settings->sendReadStories = val; sendReadStoriesReactive = val; } -void AyuGramSettings::set_sendOnlinePackets(bool val) { - sendOnlinePackets = val; +void set_sendOnlinePackets(bool val) { + settings->sendOnlinePackets = val; sendOnlinePacketsReactive = val; } -void AyuGramSettings::set_sendUploadProgress(bool val) { - sendUploadProgress = val; +void set_sendUploadProgress(bool val) { + settings->sendUploadProgress = val; sendUploadProgressReactive = val; } -void AyuGramSettings::set_sendOfflinePacketAfterOnline(bool val) { - sendOfflinePacketAfterOnline = val; +void set_sendOfflinePacketAfterOnline(bool val) { + settings->sendOfflinePacketAfterOnline = val; sendOfflinePacketAfterOnlineReactive = val; } -void AyuGramSettings::set_ghostModeEnabled(bool val) { +void set_ghostModeEnabled(bool val) { set_sendReadMessages(!val); set_sendReadStories(!val); set_sendOnlinePackets(!val); @@ -339,235 +340,234 @@ void AyuGramSettings::set_ghostModeEnabled(bool val) { } } -void AyuGramSettings::set_markReadAfterAction(bool val) { - markReadAfterAction = val; +void set_markReadAfterAction(bool val) { + settings->markReadAfterAction = val; } -void AyuGramSettings::set_useScheduledMessages(bool val) { - useScheduledMessages = val; +void set_useScheduledMessages(bool val) { + settings->useScheduledMessages = val; } -void AyuGramSettings::set_sendWithoutSound(bool val) { - sendWithoutSound = val; +void set_sendWithoutSound(bool val) { + settings->sendWithoutSound = val; } -void AyuGramSettings::set_saveDeletedMessages(bool val) { - saveDeletedMessages = val; +void set_saveDeletedMessages(bool val) { + settings->saveDeletedMessages = val; } -void AyuGramSettings::set_saveMessagesHistory(bool val) { - saveMessagesHistory = val; +void set_saveMessagesHistory(bool val) { + settings->saveMessagesHistory = val; } -void AyuGramSettings::set_saveForBots(bool val) { - saveForBots = val; +void set_saveForBots(bool val) { + settings->saveForBots = val; } -void AyuGramSettings::set_hideFromBlocked(bool val) { - hideFromBlocked = val; +void set_hideFromBlocked(bool val) { + settings->hideFromBlocked = val; hideFromBlockedReactive = val; } -void AyuGramSettings::set_disableAds(bool val) { - disableAds = val; +void set_disableAds(bool val) { + settings->disableAds = val; } -void AyuGramSettings::set_disableStories(bool val) { - disableStories = val; +void set_disableStories(bool val) { + settings->disableStories = val; } -void AyuGramSettings::set_disableCustomBackgrounds(bool val) { - disableCustomBackgrounds = val; +void set_disableCustomBackgrounds(bool val) { + settings->disableCustomBackgrounds = val; } -void AyuGramSettings::set_showOnlyAddedEmojisAndStickers(bool val) { - showOnlyAddedEmojisAndStickers = val; +void set_showOnlyAddedEmojisAndStickers(bool val) { + settings->showOnlyAddedEmojisAndStickers = val; } -void AyuGramSettings::set_collapseSimilarChannels(bool val) { - collapseSimilarChannels = val; +void set_collapseSimilarChannels(bool val) { + settings->collapseSimilarChannels = val; } -void AyuGramSettings::set_hideSimilarChannels(bool val) { - hideSimilarChannels = val; +void set_hideSimilarChannels(bool val) { + settings->hideSimilarChannels = val; } -void AyuGramSettings::set_wideMultiplier(double val) { - wideMultiplier = val; +void set_wideMultiplier(double val) { + settings->wideMultiplier = val; } -void AyuGramSettings::set_spoofWebviewAsAndroid(bool val) { - spoofWebviewAsAndroid = val; +void set_spoofWebviewAsAndroid(bool val) { + settings->spoofWebviewAsAndroid = val; } -void AyuGramSettings::set_increaseWebviewHeight(bool val) { - increaseWebviewHeight = val; +void set_increaseWebviewHeight(bool val) { + settings->increaseWebviewHeight = val; } -void AyuGramSettings::set_increaseWebviewWidth(bool val) { - increaseWebviewWidth = val; +void set_increaseWebviewWidth(bool val) { + settings->increaseWebviewWidth = val; } -void AyuGramSettings::set_disableNotificationsDelay(bool val) { - disableNotificationsDelay = val; +void set_disableNotificationsDelay(bool val) { + settings->disableNotificationsDelay = val; } -void AyuGramSettings::set_localPremium(bool val) { - localPremium = val; +void set_localPremium(bool val) { + settings->localPremium = val; } -void AyuGramSettings::set_appIcon(QString val) { - appIcon = std::move(val); +void set_appIcon(QString val) { + settings->appIcon = std::move(val); } -void AyuGramSettings::set_simpleQuotesAndReplies(bool val) { - simpleQuotesAndReplies = val; +void set_simpleQuotesAndReplies(bool val) { + settings->simpleQuotesAndReplies = val; } -void AyuGramSettings::set_replaceBottomInfoWithIcons(bool val) { - replaceBottomInfoWithIcons = val; +void set_replaceBottomInfoWithIcons(bool val) { + settings->replaceBottomInfoWithIcons = val; } -void AyuGramSettings::set_deletedMark(QString val) { - deletedMark = std::move(val); - deletedMarkReactive = deletedMark; +void set_deletedMark(QString val) { + settings->deletedMark = std::move(val); + deletedMarkReactive = settings->deletedMark; } -void AyuGramSettings::set_editedMark(QString val) { - editedMark = std::move(val); - editedMarkReactive = editedMark; +void set_editedMark(QString val) { + settings->editedMark = std::move(val); + editedMarkReactive = settings->editedMark; } -void AyuGramSettings::set_recentStickersCount(int val) { - recentStickersCount = val; +void set_recentStickersCount(int val) { + settings->recentStickersCount = val; } -void AyuGramSettings::set_showReactionsPanelInContextMenu(int val) { - showReactionsPanelInContextMenu = val; +void set_showReactionsPanelInContextMenu(int val) { + settings->showReactionsPanelInContextMenu = val; } -void AyuGramSettings::set_showViewsPanelInContextMenu(int val) { - showViewsPanelInContextMenu = val; +void set_showViewsPanelInContextMenu(int val) { + settings->showViewsPanelInContextMenu = val; } -void AyuGramSettings::set_showHideMessageInContextMenu(int val) { - showHideMessageInContextMenu = val; +void set_showHideMessageInContextMenu(int val) { + settings->showHideMessageInContextMenu = val; } -void AyuGramSettings::set_showUserMessagesInContextMenu(int val) { - showUserMessagesInContextMenu = val; +void set_showUserMessagesInContextMenu(int val) { + settings->showUserMessagesInContextMenu = val; } -void AyuGramSettings::set_showMessageDetailsInContextMenu(int val) { - showMessageDetailsInContextMenu = val; +void set_showMessageDetailsInContextMenu(int val) { + settings->showMessageDetailsInContextMenu = val; } -void AyuGramSettings::set_showAttachButtonInMessageField(bool val) { - showAttachButtonInMessageField = val; +void set_showAttachButtonInMessageField(bool val) { + settings->showAttachButtonInMessageField = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showCommandsButtonInMessageField(bool val) { - showCommandsButtonInMessageField = val; +void set_showCommandsButtonInMessageField(bool val) { + settings->showCommandsButtonInMessageField = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showEmojiButtonInMessageField(bool val) { - showEmojiButtonInMessageField = val; +void set_showEmojiButtonInMessageField(bool val) { + settings->showEmojiButtonInMessageField = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showMicrophoneButtonInMessageField(bool val) { - showMicrophoneButtonInMessageField = val; +void set_showMicrophoneButtonInMessageField(bool val) { + settings->showMicrophoneButtonInMessageField = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showAutoDeleteButtonInMessageField(bool val) { - showAutoDeleteButtonInMessageField = val; +void set_showAutoDeleteButtonInMessageField(bool val) { + settings->showAutoDeleteButtonInMessageField = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showAttachPopup(bool val) { - showAttachPopup = val; +void set_showAttachPopup(bool val) { + settings->showAttachPopup = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showEmojiPopup(bool val) { - showEmojiPopup = val; +void set_showEmojiPopup(bool val) { + settings->showEmojiPopup = val; triggerHistoryUpdate(); } -void AyuGramSettings::set_showLReadToggleInDrawer(bool val) { - showLReadToggleInDrawer = val; +void set_showLReadToggleInDrawer(bool val) { + settings->showLReadToggleInDrawer = val; } -void AyuGramSettings::set_showSReadToggleInDrawer(bool val) { - showSReadToggleInDrawer = val; +void set_showSReadToggleInDrawer(bool val) { + settings->showSReadToggleInDrawer = val; } -void AyuGramSettings::set_showGhostToggleInDrawer(bool val) { - showGhostToggleInDrawer = val; +void set_showGhostToggleInDrawer(bool val) { + settings->showGhostToggleInDrawer = val; } -void AyuGramSettings::set_showStreamerToggleInDrawer(bool val) { - showStreamerToggleInDrawer = val; +void set_showStreamerToggleInDrawer(bool val) { + settings->showStreamerToggleInDrawer = val; } -void AyuGramSettings::set_showGhostToggleInTray(bool val) { - showGhostToggleInTray = val; +void set_showGhostToggleInTray(bool val) { + settings->showGhostToggleInTray = val; } -void AyuGramSettings::set_showStreamerToggleInTray(bool val) { - showStreamerToggleInTray = val; +void set_showStreamerToggleInTray(bool val) { + settings->showStreamerToggleInTray = val; } -void AyuGramSettings::set_monoFont(QString val) { - monoFont = val; +void set_monoFont(QString val) { + settings->monoFont = val; } -void AyuGramSettings::set_showPeerId(int val) { - showPeerId = val; +void set_showPeerId(int val) { + settings->showPeerId = val; showPeerIdReactive = val; } -void AyuGramSettings::set_hideNotificationCounters(bool val) { - hideNotificationCounters = val; +void set_hideNotificationCounters(bool val) { + settings->hideNotificationCounters = val; } -void AyuGramSettings::set_hideNotificationBadge(bool val) { - hideNotificationBadge = val; +void set_hideNotificationBadge(bool val) { + settings->hideNotificationBadge = val; } -void AyuGramSettings::set_hideAllChatsFolder(bool val) { - hideAllChatsFolder = val; +void set_hideAllChatsFolder(bool val) { + settings->hideAllChatsFolder = val; } -void AyuGramSettings::set_channelBottomButton(int val) { - channelBottomButton = val; +void set_channelBottomButton(int val) { + settings->channelBottomButton = val; } -void AyuGramSettings::set_showMessageSeconds(bool val) { - showMessageSeconds = val; +void set_showMessageSeconds(bool val) { + settings->showMessageSeconds = val; } -void AyuGramSettings::set_showMessageShot(bool val) { - showMessageShot = val; +void set_showMessageShot(bool val) { + settings->showMessageShot = val; } -void AyuGramSettings::set_stickerConfirmation(bool val) { - stickerConfirmation = val; +void set_stickerConfirmation(bool val) { + settings->stickerConfirmation = val; } -void AyuGramSettings::set_gifConfirmation(bool val) { - gifConfirmation = val; +void set_gifConfirmation(bool val) { + settings->gifConfirmation = val; } -void AyuGramSettings::set_voiceConfirmation(bool val) { - voiceConfirmation = val; +void set_voiceConfirmation(bool val) { + settings->voiceConfirmation = val; } bool isUseScheduledMessages() { - const auto settings = &getInstance(); return isGhostModeActive() && settings->useScheduledMessages; } diff --git a/Telegram/SourceFiles/ayu/ayu_settings.h b/Telegram/SourceFiles/ayu/ayu_settings.h index d4e573b5f9..6bbf81c7c7 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.h +++ b/Telegram/SourceFiles/ayu/ayu_settings.h @@ -95,89 +95,89 @@ public: bool stickerConfirmation; bool gifConfirmation; bool voiceConfirmation; - - void set_sendReadMessages(bool val); - void set_sendReadStories(bool val); - void set_sendOnlinePackets(bool val); - void set_sendUploadProgress(bool val); - void set_sendOfflinePacketAfterOnline(bool val); - - void set_ghostModeEnabled(bool val); - - void set_markReadAfterAction(bool val); - void set_useScheduledMessages(bool val); - void set_sendWithoutSound(bool val); - - void set_saveDeletedMessages(bool val); - void set_saveMessagesHistory(bool val); - - void set_saveForBots(bool val); - - void set_hideFromBlocked(bool val); - - void set_disableAds(bool val); - void set_disableStories(bool val); - void set_disableCustomBackgrounds(bool val); - void set_showOnlyAddedEmojisAndStickers(bool val); - void set_collapseSimilarChannels(bool val); - void set_hideSimilarChannels(bool val); - - void set_wideMultiplier(double val); - - void set_spoofWebviewAsAndroid(bool val); - void set_increaseWebviewHeight(bool val); - void set_increaseWebviewWidth(bool val); - - void set_disableNotificationsDelay(bool val); - void set_localPremium(bool val); - - void set_appIcon(QString val); - void set_simpleQuotesAndReplies(bool val); - void set_replaceBottomInfoWithIcons(bool val); - void set_deletedMark(QString val); - void set_editedMark(QString val); - void set_recentStickersCount(int val); - - void set_showReactionsPanelInContextMenu(int val); - void set_showViewsPanelInContextMenu(int val); - void set_showHideMessageInContextMenu(int val); - void set_showUserMessagesInContextMenu(int val); - void set_showMessageDetailsInContextMenu(int val); - - void set_showAttachButtonInMessageField(bool val); - void set_showCommandsButtonInMessageField(bool val); - void set_showEmojiButtonInMessageField(bool val); - void set_showMicrophoneButtonInMessageField(bool val); - void set_showAutoDeleteButtonInMessageField(bool val); - - void set_showAttachPopup(bool val); - void set_showEmojiPopup(bool val); - - void set_showLReadToggleInDrawer(bool val); - void set_showSReadToggleInDrawer(bool val); - void set_showGhostToggleInDrawer(bool val); - void set_showStreamerToggleInDrawer(bool val); - - void set_showGhostToggleInTray(bool val); - void set_showStreamerToggleInTray(bool val); - - void set_monoFont(QString val); - - void set_hideNotificationCounters(bool val); - void set_hideNotificationBadge(bool val); - void set_hideAllChatsFolder(bool val); - - void set_channelBottomButton(int val); - - void set_showPeerId(int val); - void set_showMessageSeconds(bool val); - void set_showMessageShot(bool val); - - void set_stickerConfirmation(bool val); - void set_gifConfirmation(bool val); - void set_voiceConfirmation(bool val); }; +void set_sendReadMessages(bool val); +void set_sendReadStories(bool val); +void set_sendOnlinePackets(bool val); +void set_sendUploadProgress(bool val); +void set_sendOfflinePacketAfterOnline(bool val); + +void set_ghostModeEnabled(bool val); + +void set_markReadAfterAction(bool val); +void set_useScheduledMessages(bool val); +void set_sendWithoutSound(bool val); + +void set_saveDeletedMessages(bool val); +void set_saveMessagesHistory(bool val); + +void set_saveForBots(bool val); + +void set_hideFromBlocked(bool val); + +void set_disableAds(bool val); +void set_disableStories(bool val); +void set_disableCustomBackgrounds(bool val); +void set_showOnlyAddedEmojisAndStickers(bool val); +void set_collapseSimilarChannels(bool val); +void set_hideSimilarChannels(bool val); + +void set_wideMultiplier(double val); + +void set_spoofWebviewAsAndroid(bool val); +void set_increaseWebviewHeight(bool val); +void set_increaseWebviewWidth(bool val); + +void set_disableNotificationsDelay(bool val); +void set_localPremium(bool val); + +void set_appIcon(QString val); +void set_simpleQuotesAndReplies(bool val); +void set_replaceBottomInfoWithIcons(bool val); +void set_deletedMark(QString val); +void set_editedMark(QString val); +void set_recentStickersCount(int val); + +void set_showReactionsPanelInContextMenu(int val); +void set_showViewsPanelInContextMenu(int val); +void set_showHideMessageInContextMenu(int val); +void set_showUserMessagesInContextMenu(int val); +void set_showMessageDetailsInContextMenu(int val); + +void set_showAttachButtonInMessageField(bool val); +void set_showCommandsButtonInMessageField(bool val); +void set_showEmojiButtonInMessageField(bool val); +void set_showMicrophoneButtonInMessageField(bool val); +void set_showAutoDeleteButtonInMessageField(bool val); + +void set_showAttachPopup(bool val); +void set_showEmojiPopup(bool val); + +void set_showLReadToggleInDrawer(bool val); +void set_showSReadToggleInDrawer(bool val); +void set_showGhostToggleInDrawer(bool val); +void set_showStreamerToggleInDrawer(bool val); + +void set_showGhostToggleInTray(bool val); +void set_showStreamerToggleInTray(bool val); + +void set_monoFont(QString val); + +void set_hideNotificationCounters(bool val); +void set_hideNotificationBadge(bool val); +void set_hideAllChatsFolder(bool val); + +void set_channelBottomButton(int val); + +void set_showPeerId(int val); +void set_showMessageSeconds(bool val); +void set_showMessageShot(bool val); + +void set_stickerConfirmation(bool val); +void set_gifConfirmation(bool val); +void set_voiceConfirmation(bool val); + NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT( AyuGramSettings, sendReadMessages, @@ -195,6 +195,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT( disableAds, disableStories, disableCustomBackgrounds, + showOnlyAddedEmojisAndStickers, collapseSimilarChannels, hideSimilarChannels, wideMultiplier, diff --git a/Telegram/SourceFiles/ayu/ayu_worker.cpp b/Telegram/SourceFiles/ayu/ayu_worker.cpp index 089dda946b..6ed8a19335 100644 --- a/Telegram/SourceFiles/ayu/ayu_worker.cpp +++ b/Telegram/SourceFiles/ayu/ayu_worker.cpp @@ -42,8 +42,8 @@ void runOnce() { lateInit(); } - const auto settings = &AyuSettings::getInstance(); - if (!settings->sendOfflinePacketAfterOnline) { + const auto& settings = AyuSettings::getInstance(); + if (!settings.sendOfflinePacketAfterOnline) { return; } diff --git a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp index 6ce19c20d7..29b542f66c 100644 --- a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp +++ b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp @@ -14,7 +14,7 @@ static QImage LAST_LOADED_NO_MARGIN; namespace AyuAssets { void loadAppIco() { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); QString appDataPath = QDir::fromNativeSeparators(qgetenv("APPDATA")); QString tempIconPath = appDataPath + "/AyuGram.ico"; @@ -26,20 +26,20 @@ void loadAppIco() { f.remove(); } f.close(); - QFile::copy(qsl(":/gui/art/ayu/%1/app_icon.ico").arg(settings->appIcon), tempIconPath); + QFile::copy(qsl(":/gui/art/ayu/%1/app_icon.ico").arg(settings.appIcon), tempIconPath); } void loadIcons() { - auto settings = &AyuSettings::getInstance(); - if (LAST_LOADED_NAME != settings->appIcon) { - LAST_LOADED_NAME = settings->appIcon; + const auto& settings = AyuSettings::getInstance(); + if (LAST_LOADED_NAME != settings.appIcon) { + LAST_LOADED_NAME = settings.appIcon; #ifdef Q_OS_MAC - LAST_LOADED = QImage(qsl(":/gui/art/ayu/%1/app_macos.png").arg(settings->appIcon)); + LAST_LOADED = QImage(qsl(":/gui/art/ayu/%1/app_macos.png").arg(settings.appIcon)); #else - LAST_LOADED = QImage(qsl(":/gui/art/ayu/%1/app.png").arg(settings->appIcon)); + LAST_LOADED = QImage(qsl(":/gui/art/ayu/%1/app.png").arg(settings.appIcon)); #endif - LAST_LOADED_NO_MARGIN = QImage(qsl(":/gui/art/ayu/%1/app_preview.png").arg(settings->appIcon)); + LAST_LOADED_NO_MARGIN = QImage(qsl(":/gui/art/ayu/%1/app_preview.png").arg(settings.appIcon)); } } diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp index 149f32a125..c077b9aeef 100644 --- a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp +++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp @@ -87,8 +87,7 @@ void EditDeletedMarkBox::resizeEvent(QResizeEvent *e) { } void EditDeletedMarkBox::save() { - const auto settings = &AyuSettings::getInstance(); - settings->set_deletedMark(_text->getLastText()); + AyuSettings::set_deletedMark(_text->getLastText()); AyuSettings::save(); closeBox(); diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp index ec4bbc9afe..1cc86f7aef 100644 --- a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp +++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp @@ -86,8 +86,7 @@ void EditEditedMarkBox::resizeEvent(QResizeEvent *e) { } void EditEditedMarkBox::save() { - const auto settings = &AyuSettings::getInstance(); - settings->set_editedMark(_text->getLastText()); + AyuSettings::set_editedMark(_text->getLastText()); AyuSettings::save(); closeBox(); diff --git a/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp b/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp index de8e4b4252..9b69d02cd2 100644 --- a/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp +++ b/Telegram/SourceFiles/ayu/ui/boxes/message_shot_box.cpp @@ -38,8 +38,8 @@ void MessageShotBox::prepare() { void MessageShotBox::setupContent() { _selectedPalette = std::make_shared(); - const auto settings = &AyuSettings::getInstance(); - const auto savedShowColorfulReplies = !settings->simpleQuotesAndReplies; + const auto& settings = AyuSettings::getInstance(); + const auto savedShowColorfulReplies = !settings.simpleQuotesAndReplies; using namespace Settings; @@ -164,8 +164,7 @@ void MessageShotBox::setupContent() { ) | start_with_next( [=](bool enabled) { - const auto settings = &AyuSettings::getInstance(); - settings->set_simpleQuotesAndReplies(!enabled); + AyuSettings::set_simpleQuotesAndReplies(!enabled); _config.st = std::make_shared(_config.st.get()); updatePreview(); @@ -209,8 +208,7 @@ void MessageShotBox::setupContent() { AyuFeatures::MessageShot::resetDefaultSelected(); AyuFeatures::MessageShot::resetShotConfig(); - const auto settings = &AyuSettings::getInstance(); - settings->set_simpleQuotesAndReplies(!savedShowColorfulReplies); + AyuSettings::set_simpleQuotesAndReplies(!savedShowColorfulReplies); }, content->lifetime()); diff --git a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp index 36330b1664..700deb0a3d 100644 --- a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp +++ b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp @@ -197,8 +197,8 @@ void AddHistoryAction(not_null menu, HistoryItem *item) { } void AddHideMessageAction(not_null menu, HistoryItem *item) { - const auto settings = &AyuSettings::getInstance(); - if (!needToShowItem(settings->showHideMessageInContextMenu)) { + const auto& settings = AyuSettings::getInstance(); + if (!needToShowItem(settings.showHideMessageInContextMenu)) { return; } @@ -220,8 +220,8 @@ void AddHideMessageAction(not_null menu, HistoryItem *item) { } void AddUserMessagesAction(not_null menu, HistoryItem *item) { - const auto settings = &AyuSettings::getInstance(); - if (!needToShowItem(settings->showUserMessagesInContextMenu)) { + const auto& settings = AyuSettings::getInstance(); + if (!needToShowItem(settings.showUserMessagesInContextMenu)) { return; } @@ -245,8 +245,8 @@ void AddUserMessagesAction(not_null menu, HistoryItem *item) { } void AddMessageDetailsAction(not_null menu, HistoryItem *item) { - const auto settings = &AyuSettings::getInstance(); - if (!needToShowItem(settings->showMessageDetailsInContextMenu)) { + const auto& settings = AyuSettings::getInstance(); + if (!needToShowItem(settings.showMessageDetailsInContextMenu)) { return; } @@ -464,8 +464,8 @@ void AddReadUntilAction(not_null menu, HistoryItem *item) { return; } - const auto settings = &AyuSettings::getInstance(); - if (settings->sendReadMessages) { + const auto& settings = AyuSettings::getInstance(); + if (settings.sendReadMessages) { return; } diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp index d99122e566..4be98b0355 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp @@ -121,7 +121,7 @@ void IconPicker::paintEvent(QPaintEvent *e) { } void IconPicker::mousePressEvent(QMouseEvent *e) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); auto changed = false; auto x = e->pos().x(); @@ -139,8 +139,8 @@ void IconPicker::mousePressEvent(QMouseEvent *e) { break; } - if (settings->appIcon != iconName) { - wasSelected = settings->appIcon; + if (settings.appIcon != iconName) { + wasSelected = settings.appIcon; animation.start( [=] { @@ -152,7 +152,7 @@ void IconPicker::mousePressEvent(QMouseEvent *e) { anim::easeOutCubic ); - settings->set_appIcon(iconName); + AyuSettings::set_appIcon(iconName); changed = true; break; } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index b6cd54754c..9ace785559 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -464,43 +464,43 @@ Ayu::Ayu( } void SetupGhostModeToggle(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSubsectionTitle(container, tr::ayu_GhostEssentialsHeader()); std::vector checkboxes{ NestedEntry{ - tr::ayu_DontReadMessages(tr::now), !settings->sendReadMessages, [=](bool enabled) + tr::ayu_DontReadMessages(tr::now), !settings.sendReadMessages, [=](bool enabled) { - settings->set_sendReadMessages(!enabled); + AyuSettings::set_sendReadMessages(!enabled); AyuSettings::save(); } }, NestedEntry{ - tr::ayu_DontReadStories(tr::now), !settings->sendReadStories, [=](bool enabled) + tr::ayu_DontReadStories(tr::now), !settings.sendReadStories, [=](bool enabled) { - settings->set_sendReadStories(!enabled); + AyuSettings::set_sendReadStories(!enabled); AyuSettings::save(); } }, NestedEntry{ - tr::ayu_DontSendOnlinePackets(tr::now), !settings->sendOnlinePackets, [=](bool enabled) + tr::ayu_DontSendOnlinePackets(tr::now), !settings.sendOnlinePackets, [=](bool enabled) { - settings->set_sendOnlinePackets(!enabled); + AyuSettings::set_sendOnlinePackets(!enabled); AyuSettings::save(); } }, NestedEntry{ - tr::ayu_DontSendUploadProgress(tr::now), !settings->sendUploadProgress, [=](bool enabled) + tr::ayu_DontSendUploadProgress(tr::now), !settings.sendUploadProgress, [=](bool enabled) { - settings->set_sendUploadProgress(!enabled); + AyuSettings::set_sendUploadProgress(!enabled); AyuSettings::save(); } }, NestedEntry{ - tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings->sendOfflinePacketAfterOnline, [=](bool enabled) + tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings.sendOfflinePacketAfterOnline, [=](bool enabled) { - settings->set_sendOfflinePacketAfterOnline(enabled); + AyuSettings::set_sendOfflinePacketAfterOnline(enabled); AyuSettings::save(); } }, @@ -510,13 +510,13 @@ void SetupGhostModeToggle(not_null container) { } void SetupGhostEssentials(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); SetupGhostModeToggle(container); - auto markReadAfterActionVal = container->lifetime().make_state>(settings->markReadAfterAction); + auto markReadAfterActionVal = container->lifetime().make_state>(settings.sendOfflinePacketAfterOnline); auto useScheduledMessagesVal = container->lifetime().make_state>(settings->useScheduledMessages); + bool>>(settings.useScheduledMessages); AddButtonWithIcon( container, @@ -528,13 +528,13 @@ void SetupGhostEssentials(not_null container) { ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->markReadAfterAction); + return (enabled != settings.sendOfflinePacketAfterOnline); }) | start_with_next( [=](bool enabled) { - settings->set_markReadAfterAction(enabled); + AyuSettings::set_markReadAfterAction(enabled); if (enabled) { - settings->set_useScheduledMessages(false); + AyuSettings::set_useScheduledMessages(false); useScheduledMessagesVal->force_assign(false); } @@ -555,13 +555,13 @@ void SetupGhostEssentials(not_null container) { ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->useScheduledMessages); + return (enabled != settings.useScheduledMessages); }) | start_with_next( [=](bool enabled) { - settings->set_useScheduledMessages(enabled); + AyuSettings::set_useScheduledMessages(enabled); if (enabled) { - settings->set_markReadAfterAction(false); + AyuSettings::set_markReadAfterAction(false); markReadAfterActionVal->force_assign(false); } @@ -577,16 +577,16 @@ void SetupGhostEssentials(not_null container) { tr::ayu_SendWithoutSoundByDefault(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->sendWithoutSound) + rpl::single(settings.sendWithoutSound) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->sendWithoutSound); + return (enabled != settings.sendWithoutSound); }) | start_with_next( [=](bool enabled) { - settings->set_sendWithoutSound(enabled); + AyuSettings::set_sendWithoutSound(enabled); AyuSettings::save(); }, container->lifetime()); @@ -595,7 +595,7 @@ void SetupGhostEssentials(not_null container) { } void SetupSpyEssentials(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSubsectionTitle(container, tr::ayu_SpyEssentialsHeader()); @@ -604,16 +604,16 @@ void SetupSpyEssentials(not_null container) { tr::ayu_SaveDeletedMessages(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->saveDeletedMessages) + rpl::single(settings.saveDeletedMessages) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->saveDeletedMessages); + return (enabled != settings.saveDeletedMessages); }) | start_with_next( [=](bool enabled) { - settings->set_saveDeletedMessages(enabled); + AyuSettings::set_saveDeletedMessages(enabled); AyuSettings::save(); }, container->lifetime()); @@ -623,16 +623,16 @@ void SetupSpyEssentials(not_null container) { tr::ayu_SaveMessagesHistory(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->saveMessagesHistory) + rpl::single(settings.saveMessagesHistory) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->saveMessagesHistory); + return (enabled != settings.saveMessagesHistory); }) | start_with_next( [=](bool enabled) { - settings->set_saveMessagesHistory(enabled); + AyuSettings::set_saveMessagesHistory(enabled); AyuSettings::save(); }, container->lifetime()); @@ -646,23 +646,23 @@ void SetupSpyEssentials(not_null container) { tr::ayu_MessageSavingSaveForBots(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->saveForBots) + rpl::single(settings.saveForBots) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->saveForBots); + return (enabled != settings.saveForBots); }) | start_with_next( [=](bool enabled) { - settings->set_saveForBots(enabled); + AyuSettings::set_saveForBots(enabled); AyuSettings::save(); }, container->lifetime()); } void SetupMessageFilters(not_null container) { - auto settings = &AyuSettings::getInstance(); + auto& settings = AyuSettings::getInstance(); AddSubsectionTitle(container, tr::ayu_RegexFilters()); @@ -671,23 +671,23 @@ void SetupMessageFilters(not_null container) { tr::ayu_FiltersHideFromBlocked(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->hideFromBlocked) + rpl::single(settings.hideFromBlocked) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->hideFromBlocked); + return (enabled != settings.hideFromBlocked); }) | start_with_next( [=](bool enabled) { - settings->set_hideFromBlocked(enabled); + AyuSettings::set_hideFromBlocked(enabled); AyuSettings::save(); }, container->lifetime()); } void SetupQoLToggles(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSubsectionTitle(container, tr::ayu_QoLTogglesHeader()); @@ -696,16 +696,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_DisableAds(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->disableAds) + rpl::single(settings.disableAds) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->disableAds); + return (enabled != settings.disableAds); }) | start_with_next( [=](bool enabled) { - settings->set_disableAds(enabled); + AyuSettings::set_disableAds(enabled); AyuSettings::save(); }, container->lifetime()); @@ -715,16 +715,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_DisableStories(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->disableStories) + rpl::single(settings.disableStories) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->disableStories); + return (enabled != settings.disableStories); }) | start_with_next( [=](bool enabled) { - settings->set_disableStories(enabled); + AyuSettings::set_disableStories(enabled); AyuSettings::save(); }, container->lifetime()); @@ -734,16 +734,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_DisableCustomBackgrounds(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->disableCustomBackgrounds) + rpl::single(settings.disableCustomBackgrounds) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->disableCustomBackgrounds); + return (enabled != settings.disableCustomBackgrounds); }) | start_with_next( [=](bool enabled) { - settings->set_disableCustomBackgrounds(enabled); + AyuSettings::set_disableCustomBackgrounds(enabled); AyuSettings::save(); }, container->lifetime()); @@ -753,32 +753,32 @@ void SetupQoLToggles(not_null container) { tr::ayu_SimpleQuotesAndReplies(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->simpleQuotesAndReplies) + rpl::single(settings.simpleQuotesAndReplies) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->simpleQuotesAndReplies); + return (enabled != settings.simpleQuotesAndReplies); }) | start_with_next( [=](bool enabled) { - settings->set_simpleQuotesAndReplies(enabled); + AyuSettings::set_simpleQuotesAndReplies(enabled); AyuSettings::save(); }, container->lifetime()); std::vector checkboxes = { NestedEntry{ - tr::ayu_CollapseSimilarChannels(tr::now), settings->collapseSimilarChannels, [=](bool enabled) + tr::ayu_CollapseSimilarChannels(tr::now), settings.collapseSimilarChannels, [=](bool enabled) { - settings->set_collapseSimilarChannels(enabled); + AyuSettings::set_collapseSimilarChannels(enabled); AyuSettings::save(); } }, NestedEntry{ - tr::ayu_HideSimilarChannelsTab(tr::now), settings->hideSimilarChannels, [=](bool enabled) + tr::ayu_HideSimilarChannelsTab(tr::now), settings.hideSimilarChannels, [=](bool enabled) { - settings->set_hideSimilarChannels(enabled); + AyuSettings::set_hideSimilarChannels(enabled); AyuSettings::save(); } } @@ -795,16 +795,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_DisableNotificationsDelay(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->disableNotificationsDelay) + rpl::single(settings.disableNotificationsDelay) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->disableNotificationsDelay); + return (enabled != settings.disableNotificationsDelay); }) | start_with_next( [=](bool enabled) { - settings->set_disableNotificationsDelay(enabled); + AyuSettings::set_disableNotificationsDelay(enabled); AyuSettings::save(); }, container->lifetime()); @@ -814,16 +814,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_ShowOnlyAddedEmojisAndStickers(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->showOnlyAddedEmojisAndStickers) + rpl::single(settings.showOnlyAddedEmojisAndStickers) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showOnlyAddedEmojisAndStickers); + return (enabled != settings.showOnlyAddedEmojisAndStickers); }) | start_with_next( [=](bool enabled) { - settings->set_showOnlyAddedEmojisAndStickers(enabled); + AyuSettings::set_showOnlyAddedEmojisAndStickers(enabled); AyuSettings::save(); }, container->lifetime()); @@ -833,16 +833,16 @@ void SetupQoLToggles(not_null container) { tr::ayu_LocalPremium(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->localPremium) + rpl::single(settings.localPremium) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->localPremium); + return (enabled != settings.localPremium); }) | start_with_next( [=](bool enabled) { - settings->set_localPremium(enabled); + AyuSettings::set_localPremium(enabled); AyuSettings::save(); }, container->lifetime()); @@ -856,7 +856,7 @@ void SetupAppIcon(not_null container) { void SetupContextMenuElements(not_null container, not_null controller) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSkip(container); AddSubsectionTitle(container, tr::ayu_ContextMenuElementsHeader()); @@ -870,67 +870,67 @@ void SetupContextMenuElements(not_null container, AddChooseButtonWithIconAndRightText( container, controller, - settings->showReactionsPanelInContextMenu, + settings.showReactionsPanelInContextMenu, options, tr::ayu_SettingsContextMenuReactionsPanel(), tr::ayu_SettingsContextMenuTitle(), st::menuIconReactions, [=](int index) { - settings->set_showReactionsPanelInContextMenu(index); + AyuSettings::set_showReactionsPanelInContextMenu(index); AyuSettings::save(); }); AddChooseButtonWithIconAndRightText( container, controller, - settings->showViewsPanelInContextMenu, + settings.showViewsPanelInContextMenu, options, tr::ayu_SettingsContextMenuViewsPanel(), tr::ayu_SettingsContextMenuTitle(), st::menuIconShowInChat, [=](int index) { - settings->set_showViewsPanelInContextMenu(index); + AyuSettings::set_showViewsPanelInContextMenu(index); AyuSettings::save(); }); AddChooseButtonWithIconAndRightText( container, controller, - settings->showHideMessageInContextMenu, + settings.showHideMessageInContextMenu, options, tr::ayu_ContextHideMessage(), tr::ayu_SettingsContextMenuTitle(), st::menuIconClear, [=](int index) { - settings->set_showHideMessageInContextMenu(index); + AyuSettings::set_showHideMessageInContextMenu(index); AyuSettings::save(); }); AddChooseButtonWithIconAndRightText( container, controller, - settings->showUserMessagesInContextMenu, + settings.showUserMessagesInContextMenu, options, tr::ayu_UserMessagesMenuText(), tr::ayu_SettingsContextMenuTitle(), st::menuIconTTL, [=](int index) { - settings->set_showUserMessagesInContextMenu(index); + AyuSettings::set_showUserMessagesInContextMenu(index); AyuSettings::save(); }); AddChooseButtonWithIconAndRightText( container, controller, - settings->showMessageDetailsInContextMenu, + settings.showMessageDetailsInContextMenu, options, tr::ayu_MessageDetailsPC(), tr::ayu_SettingsContextMenuTitle(), st::menuIconInfo, [=](int index) { - settings->set_showMessageDetailsInContextMenu(index); + AyuSettings::set_showMessageDetailsInContextMenu(index); AyuSettings::save(); }); @@ -939,7 +939,7 @@ void SetupContextMenuElements(not_null container, } void SetupMessageFieldElements(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSkip(container); AddSubsectionTitle(container, tr::ayu_MessageFieldElementsHeader()); @@ -950,16 +950,16 @@ void SetupMessageFieldElements(not_null container) { st::settingsButton, {&st::messageFieldAttachIcon} )->toggleOn( - rpl::single(settings->showAttachButtonInMessageField) + rpl::single(settings.showAttachButtonInMessageField) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showAttachButtonInMessageField); + return (enabled != settings.showAttachButtonInMessageField); }) | start_with_next( [=](bool enabled) { - settings->set_showAttachButtonInMessageField(enabled); + AyuSettings::set_showAttachButtonInMessageField(enabled); AyuSettings::save(); }, container->lifetime()); @@ -970,16 +970,16 @@ void SetupMessageFieldElements(not_null container) { st::settingsButton, {&st::messageFieldCommandsIcon} )->toggleOn( - rpl::single(settings->showCommandsButtonInMessageField) + rpl::single(settings.showCommandsButtonInMessageField) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showCommandsButtonInMessageField); + return (enabled != settings.showCommandsButtonInMessageField); }) | start_with_next( [=](bool enabled) { - settings->set_showCommandsButtonInMessageField(enabled); + AyuSettings::set_showCommandsButtonInMessageField(enabled); AyuSettings::save(); }, container->lifetime()); @@ -990,16 +990,16 @@ void SetupMessageFieldElements(not_null container) { st::settingsButton, {&st::messageFieldTTLIcon} )->toggleOn( - rpl::single(settings->showAutoDeleteButtonInMessageField) + rpl::single(settings.showAutoDeleteButtonInMessageField) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showAutoDeleteButtonInMessageField); + return (enabled != settings.showAutoDeleteButtonInMessageField); }) | start_with_next( [=](bool enabled) { - settings->set_showAutoDeleteButtonInMessageField(enabled); + AyuSettings::set_showAutoDeleteButtonInMessageField(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1010,16 +1010,16 @@ void SetupMessageFieldElements(not_null container) { st::settingsButton, {&st::messageFieldEmojiIcon} )->toggleOn( - rpl::single(settings->showEmojiButtonInMessageField) + rpl::single(settings.showEmojiButtonInMessageField) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showEmojiButtonInMessageField); + return (enabled != settings.showEmojiButtonInMessageField); }) | start_with_next( [=](bool enabled) { - settings->set_showEmojiButtonInMessageField(enabled); + AyuSettings::set_showEmojiButtonInMessageField(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1030,16 +1030,16 @@ void SetupMessageFieldElements(not_null container) { st::settingsButton, {&st::messageFieldVoiceIcon} )->toggleOn( - rpl::single(settings->showMicrophoneButtonInMessageField) + rpl::single(settings.showMicrophoneButtonInMessageField) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showMicrophoneButtonInMessageField); + return (enabled != settings.showMicrophoneButtonInMessageField); }) | start_with_next( [=](bool enabled) { - settings->set_showMicrophoneButtonInMessageField(enabled); + AyuSettings::set_showMicrophoneButtonInMessageField(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1049,7 +1049,7 @@ void SetupMessageFieldElements(not_null container) { } void SetupMessageFieldPopups(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSkip(container); AddSubsectionTitle(container, tr::ayu_MessageFieldPopupsHeader()); @@ -1060,16 +1060,16 @@ void SetupMessageFieldPopups(not_null container) { st::settingsButton, {&st::messageFieldAttachIcon} )->toggleOn( - rpl::single(settings->showAttachPopup) + rpl::single(settings.showAttachPopup) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showAttachPopup); + return (enabled != settings.showAttachPopup); }) | start_with_next( [=](bool enabled) { - settings->set_showAttachPopup(enabled); + AyuSettings::set_showAttachPopup(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1080,16 +1080,16 @@ void SetupMessageFieldPopups(not_null container) { st::settingsButton, {&st::messageFieldEmojiIcon} )->toggleOn( - rpl::single(settings->showEmojiPopup) + rpl::single(settings.showEmojiPopup) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showEmojiPopup); + return (enabled != settings.showEmojiPopup); }) | start_with_next( [=](bool enabled) { - settings->set_showEmojiPopup(enabled); + AyuSettings::set_showEmojiPopup(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1099,7 +1099,7 @@ void SetupMessageFieldPopups(not_null container) { } void SetupDrawerElements(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSkip(container); AddSubsectionTitle(container, tr::ayu_DrawerElementsHeader()); @@ -1110,16 +1110,16 @@ void SetupDrawerElements(not_null container) { st::settingsButton, {&st::ayuLReadMenuIcon} )->toggleOn( - rpl::single(settings->showLReadToggleInDrawer) + rpl::single(settings.showLReadToggleInDrawer) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showLReadToggleInDrawer); + return (enabled != settings.showLReadToggleInDrawer); }) | start_with_next( [=](bool enabled) { - settings->set_showLReadToggleInDrawer(enabled); + AyuSettings::set_showLReadToggleInDrawer(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1130,16 +1130,16 @@ void SetupDrawerElements(not_null container) { st::settingsButton, {&st::ayuSReadMenuIcon} )->toggleOn( - rpl::single(settings->showSReadToggleInDrawer) + rpl::single(settings.showSReadToggleInDrawer) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showSReadToggleInDrawer); + return (enabled != settings.showSReadToggleInDrawer); }) | start_with_next( [=](bool enabled) { - settings->set_showSReadToggleInDrawer(enabled); + AyuSettings::set_showSReadToggleInDrawer(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1150,16 +1150,16 @@ void SetupDrawerElements(not_null container) { st::settingsButton, {&st::ayuGhostIcon} )->toggleOn( - rpl::single(settings->showGhostToggleInDrawer) + rpl::single(settings.showGhostToggleInDrawer) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showGhostToggleInDrawer); + return (enabled != settings.showGhostToggleInDrawer); }) | start_with_next( [=](bool enabled) { - settings->set_showGhostToggleInDrawer(enabled); + AyuSettings::set_showGhostToggleInDrawer(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1171,16 +1171,16 @@ void SetupDrawerElements(not_null container) { st::settingsButton, {&st::ayuStreamerModeMenuIcon} )->toggleOn( - rpl::single(settings->showStreamerToggleInDrawer) + rpl::single(settings.showStreamerToggleInDrawer) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showStreamerToggleInDrawer); + return (enabled != settings.showStreamerToggleInDrawer); }) | start_with_next( [=](bool enabled) { - settings->set_showStreamerToggleInDrawer(enabled); + AyuSettings::set_showStreamerToggleInDrawer(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1188,7 +1188,7 @@ void SetupDrawerElements(not_null container) { } void SetupTrayElements(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); AddSkip(container); AddSubsectionTitle(container, tr::ayu_TrayElementsHeader()); @@ -1198,16 +1198,16 @@ void SetupTrayElements(not_null container) { tr::ayu_EnableGhostModeTray(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->showGhostToggleInTray) + rpl::single(settings.showGhostToggleInTray) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showGhostToggleInTray); + return (enabled != settings.showGhostToggleInTray); }) | start_with_next( [=](bool enabled) { - settings->set_showGhostToggleInTray(enabled); + AyuSettings::set_showGhostToggleInTray(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1218,16 +1218,16 @@ void SetupTrayElements(not_null container) { tr::ayu_EnableStreamerModeTray(), st::settingsButtonNoIcon )->toggleOn( - rpl::single(settings->showStreamerToggleInTray) + rpl::single(settings.showStreamerToggleInTray) )->toggledValue( ) | rpl::filter( [=](bool enabled) { - return (enabled != settings->showStreamerToggleInTray); + return (enabled != settings.showStreamerToggleInTray); }) | start_with_next( [=](bool enabled) { - settings->set_showStreamerToggleInTray(enabled); + AyuSettings::set_showStreamerToggleInTray(enabled); AyuSettings::save(); }, container->lifetime()); @@ -1236,7 +1236,7 @@ void SetupTrayElements(not_null container) { void SetupShowPeerId(not_null container, not_null controller) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); const auto options = std::vector{ QString(tr::ayu_SettingsShowID_Hide(tr::now)), @@ -1263,14 +1263,14 @@ void SetupShowPeerId(not_null container, { const auto save = [=](int index) { - settings->set_showPeerId(index); + AyuSettings::set_showPeerId(index); AyuSettings::save(); }; SingleChoiceBox(box, { .title = tr::ayu_SettingsShowID(), .options = options, - .initialSelection = settings->showPeerId, + .initialSelection = settings.showPeerId, .callback = save, }); })); @@ -1278,7 +1278,7 @@ void SetupShowPeerId(not_null container, } void SetupRecentStickersLimitSlider(not_null container) { - auto settings = &AyuSettings::getInstance(); + const auto& settings = AyuSettings::getInstance(); container->add( object_ptr