Top bar notifications option

This commit is contained in:
Eric Kotato 2020-03-30 18:37:44 +03:00
parent 91a5942273
commit 33f1616dbf
9 changed files with 18 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -351,6 +351,10 @@ bool Manager::readCustomFile() {
cSetHideFilterNames(v); cSetHideFilterNames(v);
}); });
}); });
ReadBoolOption(settings, "profile_top_mute", [&](auto v) {
cSetProfileTopBarNotifications(v);
});
return true; return true;
} }
@ -395,6 +399,7 @@ void Manager::writeDefaultFile() {
settings.insert(qsl("userpic_corner_type"), cUserpicCornersType()); settings.insert(qsl("userpic_corner_type"), cUserpicCornersType());
settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic()); settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic());
settings.insert(qsl("custom_app_icon"), cCustomAppIcon()); settings.insert(qsl("custom_app_icon"), cCustomAppIcon());
settings.insert(qsl("profile_top_mute"), cProfileTopBarNotifications());
auto settingsFolders = QJsonObject(); auto settingsFolders = QJsonObject();
settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("default"), cDefaultFilterId());
@ -468,6 +473,7 @@ void Manager::writeCurrentSettings() {
settings.insert(qsl("userpic_corner_type"), cUserpicCornersType()); settings.insert(qsl("userpic_corner_type"), cUserpicCornersType());
settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic()); settings.insert(qsl("always_show_top_userpic"), cShowTopBarUserpic());
settings.insert(qsl("custom_app_icon"), cCustomAppIcon()); settings.insert(qsl("custom_app_icon"), cCustomAppIcon());
settings.insert(qsl("profile_top_mute"), cProfileTopBarNotifications());
auto settingsFolders = QJsonObject(); auto settingsFolders = QJsonObject();
settingsFolders.insert(qsl("default"), cDefaultFilterId()); settingsFolders.insert(qsl("default"), cDefaultFilterId());

View file

@ -148,7 +148,7 @@ infoTopBarNotifications: IconButton(infoTopBarMenu) {
rippleAreaPosition: point(0px, 6px); rippleAreaPosition: point(0px, 6px);
} }
infoNotificationsActive: icon {{ infoNotificationsActive: icon {{
"info_notifications", "info_notifications_active",
windowBgActive windowBgActive
}}; }};
infoTopBarCall: IconButton(infoTopBarNotifications) { infoTopBarCall: IconButton(infoTopBarNotifications) {

View file

@ -407,7 +407,6 @@ void WrapWidget::createTopBar() {
&& (wrapValue != Wrap::Side || hasStackHistory())) { && (wrapValue != Wrap::Side || hasStackHistory())) {
addTopBarMenuButton(); addTopBarMenuButton();
addProfileCallsButton(); addProfileCallsButton();
// addProfileNotificationsButton();
} else if (section.type() == Section::Type::Settings } else if (section.type() == Section::Type::Settings
&& (section.settingsType() == Section::SettingsType::Main && (section.settingsType() == Section::SettingsType::Main
|| section.settingsType() == Section::SettingsType::Chat || section.settingsType() == Section::SettingsType::Chat
@ -418,6 +417,11 @@ void WrapWidget::createTopBar() {
addContentSaveButton(); addContentSaveButton();
} }
if (section.type() == Section::Type::Profile
&& cProfileTopBarNotifications()) {
addProfileNotificationsButton();
}
_topBar->lower(); _topBar->lower();
_topBar->resizeToWidth(width()); _topBar->resizeToWidth(width());
_topBar->finishAnimating(); _topBar->finishAnimating();

View file

@ -376,7 +376,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
tracker); tracker);
} }
} }
if (!_peer->isSelf()) { if (!_peer->isSelf() && !cProfileTopBarNotifications()) {
// No notifications toggle for Self => no separator. // No notifications toggle for Self => no separator.
result->add(object_ptr<Ui::SlideWrap<>>( result->add(object_ptr<Ui::SlideWrap<>>(
result, result,
@ -517,7 +517,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::fill() {
add(object_ptr<Ui::BoxContentDivider>(_wrap)); add(object_ptr<Ui::BoxContentDivider>(_wrap));
add(CreateSkipWidget(_wrap)); add(CreateSkipWidget(_wrap));
add(setupInfo()); add(setupInfo());
if (!_peer->isSelf()) { if (!_peer->isSelf() && !cProfileTopBarNotifications()) {
add(setupMuteToggle()); add(setupMuteToggle());
} }
setupMainButtons(); setupMainButtons();

View file

@ -324,3 +324,5 @@ int gDefaultFilterId = 0;
bool gUnmutedFilterCounterOnly = false; bool gUnmutedFilterCounterOnly = false;
bool gHideFilterEditButton = false; bool gHideFilterEditButton = false;
bool gHideFilterNames = false; bool gHideFilterNames = false;
bool gProfileTopBarNotifications = false;

View file

@ -254,3 +254,5 @@ DeclareSetting(int, DefaultFilterId);
DeclareSetting(bool, UnmutedFilterCounterOnly); DeclareSetting(bool, UnmutedFilterCounterOnly);
DeclareSetting(bool, HideFilterEditButton); DeclareSetting(bool, HideFilterEditButton);
DeclareSetting(bool, HideFilterNames); DeclareSetting(bool, HideFilterNames);
DeclareSetting(bool, ProfileTopBarNotifications);