diff --git a/Telegram/Resources/icons/info/edit/antispam.png b/Telegram/Resources/icons/info/edit/antispam.png new file mode 100644 index 000000000..47558ed36 Binary files /dev/null and b/Telegram/Resources/icons/info/edit/antispam.png differ diff --git a/Telegram/Resources/icons/info/edit/antispam@2x.png b/Telegram/Resources/icons/info/edit/antispam@2x.png new file mode 100644 index 000000000..5e0ace7f3 Binary files /dev/null and b/Telegram/Resources/icons/info/edit/antispam@2x.png differ diff --git a/Telegram/Resources/icons/info/edit/antispam@3x.png b/Telegram/Resources/icons/info/edit/antispam@3x.png new file mode 100644 index 000000000..16e2a595c Binary files /dev/null and b/Telegram/Resources/icons/info/edit/antispam@3x.png differ diff --git a/Telegram/Resources/icons/menu/false_positive.png b/Telegram/Resources/icons/menu/false_positive.png new file mode 100644 index 000000000..a3a44132c Binary files /dev/null and b/Telegram/Resources/icons/menu/false_positive.png differ diff --git a/Telegram/Resources/icons/menu/false_positive@2x.png b/Telegram/Resources/icons/menu/false_positive@2x.png new file mode 100644 index 000000000..17b4eac5f Binary files /dev/null and b/Telegram/Resources/icons/menu/false_positive@2x.png differ diff --git a/Telegram/Resources/icons/menu/false_positive@3x.png b/Telegram/Resources/icons/menu/false_positive@3x.png new file mode 100644 index 000000000..58d468ba3 Binary files /dev/null and b/Telegram/Resources/icons/menu/false_positive@3x.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_off.png b/Telegram/Resources/icons/settings/ttl/autodelete_off.png new file mode 100644 index 000000000..5423957b9 Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_off.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_off@2x.png b/Telegram/Resources/icons/settings/ttl/autodelete_off@2x.png new file mode 100644 index 000000000..2327d2ed3 Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_off@2x.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_off@3x.png b/Telegram/Resources/icons/settings/ttl/autodelete_off@3x.png new file mode 100644 index 000000000..a441bf814 Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_off@3x.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_on.png b/Telegram/Resources/icons/settings/ttl/autodelete_on.png new file mode 100644 index 000000000..640200904 Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_on.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_on@2x.png b/Telegram/Resources/icons/settings/ttl/autodelete_on@2x.png new file mode 100644 index 000000000..14b364d5f Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_on@2x.png differ diff --git a/Telegram/Resources/icons/settings/ttl/autodelete_on@3x.png b/Telegram/Resources/icons/settings/ttl/autodelete_on@3x.png new file mode 100644 index 000000000..daecd5b11 Binary files /dev/null and b/Telegram/Resources/icons/settings/ttl/autodelete_on@3x.png differ diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index a3684de9b..9b9490f23 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -383,6 +383,7 @@ infoRoundedIconAdministrators: icon {{ "info/edit/group_manage_admins", settings infoRoundedIconInviteLinks: icon {{ "info/edit/group_manage_links", settingsIconFg }}; infoRoundedIconReactions: icon {{ "info/edit/group_manage_reactions", settingsIconFg }}; infoRoundedIconSignature: icon {{ "info/edit/channel_manage_signature", settingsIconFg }}; +infoRoundedIconAntiSpam: icon {{ "info/edit/antispam", settingsIconFg }}; infoIconShare: icon {{ "info/info_share", infoIconFg }}; infoIconEdit: icon {{ "info/info_edit", infoIconFg }}; diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp index 77be5786a..49a016478 100644 --- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp +++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp @@ -73,7 +73,7 @@ object_ptr AntiSpamValidator::createButton() const { rpl::single(QString()), [] {}, st::manageGroupTopicsButton, - { &st::infoRoundedIconAdministrators, Settings::kIconPurple } + { &st::infoRoundedIconAntiSpam, Settings::kIconPurple } ))->toggleOn(rpl::single( _channel->antiSpamMode() ) | rpl::then(state->toggled.events())); @@ -194,7 +194,7 @@ void AntiSpamValidator::addAction( MTP_int(eventId) )).done(showToast).send(); }, - &st::menuIconAdmin); + &st::menuIconReportAntiSpam); }; { const auto it = _itemEventMsgIds.find(fakeId); diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 2fa8252ce..c96792860 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -105,6 +105,9 @@ settingsPremiumIconStar: icon {{ "settings/premium/star", settingsIconFg }}; settingsPremiumIconVoice: icon {{ "settings/premium/voice", settingsIconFg }}; settingsPremiumIconFiles: icon {{ "settings/premium/files", settingsIconFg }}; +settingsTTLChatsOff: icon {{ "settings/ttl/autodelete_off", windowSubTextFg }}; +settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }}; + settingsIconAdd: icon {{ "settings/add", windowFgActive }}; settingsIconRemove: icon {{ "settings/remove", windowFgActive }}; diff --git a/Telegram/SourceFiles/settings/settings_global_ttl.cpp b/Telegram/SourceFiles/settings/settings_global_ttl.cpp index f3c070b79..c5892cea1 100644 --- a/Telegram/SourceFiles/settings/settings_global_ttl.cpp +++ b/Telegram/SourceFiles/settings/settings_global_ttl.cpp @@ -61,8 +61,8 @@ void TTLRow::paintStatusText( int outerWidth, bool selected) { auto icon = history()->peer->messagesTTL() - ? &st::callArrowIn - : &st::callArrowOut; + ? &st::settingsTTLChatsOn + : &st::settingsTTLChatsOff; icon->paint( p, x + st::callArrowPosition.x(), diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index f11d4811f..6d26f8011 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -93,6 +93,7 @@ menuIconStartStream: icon {{ "menu/start_stream", menuIconColor }}; menuIconStartStreamWith: icon {{ "menu/start_stream_with", menuIconColor }}; menuIconVideoChat: icon {{ "menu/video_chat", menuIconColor }}; menuIconTranslate: icon {{ "menu/translate", menuIconColor }}; +menuIconReportAntiSpam: icon {{ "menu/false_positive", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px);