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

chore: refactor & reformat settings

Browse source
This commit is contained in:
AlexeyZavar 2025-06-08 11:00:04 +03:00
parent 20976ac9f9
commit 69420f5750
71 changed files with 297 additions and 389 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Telegram/CMakeLists.txt
View file

@ -129,8 +129,6 @@ set(ayugram_files
ayu/ui/ayu_logo.h ayu/ui/ayu_logo.h
ayu/ui/utils/ayu_profile_values.cpp ayu/ui/utils/ayu_profile_values.cpp
ayu/ui/utils/ayu_profile_values.h ayu/ui/utils/ayu_profile_values.h
ayu/ui/settings/icon_picker.cpp
ayu/ui/settings/icon_picker.h
ayu/ui/settings/settings_ayu.cpp ayu/ui/settings/settings_ayu.cpp
ayu/ui/settings/settings_ayu.h ayu/ui/settings/settings_ayu.h
ayu/ui/context_menu/context_menu.cpp ayu/ui/context_menu/context_menu.cpp
@ -143,10 +141,8 @@ set(ayugram_files
ayu/ui/message_history/history_item.h ayu/ui/message_history/history_item.h
ayu/ui/message_history/history_section.cpp ayu/ui/message_history/history_section.cpp
ayu/ui/message_history/history_section.h ayu/ui/message_history/history_section.h
ayu/ui/boxes/edit_deleted_mark.cpp ayu/ui/boxes/edit_mark_box.cpp
ayu/ui/boxes/edit_deleted_mark.h ayu/ui/boxes/edit_mark_box.h
ayu/ui/boxes/edit_edited_mark.cpp
ayu/ui/boxes/edit_edited_mark.h
ayu/ui/boxes/font_selector.cpp ayu/ui/boxes/font_selector.cpp
ayu/ui/boxes/font_selector.h ayu/ui/boxes/font_selector.h
ayu/ui/boxes/theme_selector_box.cpp ayu/ui/boxes/theme_selector_box.cpp
@ -155,6 +151,8 @@ set(ayugram_files
ayu/ui/boxes/message_shot_box.h ayu/ui/boxes/message_shot_box.h
ayu/ui/components/image_view.cpp ayu/ui/components/image_view.cpp
ayu/ui/components/image_view.h ayu/ui/components/image_view.h
ayu/ui/components/icon_picker.cpp
ayu/ui/components/icon_picker.h
ayu/libs/json.hpp ayu/libs/json.hpp
ayu/libs/json_ext.hpp ayu/libs/json_ext.hpp
ayu/libs/sqlite/sqlite3.c ayu/libs/sqlite/sqlite3.c

14
Telegram/SourceFiles/ayu/ayu_settings.cpp
View file

@ -417,8 +417,8 @@ void set_localPremium(bool val) {
settings->localPremium = val; settings->localPremium = val;
} }
void set_appIcon(QString val) { void set_appIcon(const QString &val) {
settings->appIcon = std::move(val); settings->appIcon = val;
} }
void set_simpleQuotesAndReplies(bool val) { void set_simpleQuotesAndReplies(bool val) {
@ -429,13 +429,13 @@ void set_replaceBottomInfoWithIcons(bool val) {
settings->replaceBottomInfoWithIcons = val; settings->replaceBottomInfoWithIcons = val;
} }
void set_deletedMark(QString val) { void set_deletedMark(const QString &val) {
settings->deletedMark = std::move(val); settings->deletedMark = val;
deletedMarkReactive = settings->deletedMark; deletedMarkReactive = settings->deletedMark;
} }
void set_editedMark(QString val) { void set_editedMark(const QString &val) {
settings->editedMark = std::move(val); settings->editedMark = val;
editedMarkReactive = settings->editedMark; editedMarkReactive = settings->editedMark;
} }
@ -522,7 +522,7 @@ void set_showStreamerToggleInTray(bool val) {
settings->showStreamerToggleInTray = val; settings->showStreamerToggleInTray = val;
} }
void set_monoFont(QString val) { void set_monoFont(const QString &val) {
settings->monoFont = val; settings->monoFont = val;
} }

8
Telegram/SourceFiles/ayu/ayu_settings.h
View file

@ -132,11 +132,11 @@ void set_increaseWebviewWidth(bool val);
void set_disableNotificationsDelay(bool val); void set_disableNotificationsDelay(bool val);
void set_localPremium(bool val); void set_localPremium(bool val);
void set_appIcon(QString val); void set_appIcon(const QString &val);
void set_simpleQuotesAndReplies(bool val); void set_simpleQuotesAndReplies(bool val);
void set_replaceBottomInfoWithIcons(bool val); void set_replaceBottomInfoWithIcons(bool val);
void set_deletedMark(QString val); void set_deletedMark(const QString &val);
void set_editedMark(QString val); void set_editedMark(const QString &val);
void set_recentStickersCount(int val); void set_recentStickersCount(int val);
void set_showReactionsPanelInContextMenu(int val); void set_showReactionsPanelInContextMenu(int val);
@ -162,7 +162,7 @@ void set_showStreamerToggleInDrawer(bool val);
void set_showGhostToggleInTray(bool val); void set_showGhostToggleInTray(bool val);
void set_showStreamerToggleInTray(bool val); void set_showStreamerToggleInTray(bool val);
void set_monoFont(QString val); void set_monoFont(const QString &val);
void set_hideNotificationCounters(bool val); void set_hideNotificationCounters(bool val);
void set_hideNotificationBadge(bool val); void set_hideNotificationBadge(bool val);

93
Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
View file

@ -1,93 +0,0 @@
// This is the source code of AyuGram for Desktop.
//
// We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
//
// Copyright @Radolyn, 2025
#include "edit_edited_mark.h"
#include "boxes/peer_list_controllers.h"
#include "lang/lang_keys.h"
#include "styles/style_boxes.h"
#include "styles/style_layers.h"
#include "styles/style_widgets.h"
#include "ui/widgets/popup_menu.h"
#include "ui/widgets/fields/input_field.h"
#include "ui/widgets/fields/special_fields.h"
#include "ayu/ayu_settings.h"
EditEditedMarkBox::EditEditedMarkBox(QWidget *)
: _text(
this,
st::defaultInputField,
tr::ayu_EditedMarkText(),
AyuSettings::getInstance().editedMark) {
}
void EditEditedMarkBox::prepare() {
const auto defaultEditedMark = tr::lng_edited(tr::now);
auto newHeight = st::contactPadding.top() + _text->height();
setTitle(tr::ayu_EditedMarkText());
newHeight += st::boxPadding.bottom() + st::contactPadding.bottom();
setDimensions(st::boxWidth, newHeight);
addLeftButton(tr::ayu_BoxActionReset(),
[=]
{
_text->setText(defaultEditedMark);
});
addButton(tr::lng_settings_save(),
[=]
{
save();
});
addButton(tr::lng_cancel(),
[=]
{
closeBox();
});
const auto submitted = [=]
{
submit();
};
_text->submits(
) | rpl::start_with_next(submitted, _text->lifetime());
}
void EditEditedMarkBox::setInnerFocus() {
_text->setFocusFast();
}
void EditEditedMarkBox::submit() {
if (_text->getLastText().trimmed().isEmpty()) {
_text->setFocus();
_text->showError();
} else {
save();
}
}
void EditEditedMarkBox::resizeEvent(QResizeEvent *e) {
BoxContent::resizeEvent(e);
_text->resize(
width()
- st::boxPadding.left()
- st::newGroupInfoPadding.left()
- st::boxPadding.right(),
_text->height());
const auto left = st::boxPadding.left() + st::newGroupInfoPadding.left();
_text->moveToLeft(left, st::contactPadding.top());
}
void EditEditedMarkBox::save() {
AyuSettings::set_editedMark(_text->getLastText());
AyuSettings::save();
closeBox();
}

28
Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.h
View file

@ -1,28 +0,0 @@
// This is the source code of AyuGram for Desktop.
//
// We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
//
// Copyright @Radolyn, 2025
#pragma once
#include "base/timer.h"
#include "boxes/abstract_box.h"
#include "mtproto/sender.h"
class EditEditedMarkBox : public Ui::BoxContent
{
public:
EditEditedMarkBox(QWidget *);
protected:
void setInnerFocus() override;
void prepare() override;
void resizeEvent(QResizeEvent *e) override;
private:
void submit();
void save();
object_ptr<Ui::InputField> _text;
};

38
Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp → Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.cpp
View file

@ -4,7 +4,9 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2025 // Copyright @Radolyn, 2025
#include "edit_deleted_mark.h" #include "edit_mark_box.h"
#include <utility>
#include "boxes/peer_list_controllers.h" #include "boxes/peer_list_controllers.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
@ -17,19 +19,25 @@
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
EditDeletedMarkBox::EditDeletedMarkBox(QWidget *) EditMarkBox::EditMarkBox(QWidget *,
: _text( rpl::producer<QString> title,
const QString &currentValue,
QString defaultValue,
const Fn<void(const QString &)> &saveCallback)
: _title(title)
, _defaultValue(std::move(defaultValue))
, _saveCallback(saveCallback)
, _text(
this, this,
st::defaultInputField, st::defaultInputField,
tr::ayu_DeletedMarkText(), title,
AyuSettings::getInstance().deletedMark) { currentValue) {
} }
void EditDeletedMarkBox::prepare() { void EditMarkBox::prepare() {
const auto defaultDeletedMark = "🧹";
auto newHeight = st::contactPadding.top() + _text->height(); auto newHeight = st::contactPadding.top() + _text->height();
setTitle(tr::ayu_DeletedMarkText()); setTitle(_title);
newHeight += st::boxPadding.bottom() + st::contactPadding.bottom(); newHeight += st::boxPadding.bottom() + st::contactPadding.bottom();
setDimensions(st::boxWidth, newHeight); setDimensions(st::boxWidth, newHeight);
@ -37,7 +45,7 @@ void EditDeletedMarkBox::prepare() {
addLeftButton(tr::ayu_BoxActionReset(), addLeftButton(tr::ayu_BoxActionReset(),
[=] [=]
{ {
_text->setText(defaultDeletedMark); _text->setText(_defaultValue);
}); });
addButton(tr::lng_settings_save(), addButton(tr::lng_settings_save(),
@ -59,11 +67,11 @@ void EditDeletedMarkBox::prepare() {
) | rpl::start_with_next(submitted, _text->lifetime()); ) | rpl::start_with_next(submitted, _text->lifetime());
} }
void EditDeletedMarkBox::setInnerFocus() { void EditMarkBox::setInnerFocus() {
_text->setFocusFast(); _text->setFocusFast();
} }
void EditDeletedMarkBox::submit() { void EditMarkBox::submit() {
if (_text->getLastText().trimmed().isEmpty()) { if (_text->getLastText().trimmed().isEmpty()) {
_text->setFocus(); _text->setFocus();
_text->showError(); _text->showError();
@ -72,7 +80,7 @@ void EditDeletedMarkBox::submit() {
} }
} }
void EditDeletedMarkBox::resizeEvent(QResizeEvent *e) { void EditMarkBox::resizeEvent(QResizeEvent *e) {
BoxContent::resizeEvent(e); BoxContent::resizeEvent(e);
_text->resize( _text->resize(
@ -86,9 +94,7 @@ void EditDeletedMarkBox::resizeEvent(QResizeEvent *e) {
_text->moveToLeft(left, st::contactPadding.top()); _text->moveToLeft(left, st::contactPadding.top());
} }
void EditDeletedMarkBox::save() { void EditMarkBox::save() {
AyuSettings::set_deletedMark(_text->getLastText()); _saveCallback(_text->getLastText());
AyuSettings::save();
closeBox(); closeBox();
} }

12
Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.h → Telegram/SourceFiles/ayu/ui/boxes/edit_mark_box.h
View file

@ -9,10 +9,14 @@
#include "base/timer.h" #include "base/timer.h"
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
class EditDeletedMarkBox : public Ui::BoxContent namespace Ui {
class InputField;
}
class EditMarkBox : public Ui::BoxContent
{ {
public: public:
EditDeletedMarkBox(QWidget *); EditMarkBox(QWidget *, rpl::producer<QString> title, const QString& currentValue, QString defaultValue, const Fn<void(const QString&)> &saveCallback);
protected: protected:
void setInnerFocus() override; void setInnerFocus() override;
@ -23,5 +27,9 @@ private:
void submit(); void submit();
void save(); void save();
rpl::producer<QString> _title;
QString _defaultValue;
Fn<void(const QString&)> _saveCallback;
object_ptr<Ui::InputField> _text; object_ptr<Ui::InputField> _text;
}; };

0
Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp → Telegram/SourceFiles/ayu/ui/components/icon_picker.cpp
View file

0
Telegram/SourceFiles/ayu/ui/settings/icon_picker.h → Telegram/SourceFiles/ayu/ui/components/icon_picker.h
View file

259
Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
View file

@ -7,8 +7,7 @@
#include "settings_ayu.h" #include "settings_ayu.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
#include "ayu/ui/boxes/edit_deleted_mark.h" #include "ayu/ui/boxes/edit_mark_box.h"
#include "ayu/ui/boxes/edit_edited_mark.h"
#include "ayu/ui/boxes/font_selector.h" #include "ayu/ui/boxes/font_selector.h"
#include "lang_auto.h" #include "lang_auto.h"
@ -27,7 +26,7 @@
#include "styles/style_settings.h" #include "styles/style_settings.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "icon_picker.h" #include "../components/icon_picker.h"
#include "tray.h" #include "tray.h"
#include "core/application.h" #include "core/application.h"
#include "main/main_domain.h" #include "main/main_domain.h"
@ -37,7 +36,6 @@
#include "ui/boxes/confirm_box.h" #include "ui/boxes/confirm_box.h"
#include "ui/boxes/single_choice_box.h" #include "ui/boxes/single_choice_box.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
#include "ui/toast/toast.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "ui/widgets/continuous_sliders.h" #include "ui/widgets/continuous_sliders.h"
@ -464,41 +462,41 @@ Ayu::Ayu(
} }
void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) { void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, tr::ayu_GhostEssentialsHeader()); AddSubsectionTitle(container, tr::ayu_GhostEssentialsHeader());
std::vector checkboxes{ std::vector checkboxes{
NestedEntry{ NestedEntry{
tr::ayu_DontReadMessages(tr::now), !settings.sendReadMessages, [=](bool enabled) tr::ayu_DontReadMessages(tr::now), !settings->sendReadMessages, [=](bool enabled)
{ {
AyuSettings::set_sendReadMessages(!enabled); AyuSettings::set_sendReadMessages(!enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_DontReadStories(tr::now), !settings.sendReadStories, [=](bool enabled) tr::ayu_DontReadStories(tr::now), !settings->sendReadStories, [=](bool enabled)
{ {
AyuSettings::set_sendReadStories(!enabled); AyuSettings::set_sendReadStories(!enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_DontSendOnlinePackets(tr::now), !settings.sendOnlinePackets, [=](bool enabled) tr::ayu_DontSendOnlinePackets(tr::now), !settings->sendOnlinePackets, [=](bool enabled)
{ {
AyuSettings::set_sendOnlinePackets(!enabled); AyuSettings::set_sendOnlinePackets(!enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_DontSendUploadProgress(tr::now), !settings.sendUploadProgress, [=](bool enabled) tr::ayu_DontSendUploadProgress(tr::now), !settings->sendUploadProgress, [=](bool enabled)
{ {
AyuSettings::set_sendUploadProgress(!enabled); AyuSettings::set_sendUploadProgress(!enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings.sendOfflinePacketAfterOnline, [=](bool enabled) tr::ayu_SendOfflinePacketAfterOnline(tr::now), settings->sendOfflinePacketAfterOnline, [=](bool enabled)
{ {
AyuSettings::set_sendOfflinePacketAfterOnline(enabled); AyuSettings::set_sendOfflinePacketAfterOnline(enabled);
AyuSettings::save(); AyuSettings::save();
@ -510,13 +508,14 @@ void SetupGhostModeToggle(not_null<Ui::VerticalLayout*> container) {
} }
void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) { void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
SetupGhostModeToggle(container); SetupGhostModeToggle(container);
auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(settings.sendOfflinePacketAfterOnline); auto markReadAfterActionVal = container->lifetime().make_state<rpl::variable<bool>>(
settings->markReadAfterAction);
auto useScheduledMessagesVal = container->lifetime().make_state<rpl::variable< auto useScheduledMessagesVal = container->lifetime().make_state<rpl::variable<
bool>>(settings.useScheduledMessages); bool>>(settings->useScheduledMessages);
AddButtonWithIcon( AddButtonWithIcon(
container, container,
@ -528,7 +527,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.sendOfflinePacketAfterOnline); return (enabled != settings->markReadAfterAction);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -555,7 +554,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.useScheduledMessages); return (enabled != settings->useScheduledMessages);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -577,12 +576,12 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
tr::ayu_SendWithoutSoundByDefault(), tr::ayu_SendWithoutSoundByDefault(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.sendWithoutSound) rpl::single(settings->sendWithoutSound)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.sendWithoutSound); return (enabled != settings->sendWithoutSound);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -595,7 +594,7 @@ void SetupGhostEssentials(not_null<Ui::VerticalLayout*> container) {
} }
void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) { void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, tr::ayu_SpyEssentialsHeader()); AddSubsectionTitle(container, tr::ayu_SpyEssentialsHeader());
@ -604,12 +603,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
tr::ayu_SaveDeletedMessages(), tr::ayu_SaveDeletedMessages(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.saveDeletedMessages) rpl::single(settings->saveDeletedMessages)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.saveDeletedMessages); return (enabled != settings->saveDeletedMessages);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -623,12 +622,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
tr::ayu_SaveMessagesHistory(), tr::ayu_SaveMessagesHistory(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.saveMessagesHistory) rpl::single(settings->saveMessagesHistory)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.saveMessagesHistory); return (enabled != settings->saveMessagesHistory);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -646,12 +645,12 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
tr::ayu_MessageSavingSaveForBots(), tr::ayu_MessageSavingSaveForBots(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.saveForBots) rpl::single(settings->saveForBots)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.saveForBots); return (enabled != settings->saveForBots);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -662,7 +661,7 @@ void SetupSpyEssentials(not_null<Ui::VerticalLayout*> container) {
} }
void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) { void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, tr::ayu_RegexFilters()); AddSubsectionTitle(container, tr::ayu_RegexFilters());
@ -671,12 +670,12 @@ void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
tr::ayu_FiltersHideFromBlocked(), tr::ayu_FiltersHideFromBlocked(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.hideFromBlocked) rpl::single(settings->hideFromBlocked)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.hideFromBlocked); return (enabled != settings->hideFromBlocked);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -687,7 +686,7 @@ void SetupMessageFilters(not_null<Ui::VerticalLayout*> container) {
} }
void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) { void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, tr::ayu_QoLTogglesHeader()); AddSubsectionTitle(container, tr::ayu_QoLTogglesHeader());
@ -696,12 +695,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_DisableAds(), tr::ayu_DisableAds(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.disableAds) rpl::single(settings->disableAds)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.disableAds); return (enabled != settings->disableAds);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -715,12 +714,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_DisableStories(), tr::ayu_DisableStories(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.disableStories) rpl::single(settings->disableStories)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.disableStories); return (enabled != settings->disableStories);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -734,12 +733,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_DisableCustomBackgrounds(), tr::ayu_DisableCustomBackgrounds(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.disableCustomBackgrounds) rpl::single(settings->disableCustomBackgrounds)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.disableCustomBackgrounds); return (enabled != settings->disableCustomBackgrounds);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -753,12 +752,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_SimpleQuotesAndReplies(), tr::ayu_SimpleQuotesAndReplies(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.simpleQuotesAndReplies) rpl::single(settings->simpleQuotesAndReplies)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.simpleQuotesAndReplies); return (enabled != settings->simpleQuotesAndReplies);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -769,14 +768,14 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
std::vector checkboxes = { std::vector checkboxes = {
NestedEntry{ NestedEntry{
tr::ayu_CollapseSimilarChannels(tr::now), settings.collapseSimilarChannels, [=](bool enabled) tr::ayu_CollapseSimilarChannels(tr::now), settings->collapseSimilarChannels, [=](bool enabled)
{ {
AyuSettings::set_collapseSimilarChannels(enabled); AyuSettings::set_collapseSimilarChannels(enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_HideSimilarChannelsTab(tr::now), settings.hideSimilarChannels, [=](bool enabled) tr::ayu_HideSimilarChannelsTab(tr::now), settings->hideSimilarChannels, [=](bool enabled)
{ {
AyuSettings::set_hideSimilarChannels(enabled); AyuSettings::set_hideSimilarChannels(enabled);
AyuSettings::save(); AyuSettings::save();
@ -795,12 +794,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_DisableNotificationsDelay(), tr::ayu_DisableNotificationsDelay(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.disableNotificationsDelay) rpl::single(settings->disableNotificationsDelay)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.disableNotificationsDelay); return (enabled != settings->disableNotificationsDelay);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -814,12 +813,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_ShowOnlyAddedEmojisAndStickers(), tr::ayu_ShowOnlyAddedEmojisAndStickers(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.showOnlyAddedEmojisAndStickers) rpl::single(settings->showOnlyAddedEmojisAndStickers)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showOnlyAddedEmojisAndStickers); return (enabled != settings->showOnlyAddedEmojisAndStickers);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -833,12 +832,12 @@ void SetupQoLToggles(not_null<Ui::VerticalLayout*> container) {
tr::ayu_LocalPremium(), tr::ayu_LocalPremium(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.localPremium) rpl::single(settings->localPremium)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.localPremium); return (enabled != settings->localPremium);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -856,7 +855,7 @@ void SetupAppIcon(not_null<Ui::VerticalLayout*> container) {
void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container, void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
not_null<Window::SessionController*> controller) { not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, tr::ayu_ContextMenuElementsHeader()); AddSubsectionTitle(container, tr::ayu_ContextMenuElementsHeader());
@ -870,7 +869,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.showReactionsPanelInContextMenu, settings->showReactionsPanelInContextMenu,
options, options,
tr::ayu_SettingsContextMenuReactionsPanel(), tr::ayu_SettingsContextMenuReactionsPanel(),
tr::ayu_SettingsContextMenuTitle(), tr::ayu_SettingsContextMenuTitle(),
@ -883,7 +882,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.showViewsPanelInContextMenu, settings->showViewsPanelInContextMenu,
options, options,
tr::ayu_SettingsContextMenuViewsPanel(), tr::ayu_SettingsContextMenuViewsPanel(),
tr::ayu_SettingsContextMenuTitle(), tr::ayu_SettingsContextMenuTitle(),
@ -897,7 +896,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.showHideMessageInContextMenu, settings->showHideMessageInContextMenu,
options, options,
tr::ayu_ContextHideMessage(), tr::ayu_ContextHideMessage(),
tr::ayu_SettingsContextMenuTitle(), tr::ayu_SettingsContextMenuTitle(),
@ -910,7 +909,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.showUserMessagesInContextMenu, settings->showUserMessagesInContextMenu,
options, options,
tr::ayu_UserMessagesMenuText(), tr::ayu_UserMessagesMenuText(),
tr::ayu_SettingsContextMenuTitle(), tr::ayu_SettingsContextMenuTitle(),
@ -923,7 +922,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.showMessageDetailsInContextMenu, settings->showMessageDetailsInContextMenu,
options, options,
tr::ayu_MessageDetailsPC(), tr::ayu_MessageDetailsPC(),
tr::ayu_SettingsContextMenuTitle(), tr::ayu_SettingsContextMenuTitle(),
@ -939,7 +938,7 @@ void SetupContextMenuElements(not_null<Ui::VerticalLayout*> container,
} }
void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) { void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, tr::ayu_MessageFieldElementsHeader()); AddSubsectionTitle(container, tr::ayu_MessageFieldElementsHeader());
@ -950,12 +949,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldAttachIcon} {&st::messageFieldAttachIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showAttachButtonInMessageField) rpl::single(settings->showAttachButtonInMessageField)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showAttachButtonInMessageField); return (enabled != settings->showAttachButtonInMessageField);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -970,12 +969,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldCommandsIcon} {&st::messageFieldCommandsIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showCommandsButtonInMessageField) rpl::single(settings->showCommandsButtonInMessageField)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showCommandsButtonInMessageField); return (enabled != settings->showCommandsButtonInMessageField);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -990,12 +989,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldTTLIcon} {&st::messageFieldTTLIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showAutoDeleteButtonInMessageField) rpl::single(settings->showAutoDeleteButtonInMessageField)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showAutoDeleteButtonInMessageField); return (enabled != settings->showAutoDeleteButtonInMessageField);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1010,12 +1009,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldEmojiIcon} {&st::messageFieldEmojiIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showEmojiButtonInMessageField) rpl::single(settings->showEmojiButtonInMessageField)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showEmojiButtonInMessageField); return (enabled != settings->showEmojiButtonInMessageField);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1030,12 +1029,12 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldVoiceIcon} {&st::messageFieldVoiceIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showMicrophoneButtonInMessageField) rpl::single(settings->showMicrophoneButtonInMessageField)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showMicrophoneButtonInMessageField); return (enabled != settings->showMicrophoneButtonInMessageField);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1049,7 +1048,7 @@ void SetupMessageFieldElements(not_null<Ui::VerticalLayout*> container) {
} }
void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) { void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, tr::ayu_MessageFieldPopupsHeader()); AddSubsectionTitle(container, tr::ayu_MessageFieldPopupsHeader());
@ -1060,12 +1059,12 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldAttachIcon} {&st::messageFieldAttachIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showAttachPopup) rpl::single(settings->showAttachPopup)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showAttachPopup); return (enabled != settings->showAttachPopup);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1080,12 +1079,12 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::messageFieldEmojiIcon} {&st::messageFieldEmojiIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showEmojiPopup) rpl::single(settings->showEmojiPopup)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showEmojiPopup); return (enabled != settings->showEmojiPopup);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1099,7 +1098,7 @@ void SetupMessageFieldPopups(not_null<Ui::VerticalLayout*> container) {
} }
void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) { void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, tr::ayu_DrawerElementsHeader()); AddSubsectionTitle(container, tr::ayu_DrawerElementsHeader());
@ -1110,12 +1109,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::ayuLReadMenuIcon} {&st::ayuLReadMenuIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showLReadToggleInDrawer) rpl::single(settings->showLReadToggleInDrawer)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showLReadToggleInDrawer); return (enabled != settings->showLReadToggleInDrawer);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1130,12 +1129,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::ayuSReadMenuIcon} {&st::ayuSReadMenuIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showSReadToggleInDrawer) rpl::single(settings->showSReadToggleInDrawer)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showSReadToggleInDrawer); return (enabled != settings->showSReadToggleInDrawer);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1150,12 +1149,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::ayuGhostIcon} {&st::ayuGhostIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showGhostToggleInDrawer) rpl::single(settings->showGhostToggleInDrawer)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showGhostToggleInDrawer); return (enabled != settings->showGhostToggleInDrawer);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1171,12 +1170,12 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
st::settingsButton, st::settingsButton,
{&st::ayuStreamerModeMenuIcon} {&st::ayuStreamerModeMenuIcon}
)->toggleOn( )->toggleOn(
rpl::single(settings.showStreamerToggleInDrawer) rpl::single(settings->showStreamerToggleInDrawer)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showStreamerToggleInDrawer); return (enabled != settings->showStreamerToggleInDrawer);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1188,7 +1187,7 @@ void SetupDrawerElements(not_null<Ui::VerticalLayout*> container) {
} }
void SetupTrayElements(not_null<Ui::VerticalLayout*> container) { void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, tr::ayu_TrayElementsHeader()); AddSubsectionTitle(container, tr::ayu_TrayElementsHeader());
@ -1198,12 +1197,12 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
tr::ayu_EnableGhostModeTray(), tr::ayu_EnableGhostModeTray(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.showGhostToggleInTray) rpl::single(settings->showGhostToggleInTray)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showGhostToggleInTray); return (enabled != settings->showGhostToggleInTray);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1218,12 +1217,12 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
tr::ayu_EnableStreamerModeTray(), tr::ayu_EnableStreamerModeTray(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.showStreamerToggleInTray) rpl::single(settings->showStreamerToggleInTray)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showStreamerToggleInTray); return (enabled != settings->showStreamerToggleInTray);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1236,7 +1235,7 @@ void SetupTrayElements(not_null<Ui::VerticalLayout*> container) {
void SetupShowPeerId(not_null<Ui::VerticalLayout*> container, void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
not_null<Window::SessionController*> controller) { not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
const auto options = std::vector{ const auto options = std::vector{
QString(tr::ayu_SettingsShowID_Hide(tr::now)), QString(tr::ayu_SettingsShowID_Hide(tr::now)),
@ -1270,7 +1269,7 @@ void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
{ {
.title = tr::ayu_SettingsShowID(), .title = tr::ayu_SettingsShowID(),
.options = options, .options = options,
.initialSelection = settings.showPeerId, .initialSelection = settings->showPeerId,
.callback = save, .callback = save,
}); });
})); }));
@ -1278,7 +1277,7 @@ void SetupShowPeerId(not_null<Ui::VerticalLayout*> container,
} }
void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) { void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
container->add( container->add(
object_ptr<Button>(container, object_ptr<Button>(container,
@ -1300,7 +1299,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
{ {
label->setText(QString::number(amount)); label->setText(QString::number(amount));
}; };
updateLabel(settings.recentStickersCount); updateLabel(settings->recentStickersCount);
slider->setPseudoDiscrete( slider->setPseudoDiscrete(
200 + 1, 200 + 1,
@ -1309,7 +1308,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
{ {
return amount; return amount;
}, },
settings.recentStickersCount, settings->recentStickersCount,
[=](int amount) [=](int amount)
{ {
updateLabel(amount); updateLabel(amount);
@ -1325,7 +1324,7 @@ void SetupRecentStickersLimitSlider(not_null<Ui::VerticalLayout*> container) {
void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container, void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
not_null<Window::SessionController*> controller) { not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
container->add( container->add(
object_ptr<Button>(container, object_ptr<Button>(container,
@ -1360,12 +1359,12 @@ void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
return kMinSize + index * kStep; return kMinSize + index * kStep;
}; };
updateLabel(settings.wideMultiplier); updateLabel(settings->wideMultiplier);
slider->setPseudoDiscrete( slider->setPseudoDiscrete(
kSizeAmount, kSizeAmount,
[=](int index) { return index; }, [=](int index) { return index; },
valueToIndex(settings.wideMultiplier), valueToIndex(settings->wideMultiplier),
[=](int index) [=](int index)
{ {
updateLabel(indexToValue(index)); updateLabel(indexToValue(index));
@ -1394,13 +1393,13 @@ void SetupWideMultiplierSlider(not_null<Ui::VerticalLayout*> container,
} }
void SetupFonts(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) { void SetupFonts(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
const auto monoButton = AddButtonWithLabel( const auto monoButton = AddButtonWithLabel(
container, container,
tr::ayu_MonospaceFont(), tr::ayu_MonospaceFont(),
rpl::single( rpl::single(
settings.monoFont.isEmpty() ? tr::ayu_FontDefault(tr::now) : settings.monoFont settings->monoFont.isEmpty() ? tr::ayu_FontDefault(tr::now) : settings->monoFont
), ),
st::settingsButtonNoIcon); st::settingsButtonNoIcon);
const auto monoGuard = Ui::CreateChild<base::binary_guard>(monoButton.get()); const auto monoGuard = Ui::CreateChild<base::binary_guard>(monoButton.get());
@ -1419,7 +1418,7 @@ void SetupFonts(not_null<Ui::VerticalLayout*> container, not_null<Window::Sessio
} }
void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) { void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, tr::ayu_ConfirmationsTitle()); AddSubsectionTitle(container, tr::ayu_ConfirmationsTitle());
@ -1428,12 +1427,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
tr::ayu_StickerConfirmation(), tr::ayu_StickerConfirmation(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.stickerConfirmation) rpl::single(settings->stickerConfirmation)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.stickerConfirmation); return (enabled != settings->stickerConfirmation);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1447,12 +1446,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
tr::ayu_GIFConfirmation(), tr::ayu_GIFConfirmation(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.gifConfirmation) rpl::single(settings->gifConfirmation)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.gifConfirmation); return (enabled != settings->gifConfirmation);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1466,12 +1465,12 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
tr::ayu_VoiceConfirmation(), tr::ayu_VoiceConfirmation(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.voiceConfirmation) rpl::single(settings->voiceConfirmation)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.voiceConfirmation); return (enabled != settings->voiceConfirmation);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1482,19 +1481,19 @@ void SetupSendConfirmations(not_null<Ui::VerticalLayout*> container) {
} }
void SetupMarks(not_null<Ui::VerticalLayout*> container) { void SetupMarks(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddButtonWithIcon( AddButtonWithIcon(
container, container,
tr::ayu_ReplaceMarksWithIcons(), tr::ayu_ReplaceMarksWithIcons(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.replaceBottomInfoWithIcons) rpl::single(settings->replaceBottomInfoWithIcons)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.replaceBottomInfoWithIcons); return (enabled != settings->replaceBottomInfoWithIcons);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1511,7 +1510,16 @@ void SetupMarks(not_null<Ui::VerticalLayout*> container) {
)->addClickHandler( )->addClickHandler(
[=]() [=]()
{ {
auto box = Box<EditDeletedMarkBox>(); auto box = Box<EditMarkBox>(
tr::ayu_DeletedMarkText(),
settings->deletedMark,
QString("🧹"),
[=](const QString &value)
{
AyuSettings::set_deletedMark(value);
AyuSettings::save();
}
);
Ui::show(std::move(box)); Ui::show(std::move(box));
}); });
@ -1523,25 +1531,34 @@ void SetupMarks(not_null<Ui::VerticalLayout*> container) {
)->addClickHandler( )->addClickHandler(
[=]() [=]()
{ {
auto box = Box<EditEditedMarkBox>(); auto box = Box<EditMarkBox>(
tr::ayu_EditedMarkText(),
settings->editedMark,
tr::lng_edited(tr::now),
[=](const QString &value)
{
AyuSettings::set_editedMark(value);
AyuSettings::save();
}
);
Ui::show(std::move(box)); Ui::show(std::move(box));
}); });
} }
void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) { void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddButtonWithIcon( AddButtonWithIcon(
container, container,
tr::ayu_HideNotificationCounters(), tr::ayu_HideNotificationCounters(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.hideNotificationCounters) rpl::single(settings->hideNotificationCounters)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.hideNotificationCounters); return (enabled != settings->hideNotificationCounters);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1557,12 +1574,12 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
tr::ayu_HideNotificationBadge(), tr::ayu_HideNotificationBadge(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.hideNotificationBadge) rpl::single(settings->hideNotificationBadge)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.hideNotificationBadge); return (enabled != settings->hideNotificationBadge);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1581,12 +1598,12 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
tr::ayu_HideAllChats(), tr::ayu_HideAllChats(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.hideAllChatsFolder) rpl::single(settings->hideAllChatsFolder)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.hideAllChatsFolder); return (enabled != settings->hideAllChatsFolder);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1597,7 +1614,7 @@ void SetupFolderSettings(not_null<Ui::VerticalLayout*> container, not_null<Windo
} }
void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) { void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
const auto options = std::vector{ const auto options = std::vector{
tr::ayu_ChannelBottomButtonHide(tr::now), tr::ayu_ChannelBottomButtonHide(tr::now),
@ -1608,7 +1625,7 @@ void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Wind
AddChooseButtonWithIconAndRightText( AddChooseButtonWithIconAndRightText(
container, container,
controller, controller,
settings.channelBottomButton, settings->channelBottomButton,
options, options,
tr::ayu_ChannelBottomButton(), tr::ayu_ChannelBottomButton(),
tr::ayu_ChannelBottomButton(), tr::ayu_ChannelBottomButton(),
@ -1620,7 +1637,7 @@ void SetupChannelSettings(not_null<Ui::VerticalLayout*> container, not_null<Wind
} }
void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) { void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window::SessionController*> controller) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
SetupShowPeerId(container, controller); SetupShowPeerId(container, controller);
@ -1629,12 +1646,12 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
tr::ayu_SettingsShowMessageSeconds(), tr::ayu_SettingsShowMessageSeconds(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.showMessageSeconds) rpl::single(settings->showMessageSeconds)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showMessageSeconds); return (enabled != settings->showMessageSeconds);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1648,12 +1665,12 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
tr::ayu_SettingsShowMessageShot(), tr::ayu_SettingsShowMessageShot(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.showMessageShot) rpl::single(settings->showMessageShot)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.showMessageShot); return (enabled != settings->showMessageShot);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1664,7 +1681,7 @@ void SetupNerdSettings(not_null<Ui::VerticalLayout*> container, not_null<Window:
} }
void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) { void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
const auto& settings = AyuSettings::getInstance(); auto *settings = &AyuSettings::getInstance();
AddSubsectionTitle(container, rpl::single(QString("Webview"))); AddSubsectionTitle(container, rpl::single(QString("Webview")));
@ -1673,12 +1690,12 @@ void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
tr::ayu_SettingsSpoofWebviewAsAndroid(), tr::ayu_SettingsSpoofWebviewAsAndroid(),
st::settingsButtonNoIcon st::settingsButtonNoIcon
)->toggleOn( )->toggleOn(
rpl::single(settings.spoofWebviewAsAndroid) rpl::single(settings->spoofWebviewAsAndroid)
)->toggledValue( )->toggledValue(
) | rpl::filter( ) | rpl::filter(
[=](bool enabled) [=](bool enabled)
{ {
return (enabled != settings.spoofWebviewAsAndroid); return (enabled != settings->spoofWebviewAsAndroid);
}) | start_with_next( }) | start_with_next(
[=](bool enabled) [=](bool enabled)
{ {
@ -1689,14 +1706,14 @@ void SetupWebviewSettings(not_null<Ui::VerticalLayout*> container) {
std::vector checkboxes = { std::vector checkboxes = {
NestedEntry{ NestedEntry{
tr::ayu_SettingsIncreaseWebviewHeight(tr::now), settings.increaseWebviewHeight, [=](bool enabled) tr::ayu_SettingsIncreaseWebviewHeight(tr::now), settings->increaseWebviewHeight, [=](bool enabled)
{ {
AyuSettings::set_increaseWebviewHeight(enabled); AyuSettings::set_increaseWebviewHeight(enabled);
AyuSettings::save(); AyuSettings::save();
} }
}, },
NestedEntry{ NestedEntry{
tr::ayu_SettingsIncreaseWebviewWidth(tr::now), settings.increaseWebviewWidth, [=](bool enabled) tr::ayu_SettingsIncreaseWebviewWidth(tr::now), settings->increaseWebviewWidth, [=](bool enabled)
{ {
AyuSettings::set_increaseWebviewWidth(enabled); AyuSettings::set_increaseWebviewWidth(enabled);
AyuSettings::save(); AyuSettings::save();