diff --git a/Telegram/Resources/colors.palette b/Telegram/Resources/colors.palette index 9df679b160..b675ff809d 100644 --- a/Telegram/Resources/colors.palette +++ b/Telegram/Resources/colors.palette @@ -444,6 +444,9 @@ historyComposeButtonBg: historyComposeAreaBg; // unblock / join channel / mute c historyComposeButtonBgOver: windowBgOver; // unblock / join channel / mute channel button background with mouse over historyComposeButtonBgRipple: windowBgRipple; // unblock / join channel / mute channel button ripple effect +mapPointDrop: #fd4444; // geo location marker background +mapPointDot: #ffffff; // geo location marker point + // overview overviewCheckBg: #00000040; // shared media / files / links checkbox background for not selected rows when some rows are selected overviewCheckBgActive: windowBgActive; // shared media / files / links checkbox background for selected rows diff --git a/Telegram/Resources/icons/box_button_back@3x.png b/Telegram/Resources/icons/box_button_back@3x.png new file mode 100644 index 0000000000..5e5cf8b418 Binary files /dev/null and b/Telegram/Resources/icons/box_button_back@3x.png differ diff --git a/Telegram/Resources/icons/box_button_close@3x.png b/Telegram/Resources/icons/box_button_close@3x.png new file mode 100644 index 0000000000..e818a6a97a Binary files /dev/null and b/Telegram/Resources/icons/box_button_close@3x.png differ diff --git a/Telegram/Resources/icons/box_search@3x.png b/Telegram/Resources/icons/box_search@3x.png new file mode 100644 index 0000000000..3b681f682e Binary files /dev/null and b/Telegram/Resources/icons/box_search@3x.png differ diff --git a/Telegram/Resources/icons/bubble_tail@3x.png b/Telegram/Resources/icons/bubble_tail@3x.png new file mode 100644 index 0000000000..87ce9d59df Binary files /dev/null and b/Telegram/Resources/icons/bubble_tail@3x.png differ diff --git a/Telegram/Resources/icons/call_answer@3x.png b/Telegram/Resources/icons/call_answer@3x.png new file mode 100644 index 0000000000..0060a291d9 Binary files /dev/null and b/Telegram/Resources/icons/call_answer@3x.png differ diff --git a/Telegram/Resources/icons/call_arrow_in@3x.png b/Telegram/Resources/icons/call_arrow_in@3x.png new file mode 100644 index 0000000000..ca09f2cbcf Binary files /dev/null and b/Telegram/Resources/icons/call_arrow_in@3x.png differ diff --git a/Telegram/Resources/icons/call_arrow_out@3x.png b/Telegram/Resources/icons/call_arrow_out@3x.png new file mode 100644 index 0000000000..7215f86941 Binary files /dev/null and b/Telegram/Resources/icons/call_arrow_out@3x.png differ diff --git a/Telegram/Resources/icons/call_discard@3x.png b/Telegram/Resources/icons/call_discard@3x.png new file mode 100644 index 0000000000..96d95d1caf Binary files /dev/null and b/Telegram/Resources/icons/call_discard@3x.png differ diff --git a/Telegram/Resources/icons/call_rating@3x.png b/Telegram/Resources/icons/call_rating@3x.png new file mode 100644 index 0000000000..139169e30c Binary files /dev/null and b/Telegram/Resources/icons/call_rating@3x.png differ diff --git a/Telegram/Resources/icons/call_rating_filled@3x.png b/Telegram/Resources/icons/call_rating_filled@3x.png new file mode 100644 index 0000000000..6a51b2abcb Binary files /dev/null and b/Telegram/Resources/icons/call_rating_filled@3x.png differ diff --git a/Telegram/Resources/icons/call_record_active@3x.png b/Telegram/Resources/icons/call_record_active@3x.png new file mode 100644 index 0000000000..5ff5d9ede3 Binary files /dev/null and b/Telegram/Resources/icons/call_record_active@3x.png differ diff --git a/Telegram/Resources/icons/call_record_muted@3x.png b/Telegram/Resources/icons/call_record_muted@3x.png new file mode 100644 index 0000000000..dbdc210e47 Binary files /dev/null and b/Telegram/Resources/icons/call_record_muted@3x.png differ diff --git a/Telegram/Resources/icons/call_shadow_left@3x.png b/Telegram/Resources/icons/call_shadow_left@3x.png new file mode 100644 index 0000000000..30257ebe77 Binary files /dev/null and b/Telegram/Resources/icons/call_shadow_left@3x.png differ diff --git a/Telegram/Resources/icons/call_shadow_top@3x.png b/Telegram/Resources/icons/call_shadow_top@3x.png new file mode 100644 index 0000000000..350db0481b Binary files /dev/null and b/Telegram/Resources/icons/call_shadow_top@3x.png differ diff --git a/Telegram/Resources/icons/call_shadow_top_left@3x.png b/Telegram/Resources/icons/call_shadow_top_left@3x.png new file mode 100644 index 0000000000..260bb26580 Binary files /dev/null and b/Telegram/Resources/icons/call_shadow_top_left@3x.png differ diff --git a/Telegram/Resources/icons/color_slider_arrow@3x.png b/Telegram/Resources/icons/color_slider_arrow@3x.png new file mode 100644 index 0000000000..a138e9575e Binary files /dev/null and b/Telegram/Resources/icons/color_slider_arrow@3x.png differ diff --git a/Telegram/Resources/icons/color_slider_arrow_vertical@3x.png b/Telegram/Resources/icons/color_slider_arrow_vertical@3x.png new file mode 100644 index 0000000000..709206ef51 Binary files /dev/null and b/Telegram/Resources/icons/color_slider_arrow_vertical@3x.png differ diff --git a/Telegram/Resources/icons/connecting_body@3x.png b/Telegram/Resources/icons/connecting_body@3x.png new file mode 100644 index 0000000000..7131bf7411 Binary files /dev/null and b/Telegram/Resources/icons/connecting_body@3x.png differ diff --git a/Telegram/Resources/icons/connecting_body_shadow@3x.png b/Telegram/Resources/icons/connecting_body_shadow@3x.png new file mode 100644 index 0000000000..b5e7dbee0e Binary files /dev/null and b/Telegram/Resources/icons/connecting_body_shadow@3x.png differ diff --git a/Telegram/Resources/icons/connecting_left@3x.png b/Telegram/Resources/icons/connecting_left@3x.png new file mode 100644 index 0000000000..a2e7964d68 Binary files /dev/null and b/Telegram/Resources/icons/connecting_left@3x.png differ diff --git a/Telegram/Resources/icons/connecting_left_shadow@3x.png b/Telegram/Resources/icons/connecting_left_shadow@3x.png new file mode 100644 index 0000000000..19151f98f7 Binary files /dev/null and b/Telegram/Resources/icons/connecting_left_shadow@3x.png differ diff --git a/Telegram/Resources/icons/connecting_right@3x.png b/Telegram/Resources/icons/connecting_right@3x.png new file mode 100644 index 0000000000..cb40c007c1 Binary files /dev/null and b/Telegram/Resources/icons/connecting_right@3x.png differ diff --git a/Telegram/Resources/icons/connecting_right_shadow@3x.png b/Telegram/Resources/icons/connecting_right_shadow@3x.png new file mode 100644 index 0000000000..e4a43e6793 Binary files /dev/null and b/Telegram/Resources/icons/connecting_right_shadow@3x.png differ diff --git a/Telegram/Resources/icons/contacts_add@3x.png b/Telegram/Resources/icons/contacts_add@3x.png new file mode 100644 index 0000000000..8d20e2d441 Binary files /dev/null and b/Telegram/Resources/icons/contacts_add@3x.png differ diff --git a/Telegram/Resources/icons/default_checkbox_check@3x.png b/Telegram/Resources/icons/default_checkbox_check@3x.png new file mode 100644 index 0000000000..46f67cbde1 Binary files /dev/null and b/Telegram/Resources/icons/default_checkbox_check@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_calendar@3x.png b/Telegram/Resources/icons/dialogs_calendar@3x.png new file mode 100644 index 0000000000..db5f07a821 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_calendar@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_cancel_search@3x.png b/Telegram/Resources/icons/dialogs_cancel_search@3x.png new file mode 100644 index 0000000000..e47946615f Binary files /dev/null and b/Telegram/Resources/icons/dialogs_cancel_search@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_channel@3x.png b/Telegram/Resources/icons/dialogs_channel@3x.png new file mode 100644 index 0000000000..57b6e17f46 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_channel@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_chat@3x.png b/Telegram/Resources/icons/dialogs_chat@3x.png new file mode 100644 index 0000000000..a98228cec5 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_chat@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_feed@3x.png b/Telegram/Resources/icons/dialogs_feed@3x.png new file mode 100644 index 0000000000..9b9bd9cc66 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_feed@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_lock@3x.png b/Telegram/Resources/icons/dialogs_lock@3x.png new file mode 100644 index 0000000000..700e216af4 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_lock@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_menu@3x.png b/Telegram/Resources/icons/dialogs_menu@3x.png new file mode 100644 index 0000000000..8fb50d1582 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_menu@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_pinned@3x.png b/Telegram/Resources/icons/dialogs_pinned@3x.png new file mode 100644 index 0000000000..c4f8324f98 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_pinned@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_received@3x.png b/Telegram/Resources/icons/dialogs_received@3x.png new file mode 100644 index 0000000000..c2302ab4b1 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_received@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_search_from@3x.png b/Telegram/Resources/icons/dialogs_search_from@3x.png new file mode 100644 index 0000000000..7965af83cc Binary files /dev/null and b/Telegram/Resources/icons/dialogs_search_from@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_sending@3x.png b/Telegram/Resources/icons/dialogs_sending@3x.png new file mode 100644 index 0000000000..6734ace1e1 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_sending@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_sent@3x.png b/Telegram/Resources/icons/dialogs_sent@3x.png new file mode 100644 index 0000000000..1140b44bc3 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_sent@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_unlock@3x.png b/Telegram/Resources/icons/dialogs_unlock@3x.png new file mode 100644 index 0000000000..457c1064c1 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_unlock@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_verified_check@3x.png b/Telegram/Resources/icons/dialogs_verified_check@3x.png new file mode 100644 index 0000000000..ce4145c47b Binary files /dev/null and b/Telegram/Resources/icons/dialogs_verified_check@3x.png differ diff --git a/Telegram/Resources/icons/dialogs_verified_star@3x.png b/Telegram/Resources/icons/dialogs_verified_star@3x.png new file mode 100644 index 0000000000..22b94f4838 Binary files /dev/null and b/Telegram/Resources/icons/dialogs_verified_star@3x.png differ diff --git a/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png b/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png new file mode 100644 index 0000000000..68130c224a Binary files /dev/null and b/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png differ diff --git a/Telegram/Resources/icons/emoji_activity@3x.png b/Telegram/Resources/icons/emoji_activity@3x.png new file mode 100644 index 0000000000..b7fa59814d Binary files /dev/null and b/Telegram/Resources/icons/emoji_activity@3x.png differ diff --git a/Telegram/Resources/icons/emoji_delete@3x.png b/Telegram/Resources/icons/emoji_delete@3x.png new file mode 100644 index 0000000000..06ea8e8d3a Binary files /dev/null and b/Telegram/Resources/icons/emoji_delete@3x.png differ diff --git a/Telegram/Resources/icons/emoji_delete_bg@3x.png b/Telegram/Resources/icons/emoji_delete_bg@3x.png new file mode 100644 index 0000000000..f4242b19ee Binary files /dev/null and b/Telegram/Resources/icons/emoji_delete_bg@3x.png differ diff --git a/Telegram/Resources/icons/emoji_faved@3x.png b/Telegram/Resources/icons/emoji_faved@3x.png new file mode 100644 index 0000000000..8a6509124b Binary files /dev/null and b/Telegram/Resources/icons/emoji_faved@3x.png differ diff --git a/Telegram/Resources/icons/emoji_food@3x.png b/Telegram/Resources/icons/emoji_food@3x.png new file mode 100644 index 0000000000..4a88adee68 Binary files /dev/null and b/Telegram/Resources/icons/emoji_food@3x.png differ diff --git a/Telegram/Resources/icons/emoji_nature@3x.png b/Telegram/Resources/icons/emoji_nature@3x.png new file mode 100644 index 0000000000..3a5b89c68b Binary files /dev/null and b/Telegram/Resources/icons/emoji_nature@3x.png differ diff --git a/Telegram/Resources/icons/emoji_objects@3x.png b/Telegram/Resources/icons/emoji_objects@3x.png new file mode 100644 index 0000000000..266c08b077 Binary files /dev/null and b/Telegram/Resources/icons/emoji_objects@3x.png differ diff --git a/Telegram/Resources/icons/emoji_people@3x.png b/Telegram/Resources/icons/emoji_people@3x.png new file mode 100644 index 0000000000..922843499d Binary files /dev/null and b/Telegram/Resources/icons/emoji_people@3x.png differ diff --git a/Telegram/Resources/icons/emoji_recent@3x.png b/Telegram/Resources/icons/emoji_recent@3x.png new file mode 100644 index 0000000000..c568efe05d Binary files /dev/null and b/Telegram/Resources/icons/emoji_recent@3x.png differ diff --git a/Telegram/Resources/icons/emoji_settings@3x.png b/Telegram/Resources/icons/emoji_settings@3x.png new file mode 100644 index 0000000000..8b92f5326f Binary files /dev/null and b/Telegram/Resources/icons/emoji_settings@3x.png differ diff --git a/Telegram/Resources/icons/emoji_switch@3x.png b/Telegram/Resources/icons/emoji_switch@3x.png new file mode 100644 index 0000000000..21573373a2 Binary files /dev/null and b/Telegram/Resources/icons/emoji_switch@3x.png differ diff --git a/Telegram/Resources/icons/emoji_symbols@3x.png b/Telegram/Resources/icons/emoji_symbols@3x.png new file mode 100644 index 0000000000..1305ac2414 Binary files /dev/null and b/Telegram/Resources/icons/emoji_symbols@3x.png differ diff --git a/Telegram/Resources/icons/emoji_travel@3x.png b/Telegram/Resources/icons/emoji_travel@3x.png new file mode 100644 index 0000000000..f54b62fe84 Binary files /dev/null and b/Telegram/Resources/icons/emoji_travel@3x.png differ diff --git a/Telegram/Resources/icons/emoji_trending@3x.png b/Telegram/Resources/icons/emoji_trending@3x.png new file mode 100644 index 0000000000..fd3e107edf Binary files /dev/null and b/Telegram/Resources/icons/emoji_trending@3x.png differ diff --git a/Telegram/Resources/icons/fade_horizontal@3x.png b/Telegram/Resources/icons/fade_horizontal@3x.png new file mode 100644 index 0000000000..5f7f76e800 Binary files /dev/null and b/Telegram/Resources/icons/fade_horizontal@3x.png differ diff --git a/Telegram/Resources/icons/fast_share@3x.png b/Telegram/Resources/icons/fast_share@3x.png new file mode 100644 index 0000000000..5181a751c4 Binary files /dev/null and b/Telegram/Resources/icons/fast_share@3x.png differ diff --git a/Telegram/Resources/icons/history_action_edit@3x.png b/Telegram/Resources/icons/history_action_edit@3x.png new file mode 100644 index 0000000000..25e8201221 Binary files /dev/null and b/Telegram/Resources/icons/history_action_edit@3x.png differ diff --git a/Telegram/Resources/icons/history_action_forward@3x.png b/Telegram/Resources/icons/history_action_forward@3x.png new file mode 100644 index 0000000000..06145c061a Binary files /dev/null and b/Telegram/Resources/icons/history_action_forward@3x.png differ diff --git a/Telegram/Resources/icons/history_action_reply@3x.png b/Telegram/Resources/icons/history_action_reply@3x.png new file mode 100644 index 0000000000..c6a3db9507 Binary files /dev/null and b/Telegram/Resources/icons/history_action_reply@3x.png differ diff --git a/Telegram/Resources/icons/history_down_arrow@3x.png b/Telegram/Resources/icons/history_down_arrow@3x.png new file mode 100644 index 0000000000..f6d0f7d1f9 Binary files /dev/null and b/Telegram/Resources/icons/history_down_arrow@3x.png differ diff --git a/Telegram/Resources/icons/history_down_circle@3x.png b/Telegram/Resources/icons/history_down_circle@3x.png new file mode 100644 index 0000000000..a3a546ef29 Binary files /dev/null and b/Telegram/Resources/icons/history_down_circle@3x.png differ diff --git a/Telegram/Resources/icons/history_down_shadow@3x.png b/Telegram/Resources/icons/history_down_shadow@3x.png new file mode 100644 index 0000000000..a8058033fc Binary files /dev/null and b/Telegram/Resources/icons/history_down_shadow@3x.png differ diff --git a/Telegram/Resources/icons/history_file_cancel@3x.png b/Telegram/Resources/icons/history_file_cancel@3x.png new file mode 100644 index 0000000000..0a5228bc6f Binary files /dev/null and b/Telegram/Resources/icons/history_file_cancel@3x.png differ diff --git a/Telegram/Resources/icons/history_file_document@3x.png b/Telegram/Resources/icons/history_file_document@3x.png new file mode 100644 index 0000000000..fbedbfda18 Binary files /dev/null and b/Telegram/Resources/icons/history_file_document@3x.png differ diff --git a/Telegram/Resources/icons/history_file_download@3x.png b/Telegram/Resources/icons/history_file_download@3x.png new file mode 100644 index 0000000000..721ff23d85 Binary files /dev/null and b/Telegram/Resources/icons/history_file_download@3x.png differ diff --git a/Telegram/Resources/icons/history_file_image@3x.png b/Telegram/Resources/icons/history_file_image@3x.png new file mode 100644 index 0000000000..6309182020 Binary files /dev/null and b/Telegram/Resources/icons/history_file_image@3x.png differ diff --git a/Telegram/Resources/icons/history_file_pause@3x.png b/Telegram/Resources/icons/history_file_pause@3x.png new file mode 100644 index 0000000000..7b97e46f2c Binary files /dev/null and b/Telegram/Resources/icons/history_file_pause@3x.png differ diff --git a/Telegram/Resources/icons/history_file_play@3x.png b/Telegram/Resources/icons/history_file_play@3x.png new file mode 100644 index 0000000000..f3ba409bce Binary files /dev/null and b/Telegram/Resources/icons/history_file_play@3x.png differ diff --git a/Telegram/Resources/icons/history_received@3x.png b/Telegram/Resources/icons/history_received@3x.png new file mode 100644 index 0000000000..273fa8b030 Binary files /dev/null and b/Telegram/Resources/icons/history_received@3x.png differ diff --git a/Telegram/Resources/icons/history_sent@3x.png b/Telegram/Resources/icons/history_sent@3x.png new file mode 100644 index 0000000000..e8a138541e Binary files /dev/null and b/Telegram/Resources/icons/history_sent@3x.png differ diff --git a/Telegram/Resources/icons/history_unread_mention@3x.png b/Telegram/Resources/icons/history_unread_mention@3x.png new file mode 100644 index 0000000000..c376e844ab Binary files /dev/null and b/Telegram/Resources/icons/history_unread_mention@3x.png differ diff --git a/Telegram/Resources/icons/history_views@3x.png b/Telegram/Resources/icons/history_views@3x.png new file mode 100644 index 0000000000..da8218adf6 Binary files /dev/null and b/Telegram/Resources/icons/history_views@3x.png differ diff --git a/Telegram/Resources/icons/info_actions@3x.png b/Telegram/Resources/icons/info_actions@3x.png new file mode 100644 index 0000000000..815d72c596 Binary files /dev/null and b/Telegram/Resources/icons/info_actions@3x.png differ diff --git a/Telegram/Resources/icons/info_add_member@3x.png b/Telegram/Resources/icons/info_add_member@3x.png new file mode 100644 index 0000000000..ef1f27ed04 Binary files /dev/null and b/Telegram/Resources/icons/info_add_member@3x.png differ diff --git a/Telegram/Resources/icons/info_administrators@3x.png b/Telegram/Resources/icons/info_administrators@3x.png new file mode 100644 index 0000000000..26f81d940a Binary files /dev/null and b/Telegram/Resources/icons/info_administrators@3x.png differ diff --git a/Telegram/Resources/icons/info_back@3x.png b/Telegram/Resources/icons/info_back@3x.png new file mode 100644 index 0000000000..96bbb7100d Binary files /dev/null and b/Telegram/Resources/icons/info_back@3x.png differ diff --git a/Telegram/Resources/icons/info_blacklist@3x.png b/Telegram/Resources/icons/info_blacklist@3x.png new file mode 100644 index 0000000000..fdc18c75d0 Binary files /dev/null and b/Telegram/Resources/icons/info_blacklist@3x.png differ diff --git a/Telegram/Resources/icons/info_close@3x.png b/Telegram/Resources/icons/info_close@3x.png new file mode 100644 index 0000000000..11c77f389a Binary files /dev/null and b/Telegram/Resources/icons/info_close@3x.png differ diff --git a/Telegram/Resources/icons/info_common_groups@3x.png b/Telegram/Resources/icons/info_common_groups@3x.png new file mode 100644 index 0000000000..fd6db2f7fb Binary files /dev/null and b/Telegram/Resources/icons/info_common_groups@3x.png differ diff --git a/Telegram/Resources/icons/info_information@3x.png b/Telegram/Resources/icons/info_information@3x.png new file mode 100644 index 0000000000..49c6caf223 Binary files /dev/null and b/Telegram/Resources/icons/info_information@3x.png differ diff --git a/Telegram/Resources/icons/info_media_audio@3x.png b/Telegram/Resources/icons/info_media_audio@3x.png new file mode 100644 index 0000000000..1af314ae33 Binary files /dev/null and b/Telegram/Resources/icons/info_media_audio@3x.png differ diff --git a/Telegram/Resources/icons/info_media_audio_empty@3x.png b/Telegram/Resources/icons/info_media_audio_empty@3x.png new file mode 100644 index 0000000000..5ee34bfbc5 Binary files /dev/null and b/Telegram/Resources/icons/info_media_audio_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_media_delete@3x.png b/Telegram/Resources/icons/info_media_delete@3x.png new file mode 100644 index 0000000000..425d12bdbd Binary files /dev/null and b/Telegram/Resources/icons/info_media_delete@3x.png differ diff --git a/Telegram/Resources/icons/info_media_file@3x.png b/Telegram/Resources/icons/info_media_file@3x.png new file mode 100644 index 0000000000..d4e95a57af Binary files /dev/null and b/Telegram/Resources/icons/info_media_file@3x.png differ diff --git a/Telegram/Resources/icons/info_media_file_empty@3x.png b/Telegram/Resources/icons/info_media_file_empty@3x.png new file mode 100644 index 0000000000..ea239b306c Binary files /dev/null and b/Telegram/Resources/icons/info_media_file_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_media_forward@3x.png b/Telegram/Resources/icons/info_media_forward@3x.png new file mode 100644 index 0000000000..b623b6a862 Binary files /dev/null and b/Telegram/Resources/icons/info_media_forward@3x.png differ diff --git a/Telegram/Resources/icons/info_media_link@3x.png b/Telegram/Resources/icons/info_media_link@3x.png new file mode 100644 index 0000000000..faf0c25ed7 Binary files /dev/null and b/Telegram/Resources/icons/info_media_link@3x.png differ diff --git a/Telegram/Resources/icons/info_media_link_empty@3x.png b/Telegram/Resources/icons/info_media_link_empty@3x.png new file mode 100644 index 0000000000..8746f46bc9 Binary files /dev/null and b/Telegram/Resources/icons/info_media_link_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_media_photo@3x.png b/Telegram/Resources/icons/info_media_photo@3x.png new file mode 100644 index 0000000000..b15e3b0578 Binary files /dev/null and b/Telegram/Resources/icons/info_media_photo@3x.png differ diff --git a/Telegram/Resources/icons/info_media_photo_empty@3x.png b/Telegram/Resources/icons/info_media_photo_empty@3x.png new file mode 100644 index 0000000000..977f2a3bd1 Binary files /dev/null and b/Telegram/Resources/icons/info_media_photo_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_media_round@3x.png b/Telegram/Resources/icons/info_media_round@3x.png new file mode 100644 index 0000000000..7776d09c21 Binary files /dev/null and b/Telegram/Resources/icons/info_media_round@3x.png differ diff --git a/Telegram/Resources/icons/info_media_video@3x.png b/Telegram/Resources/icons/info_media_video@3x.png new file mode 100644 index 0000000000..225ff32c83 Binary files /dev/null and b/Telegram/Resources/icons/info_media_video@3x.png differ diff --git a/Telegram/Resources/icons/info_media_video_empty@3x.png b/Telegram/Resources/icons/info_media_video_empty@3x.png new file mode 100644 index 0000000000..c5bbc23375 Binary files /dev/null and b/Telegram/Resources/icons/info_media_video_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_media_voice@3x.png b/Telegram/Resources/icons/info_media_voice@3x.png new file mode 100644 index 0000000000..055983fe27 Binary files /dev/null and b/Telegram/Resources/icons/info_media_voice@3x.png differ diff --git a/Telegram/Resources/icons/info_media_voice_empty@3x.png b/Telegram/Resources/icons/info_media_voice_empty@3x.png new file mode 100644 index 0000000000..5b593822c0 Binary files /dev/null and b/Telegram/Resources/icons/info_media_voice_empty@3x.png differ diff --git a/Telegram/Resources/icons/info_members@3x.png b/Telegram/Resources/icons/info_members@3x.png new file mode 100644 index 0000000000..68dda47473 Binary files /dev/null and b/Telegram/Resources/icons/info_members@3x.png differ diff --git a/Telegram/Resources/icons/info_notifications@3x.png b/Telegram/Resources/icons/info_notifications@3x.png new file mode 100644 index 0000000000..c5898d7745 Binary files /dev/null and b/Telegram/Resources/icons/info_notifications@3x.png differ diff --git a/Telegram/Resources/icons/info_recent_actions@3x.png b/Telegram/Resources/icons/info_recent_actions@3x.png new file mode 100644 index 0000000000..366794067b Binary files /dev/null and b/Telegram/Resources/icons/info_recent_actions@3x.png differ diff --git a/Telegram/Resources/icons/info_restricted_users@3x.png b/Telegram/Resources/icons/info_restricted_users@3x.png new file mode 100644 index 0000000000..1f846324bc Binary files /dev/null and b/Telegram/Resources/icons/info_restricted_users@3x.png differ diff --git a/Telegram/Resources/icons/inline_button_switch@3x.png b/Telegram/Resources/icons/inline_button_switch@3x.png new file mode 100644 index 0000000000..428d328c22 Binary files /dev/null and b/Telegram/Resources/icons/inline_button_switch@3x.png differ diff --git a/Telegram/Resources/icons/inline_button_url@3x.png b/Telegram/Resources/icons/inline_button_url@3x.png new file mode 100644 index 0000000000..801baba447 Binary files /dev/null and b/Telegram/Resources/icons/inline_button_url@3x.png differ diff --git a/Telegram/Resources/icons/install_update@3x.png b/Telegram/Resources/icons/install_update@3x.png new file mode 100644 index 0000000000..8a0c29a916 Binary files /dev/null and b/Telegram/Resources/icons/install_update@3x.png differ diff --git a/Telegram/Resources/icons/intro_country_dropdown@3x.png b/Telegram/Resources/icons/intro_country_dropdown@3x.png new file mode 100644 index 0000000000..3a152c7c0b Binary files /dev/null and b/Telegram/Resources/icons/intro_country_dropdown@3x.png differ diff --git a/Telegram/Resources/icons/intro_left@3x.png b/Telegram/Resources/icons/intro_left@3x.png new file mode 100644 index 0000000000..fe6ead7671 Binary files /dev/null and b/Telegram/Resources/icons/intro_left@3x.png differ diff --git a/Telegram/Resources/icons/intro_plane_inner@3x.png b/Telegram/Resources/icons/intro_plane_inner@3x.png new file mode 100644 index 0000000000..3067c138f4 Binary files /dev/null and b/Telegram/Resources/icons/intro_plane_inner@3x.png differ diff --git a/Telegram/Resources/icons/intro_plane_outer@3x.png b/Telegram/Resources/icons/intro_plane_outer@3x.png new file mode 100644 index 0000000000..58a3dacc73 Binary files /dev/null and b/Telegram/Resources/icons/intro_plane_outer@3x.png differ diff --git a/Telegram/Resources/icons/intro_plane_top@3x.png b/Telegram/Resources/icons/intro_plane_top@3x.png new file mode 100644 index 0000000000..c7d8f099de Binary files /dev/null and b/Telegram/Resources/icons/intro_plane_top@3x.png differ diff --git a/Telegram/Resources/icons/intro_plane_trace@3x.png b/Telegram/Resources/icons/intro_plane_trace@3x.png new file mode 100644 index 0000000000..9eb0636766 Binary files /dev/null and b/Telegram/Resources/icons/intro_plane_trace@3x.png differ diff --git a/Telegram/Resources/icons/intro_right@3x.png b/Telegram/Resources/icons/intro_right@3x.png new file mode 100644 index 0000000000..081ea5316d Binary files /dev/null and b/Telegram/Resources/icons/intro_right@3x.png differ diff --git a/Telegram/Resources/icons/mac_tray_icon@3x.png b/Telegram/Resources/icons/mac_tray_icon@3x.png new file mode 100644 index 0000000000..8f61505b40 Binary files /dev/null and b/Telegram/Resources/icons/mac_tray_icon@3x.png differ diff --git a/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png b/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png new file mode 100644 index 0000000000..6561ede861 Binary files /dev/null and b/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png differ diff --git a/Telegram/Resources/icons/map_point.png b/Telegram/Resources/icons/map_point.png index 5fdbbbed46..56f91ccf28 100644 Binary files a/Telegram/Resources/icons/map_point.png and b/Telegram/Resources/icons/map_point.png differ diff --git a/Telegram/Resources/icons/map_point@2x.png b/Telegram/Resources/icons/map_point@2x.png index 1f0a03e442..6650daf74b 100644 Binary files a/Telegram/Resources/icons/map_point@2x.png and b/Telegram/Resources/icons/map_point@2x.png differ diff --git a/Telegram/Resources/icons/map_point@3x.png b/Telegram/Resources/icons/map_point@3x.png new file mode 100644 index 0000000000..469f927031 Binary files /dev/null and b/Telegram/Resources/icons/map_point@3x.png differ diff --git a/Telegram/Resources/icons/map_point_inner.png b/Telegram/Resources/icons/map_point_inner.png new file mode 100644 index 0000000000..ba70187298 Binary files /dev/null and b/Telegram/Resources/icons/map_point_inner.png differ diff --git a/Telegram/Resources/icons/map_point_inner@2x.png b/Telegram/Resources/icons/map_point_inner@2x.png new file mode 100644 index 0000000000..13ffe92656 Binary files /dev/null and b/Telegram/Resources/icons/map_point_inner@2x.png differ diff --git a/Telegram/Resources/icons/map_point_inner@3x.png b/Telegram/Resources/icons/map_point_inner@3x.png new file mode 100644 index 0000000000..4f9f19c6df Binary files /dev/null and b/Telegram/Resources/icons/map_point_inner@3x.png differ diff --git a/Telegram/Resources/icons/media_fullscreen_from@3x.png b/Telegram/Resources/icons/media_fullscreen_from@3x.png new file mode 100644 index 0000000000..820f35f1a7 Binary files /dev/null and b/Telegram/Resources/icons/media_fullscreen_from@3x.png differ diff --git a/Telegram/Resources/icons/media_fullscreen_to@3x.png b/Telegram/Resources/icons/media_fullscreen_to@3x.png new file mode 100644 index 0000000000..1db867de5c Binary files /dev/null and b/Telegram/Resources/icons/media_fullscreen_to@3x.png differ diff --git a/Telegram/Resources/icons/media_pause@3x.png b/Telegram/Resources/icons/media_pause@3x.png new file mode 100644 index 0000000000..84753ee107 Binary files /dev/null and b/Telegram/Resources/icons/media_pause@3x.png differ diff --git a/Telegram/Resources/icons/media_play@3x.png b/Telegram/Resources/icons/media_play@3x.png new file mode 100644 index 0000000000..8704cb2eaa Binary files /dev/null and b/Telegram/Resources/icons/media_play@3x.png differ diff --git a/Telegram/Resources/icons/media_video_play@3x.png b/Telegram/Resources/icons/media_video_play@3x.png new file mode 100644 index 0000000000..06959f696d Binary files /dev/null and b/Telegram/Resources/icons/media_video_play@3x.png differ diff --git a/Telegram/Resources/icons/media_video_play_bg@3x.png b/Telegram/Resources/icons/media_video_play_bg@3x.png new file mode 100644 index 0000000000..33e555b130 Binary files /dev/null and b/Telegram/Resources/icons/media_video_play_bg@3x.png differ diff --git a/Telegram/Resources/icons/media_youtube_play@3x.png b/Telegram/Resources/icons/media_youtube_play@3x.png new file mode 100644 index 0000000000..0a199297b1 Binary files /dev/null and b/Telegram/Resources/icons/media_youtube_play@3x.png differ diff --git a/Telegram/Resources/icons/media_youtube_play_bg@3x.png b/Telegram/Resources/icons/media_youtube_play_bg@3x.png new file mode 100644 index 0000000000..dc531db5b6 Binary files /dev/null and b/Telegram/Resources/icons/media_youtube_play_bg@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_close@3x.png b/Telegram/Resources/icons/mediaview_close@3x.png new file mode 100644 index 0000000000..b52db954cb Binary files /dev/null and b/Telegram/Resources/icons/mediaview_close@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_download@3x.png b/Telegram/Resources/icons/mediaview_download@3x.png new file mode 100644 index 0000000000..5f3c4930a2 Binary files /dev/null and b/Telegram/Resources/icons/mediaview_download@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_file_corner@3x.png b/Telegram/Resources/icons/mediaview_file_corner@3x.png new file mode 100644 index 0000000000..17fe2ac052 Binary files /dev/null and b/Telegram/Resources/icons/mediaview_file_corner@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_more@3x.png b/Telegram/Resources/icons/mediaview_more@3x.png new file mode 100644 index 0000000000..5fd3b82628 Binary files /dev/null and b/Telegram/Resources/icons/mediaview_more@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_next@3x.png b/Telegram/Resources/icons/mediaview_next@3x.png new file mode 100644 index 0000000000..06197f2266 Binary files /dev/null and b/Telegram/Resources/icons/mediaview_next@3x.png differ diff --git a/Telegram/Resources/icons/mediaview_save_check@3x.png b/Telegram/Resources/icons/mediaview_save_check@3x.png new file mode 100644 index 0000000000..aae249a7a0 Binary files /dev/null and b/Telegram/Resources/icons/mediaview_save_check@3x.png differ diff --git a/Telegram/Resources/icons/menu_calls@3x.png b/Telegram/Resources/icons/menu_calls@3x.png new file mode 100644 index 0000000000..ff274b7208 Binary files /dev/null and b/Telegram/Resources/icons/menu_calls@3x.png differ diff --git a/Telegram/Resources/icons/menu_fix_order.png b/Telegram/Resources/icons/menu_fix_order.png index ea239dd85d..3532df78bb 100644 Binary files a/Telegram/Resources/icons/menu_fix_order.png and b/Telegram/Resources/icons/menu_fix_order.png differ diff --git a/Telegram/Resources/icons/menu_fix_order@2x.png b/Telegram/Resources/icons/menu_fix_order@2x.png index 58faf304a5..7f614949f4 100644 Binary files a/Telegram/Resources/icons/menu_fix_order@2x.png and b/Telegram/Resources/icons/menu_fix_order@2x.png differ diff --git a/Telegram/Resources/icons/menu_fix_order@3x.png b/Telegram/Resources/icons/menu_fix_order@3x.png new file mode 100644 index 0000000000..f1547f7db3 Binary files /dev/null and b/Telegram/Resources/icons/menu_fix_order@3x.png differ diff --git a/Telegram/Resources/icons/menu_new_channel@3x.png b/Telegram/Resources/icons/menu_new_channel@3x.png new file mode 100644 index 0000000000..865f5d1e23 Binary files /dev/null and b/Telegram/Resources/icons/menu_new_channel@3x.png differ diff --git a/Telegram/Resources/icons/menu_new_group@3x.png b/Telegram/Resources/icons/menu_new_group@3x.png new file mode 100644 index 0000000000..ce97ca11dd Binary files /dev/null and b/Telegram/Resources/icons/menu_new_group@3x.png differ diff --git a/Telegram/Resources/icons/menu_night_mode@3x.png b/Telegram/Resources/icons/menu_night_mode@3x.png new file mode 100644 index 0000000000..5fa4859cbf Binary files /dev/null and b/Telegram/Resources/icons/menu_night_mode@3x.png differ diff --git a/Telegram/Resources/icons/menu_reload.png b/Telegram/Resources/icons/menu_reload.png index c269d5951b..d54f7d0b00 100644 Binary files a/Telegram/Resources/icons/menu_reload.png and b/Telegram/Resources/icons/menu_reload.png differ diff --git a/Telegram/Resources/icons/menu_reload@2x.png b/Telegram/Resources/icons/menu_reload@2x.png index e07751761f..ed37c4f746 100644 Binary files a/Telegram/Resources/icons/menu_reload@2x.png and b/Telegram/Resources/icons/menu_reload@2x.png differ diff --git a/Telegram/Resources/icons/menu_reload@3x.png b/Telegram/Resources/icons/menu_reload@3x.png new file mode 100644 index 0000000000..4bf8e37e42 Binary files /dev/null and b/Telegram/Resources/icons/menu_reload@3x.png differ diff --git a/Telegram/Resources/icons/menu_settings@3x.png b/Telegram/Resources/icons/menu_settings@3x.png new file mode 100644 index 0000000000..19b108f568 Binary files /dev/null and b/Telegram/Resources/icons/menu_settings@3x.png differ diff --git a/Telegram/Resources/icons/monitor@3x.png b/Telegram/Resources/icons/monitor@3x.png new file mode 100644 index 0000000000..a919f3a0a8 Binary files /dev/null and b/Telegram/Resources/icons/monitor@3x.png differ diff --git a/Telegram/Resources/icons/new_chat_photo@3x.png b/Telegram/Resources/icons/new_chat_photo@3x.png new file mode 100644 index 0000000000..fe82c72ebf Binary files /dev/null and b/Telegram/Resources/icons/new_chat_photo@3x.png differ diff --git a/Telegram/Resources/icons/notification_send@3x.png b/Telegram/Resources/icons/notification_send@3x.png new file mode 100644 index 0000000000..ead5d77db4 Binary files /dev/null and b/Telegram/Resources/icons/notification_send@3x.png differ diff --git a/Telegram/Resources/icons/overview_links_check@3x.png b/Telegram/Resources/icons/overview_links_check@3x.png new file mode 100644 index 0000000000..ba46547115 Binary files /dev/null and b/Telegram/Resources/icons/overview_links_check@3x.png differ diff --git a/Telegram/Resources/icons/overview_links_check_bg@3x.png b/Telegram/Resources/icons/overview_links_check_bg@3x.png new file mode 100644 index 0000000000..a58dc78058 Binary files /dev/null and b/Telegram/Resources/icons/overview_links_check_bg@3x.png differ diff --git a/Telegram/Resources/icons/overview_photo_check@3x.png b/Telegram/Resources/icons/overview_photo_check@3x.png new file mode 100644 index 0000000000..d17d4e023b Binary files /dev/null and b/Telegram/Resources/icons/overview_photo_check@3x.png differ diff --git a/Telegram/Resources/icons/passport_authorize@3x.png b/Telegram/Resources/icons/passport_authorize@3x.png new file mode 100644 index 0000000000..bc861977a3 Binary files /dev/null and b/Telegram/Resources/icons/passport_authorize@3x.png differ diff --git a/Telegram/Resources/icons/passport_empty@3x.png b/Telegram/Resources/icons/passport_empty@3x.png new file mode 100644 index 0000000000..c4653b6b71 Binary files /dev/null and b/Telegram/Resources/icons/passport_empty@3x.png differ diff --git a/Telegram/Resources/icons/passport_password_setup@3x.png b/Telegram/Resources/icons/passport_password_setup@3x.png new file mode 100644 index 0000000000..af3c9374e8 Binary files /dev/null and b/Telegram/Resources/icons/passport_password_setup@3x.png differ diff --git a/Telegram/Resources/icons/passport_ready@3x.png b/Telegram/Resources/icons/passport_ready@3x.png new file mode 100644 index 0000000000..f86ddaa495 Binary files /dev/null and b/Telegram/Resources/icons/passport_ready@3x.png differ diff --git a/Telegram/Resources/icons/phone_simcard_from@3x.png b/Telegram/Resources/icons/phone_simcard_from@3x.png new file mode 100644 index 0000000000..a0df7abaa7 Binary files /dev/null and b/Telegram/Resources/icons/phone_simcard_from@3x.png differ diff --git a/Telegram/Resources/icons/phone_simcard_migrate@3x.png b/Telegram/Resources/icons/phone_simcard_migrate@3x.png new file mode 100644 index 0000000000..4df340affd Binary files /dev/null and b/Telegram/Resources/icons/phone_simcard_migrate@3x.png differ diff --git a/Telegram/Resources/icons/phone_simcard_to@3x.png b/Telegram/Resources/icons/phone_simcard_to@3x.png new file mode 100644 index 0000000000..fa2d93ffa3 Binary files /dev/null and b/Telegram/Resources/icons/phone_simcard_to@3x.png differ diff --git a/Telegram/Resources/icons/player_close@3x.png b/Telegram/Resources/icons/player_close@3x.png new file mode 100644 index 0000000000..c6d8846fa4 Binary files /dev/null and b/Telegram/Resources/icons/player_close@3x.png differ diff --git a/Telegram/Resources/icons/player_next@3x.png b/Telegram/Resources/icons/player_next@3x.png new file mode 100644 index 0000000000..7650bfdb7b Binary files /dev/null and b/Telegram/Resources/icons/player_next@3x.png differ diff --git a/Telegram/Resources/icons/player_panel_next@3x.png b/Telegram/Resources/icons/player_panel_next@3x.png new file mode 100644 index 0000000000..05ac526903 Binary files /dev/null and b/Telegram/Resources/icons/player_panel_next@3x.png differ diff --git a/Telegram/Resources/icons/player_panel_pin@3x.png b/Telegram/Resources/icons/player_panel_pin@3x.png new file mode 100644 index 0000000000..7ad80b27fd Binary files /dev/null and b/Telegram/Resources/icons/player_panel_pin@3x.png differ diff --git a/Telegram/Resources/icons/player_repeat@3x.png b/Telegram/Resources/icons/player_repeat@3x.png new file mode 100644 index 0000000000..d37882c23c Binary files /dev/null and b/Telegram/Resources/icons/player_repeat@3x.png differ diff --git a/Telegram/Resources/icons/player_volume0@3x.png b/Telegram/Resources/icons/player_volume0@3x.png new file mode 100644 index 0000000000..5b77505083 Binary files /dev/null and b/Telegram/Resources/icons/player_volume0@3x.png differ diff --git a/Telegram/Resources/icons/player_volume1@3x.png b/Telegram/Resources/icons/player_volume1@3x.png new file mode 100644 index 0000000000..1e9daea63e Binary files /dev/null and b/Telegram/Resources/icons/player_volume1@3x.png differ diff --git a/Telegram/Resources/icons/player_volume2@3x.png b/Telegram/Resources/icons/player_volume2@3x.png new file mode 100644 index 0000000000..824386b9d9 Binary files /dev/null and b/Telegram/Resources/icons/player_volume2@3x.png differ diff --git a/Telegram/Resources/icons/player_volume3@3x.png b/Telegram/Resources/icons/player_volume3@3x.png new file mode 100644 index 0000000000..24ff5175ce Binary files /dev/null and b/Telegram/Resources/icons/player_volume3@3x.png differ diff --git a/Telegram/Resources/icons/playlist_cancel@3x.png b/Telegram/Resources/icons/playlist_cancel@3x.png new file mode 100644 index 0000000000..1792b56487 Binary files /dev/null and b/Telegram/Resources/icons/playlist_cancel@3x.png differ diff --git a/Telegram/Resources/icons/playlist_download@3x.png b/Telegram/Resources/icons/playlist_download@3x.png new file mode 100644 index 0000000000..46d208aa54 Binary files /dev/null and b/Telegram/Resources/icons/playlist_download@3x.png differ diff --git a/Telegram/Resources/icons/playlist_pause@3x.png b/Telegram/Resources/icons/playlist_pause@3x.png new file mode 100644 index 0000000000..d258d1b434 Binary files /dev/null and b/Telegram/Resources/icons/playlist_pause@3x.png differ diff --git a/Telegram/Resources/icons/playlist_play@3x.png b/Telegram/Resources/icons/playlist_play@3x.png new file mode 100644 index 0000000000..088a70eb76 Binary files /dev/null and b/Telegram/Resources/icons/playlist_play@3x.png differ diff --git a/Telegram/Resources/icons/playlist_shadow@3x.png b/Telegram/Resources/icons/playlist_shadow@3x.png new file mode 100644 index 0000000000..13f760f829 Binary files /dev/null and b/Telegram/Resources/icons/playlist_shadow@3x.png differ diff --git a/Telegram/Resources/icons/profile_add_member@3x.png b/Telegram/Resources/icons/profile_add_member@3x.png new file mode 100644 index 0000000000..856b36b03e Binary files /dev/null and b/Telegram/Resources/icons/profile_add_member@3x.png differ diff --git a/Telegram/Resources/icons/profile_admin_star@3x.png b/Telegram/Resources/icons/profile_admin_star@3x.png new file mode 100644 index 0000000000..376b48673f Binary files /dev/null and b/Telegram/Resources/icons/profile_admin_star@3x.png differ diff --git a/Telegram/Resources/icons/profile_divider_bottom@3x.png b/Telegram/Resources/icons/profile_divider_bottom@3x.png new file mode 100644 index 0000000000..99d87293e7 Binary files /dev/null and b/Telegram/Resources/icons/profile_divider_bottom@3x.png differ diff --git a/Telegram/Resources/icons/profile_divider_left@3x.png b/Telegram/Resources/icons/profile_divider_left@3x.png new file mode 100644 index 0000000000..ccf2312a9c Binary files /dev/null and b/Telegram/Resources/icons/profile_divider_left@3x.png differ diff --git a/Telegram/Resources/icons/profile_divider_top@3x.png b/Telegram/Resources/icons/profile_divider_top@3x.png new file mode 100644 index 0000000000..938e1e1c20 Binary files /dev/null and b/Telegram/Resources/icons/profile_divider_top@3x.png differ diff --git a/Telegram/Resources/icons/profile_verified_check@3x.png b/Telegram/Resources/icons/profile_verified_check@3x.png new file mode 100644 index 0000000000..511c349f2f Binary files /dev/null and b/Telegram/Resources/icons/profile_verified_check@3x.png differ diff --git a/Telegram/Resources/icons/profile_verified_star@3x.png b/Telegram/Resources/icons/profile_verified_star@3x.png new file mode 100644 index 0000000000..8ada01147b Binary files /dev/null and b/Telegram/Resources/icons/profile_verified_star@3x.png differ diff --git a/Telegram/Resources/icons/proxy_off@3x.png b/Telegram/Resources/icons/proxy_off@3x.png new file mode 100644 index 0000000000..99dd48f08d Binary files /dev/null and b/Telegram/Resources/icons/proxy_off@3x.png differ diff --git a/Telegram/Resources/icons/proxy_on@3x.png b/Telegram/Resources/icons/proxy_on@3x.png new file mode 100644 index 0000000000..770ec312b5 Binary files /dev/null and b/Telegram/Resources/icons/proxy_on@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_bottom@3x.png b/Telegram/Resources/icons/round_shadow_bottom@3x.png new file mode 100644 index 0000000000..ab45b1bf02 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_bottom@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_bottom_left@3x.png b/Telegram/Resources/icons/round_shadow_bottom_left@3x.png new file mode 100644 index 0000000000..0e96060783 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_bottom_left@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_box_bottom@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom@3x.png new file mode 100644 index 0000000000..5bd5153092 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_box_bottom@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png new file mode 100644 index 0000000000..a8b2b8d0b8 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_box_left@3x.png b/Telegram/Resources/icons/round_shadow_box_left@3x.png new file mode 100644 index 0000000000..f52dac8931 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_box_left@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_box_top@3x.png b/Telegram/Resources/icons/round_shadow_box_top@3x.png new file mode 100644 index 0000000000..96de2ada8f Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_box_top@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_box_top_left@3x.png b/Telegram/Resources/icons/round_shadow_box_top_left@3x.png new file mode 100644 index 0000000000..d8e5c7fb18 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_box_top_left@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_left@3x.png b/Telegram/Resources/icons/round_shadow_left@3x.png new file mode 100644 index 0000000000..2431067e23 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_left@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_top@3x.png b/Telegram/Resources/icons/round_shadow_top@3x.png new file mode 100644 index 0000000000..5e3c7b6ac0 Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_top@3x.png differ diff --git a/Telegram/Resources/icons/round_shadow_top_left@3x.png b/Telegram/Resources/icons/round_shadow_top_left@3x.png new file mode 100644 index 0000000000..16d3a6862b Binary files /dev/null and b/Telegram/Resources/icons/round_shadow_top_left@3x.png differ diff --git a/Telegram/Resources/icons/send_control_attach@3x.png b/Telegram/Resources/icons/send_control_attach@3x.png new file mode 100644 index 0000000000..73c7c8ebaf Binary files /dev/null and b/Telegram/Resources/icons/send_control_attach@3x.png differ diff --git a/Telegram/Resources/icons/send_control_bot_command@3x.png b/Telegram/Resources/icons/send_control_bot_command@3x.png new file mode 100644 index 0000000000..31d772e515 Binary files /dev/null and b/Telegram/Resources/icons/send_control_bot_command@3x.png differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard@3x.png b/Telegram/Resources/icons/send_control_bot_keyboard@3x.png new file mode 100644 index 0000000000..423c86be42 Binary files /dev/null and b/Telegram/Resources/icons/send_control_bot_keyboard@3x.png differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png b/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png new file mode 100644 index 0000000000..f259f9edc9 Binary files /dev/null and b/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png differ diff --git a/Telegram/Resources/icons/send_control_emoji@3x.png b/Telegram/Resources/icons/send_control_emoji@3x.png new file mode 100644 index 0000000000..6bc54d10b2 Binary files /dev/null and b/Telegram/Resources/icons/send_control_emoji@3x.png differ diff --git a/Telegram/Resources/icons/send_control_record@3x.png b/Telegram/Resources/icons/send_control_record@3x.png new file mode 100644 index 0000000000..5e1469f202 Binary files /dev/null and b/Telegram/Resources/icons/send_control_record@3x.png differ diff --git a/Telegram/Resources/icons/send_control_save@3x.png b/Telegram/Resources/icons/send_control_save@3x.png new file mode 100644 index 0000000000..e4961c0e2e Binary files /dev/null and b/Telegram/Resources/icons/send_control_save@3x.png differ diff --git a/Telegram/Resources/icons/send_control_send@3x.png b/Telegram/Resources/icons/send_control_send@3x.png new file mode 100644 index 0000000000..c8d3c00d68 Binary files /dev/null and b/Telegram/Resources/icons/send_control_send@3x.png differ diff --git a/Telegram/Resources/icons/send_control_silent_off@3x.png b/Telegram/Resources/icons/send_control_silent_off@3x.png new file mode 100644 index 0000000000..794c67ae1a Binary files /dev/null and b/Telegram/Resources/icons/send_control_silent_off@3x.png differ diff --git a/Telegram/Resources/icons/send_control_silent_on@3x.png b/Telegram/Resources/icons/send_control_silent_on@3x.png new file mode 100644 index 0000000000..4eaa2d384e Binary files /dev/null and b/Telegram/Resources/icons/send_control_silent_on@3x.png differ diff --git a/Telegram/Resources/icons/settings_advanced@3x.png b/Telegram/Resources/icons/settings_advanced@3x.png new file mode 100644 index 0000000000..bdcd1797ec Binary files /dev/null and b/Telegram/Resources/icons/settings_advanced@3x.png differ diff --git a/Telegram/Resources/icons/settings_chat@3x.png b/Telegram/Resources/icons/settings_chat@3x.png new file mode 100644 index 0000000000..a312eadf06 Binary files /dev/null and b/Telegram/Resources/icons/settings_chat@3x.png differ diff --git a/Telegram/Resources/icons/settings_edit@3x.png b/Telegram/Resources/icons/settings_edit@3x.png new file mode 100644 index 0000000000..cb01f91222 Binary files /dev/null and b/Telegram/Resources/icons/settings_edit@3x.png differ diff --git a/Telegram/Resources/icons/settings_edit_name@3x.png b/Telegram/Resources/icons/settings_edit_name@3x.png new file mode 100644 index 0000000000..569ec93d9c Binary files /dev/null and b/Telegram/Resources/icons/settings_edit_name@3x.png differ diff --git a/Telegram/Resources/icons/settings_faq@3x.png b/Telegram/Resources/icons/settings_faq@3x.png new file mode 100644 index 0000000000..ab13177ef9 Binary files /dev/null and b/Telegram/Resources/icons/settings_faq@3x.png differ diff --git a/Telegram/Resources/icons/settings_information@3x.png b/Telegram/Resources/icons/settings_information@3x.png new file mode 100644 index 0000000000..489f2ac0a6 Binary files /dev/null and b/Telegram/Resources/icons/settings_information@3x.png differ diff --git a/Telegram/Resources/icons/settings_interface_scale@3x.png b/Telegram/Resources/icons/settings_interface_scale@3x.png new file mode 100644 index 0000000000..3bcca5b7f0 Binary files /dev/null and b/Telegram/Resources/icons/settings_interface_scale@3x.png differ diff --git a/Telegram/Resources/icons/settings_language@3x.png b/Telegram/Resources/icons/settings_language@3x.png new file mode 100644 index 0000000000..6619203f5f Binary files /dev/null and b/Telegram/Resources/icons/settings_language@3x.png differ diff --git a/Telegram/Resources/icons/settings_name@3x.png b/Telegram/Resources/icons/settings_name@3x.png new file mode 100644 index 0000000000..94087b5993 Binary files /dev/null and b/Telegram/Resources/icons/settings_name@3x.png differ diff --git a/Telegram/Resources/icons/settings_notifications@3x.png b/Telegram/Resources/icons/settings_notifications@3x.png new file mode 100644 index 0000000000..74815bc591 Binary files /dev/null and b/Telegram/Resources/icons/settings_notifications@3x.png differ diff --git a/Telegram/Resources/icons/settings_phone_number@3x.png b/Telegram/Resources/icons/settings_phone_number@3x.png new file mode 100644 index 0000000000..0bb633545f Binary files /dev/null and b/Telegram/Resources/icons/settings_phone_number@3x.png differ diff --git a/Telegram/Resources/icons/settings_privacy_security@3x.png b/Telegram/Resources/icons/settings_privacy_security@3x.png new file mode 100644 index 0000000000..f4a37722e9 Binary files /dev/null and b/Telegram/Resources/icons/settings_privacy_security@3x.png differ diff --git a/Telegram/Resources/icons/settings_stickers@3x.png b/Telegram/Resources/icons/settings_stickers@3x.png new file mode 100644 index 0000000000..26e9fe0a27 Binary files /dev/null and b/Telegram/Resources/icons/settings_stickers@3x.png differ diff --git a/Telegram/Resources/icons/settings_themes@3x.png b/Telegram/Resources/icons/settings_themes@3x.png new file mode 100644 index 0000000000..0694f77bce Binary files /dev/null and b/Telegram/Resources/icons/settings_themes@3x.png differ diff --git a/Telegram/Resources/icons/settings_username@3x.png b/Telegram/Resources/icons/settings_username@3x.png new file mode 100644 index 0000000000..c35e1a78d1 Binary files /dev/null and b/Telegram/Resources/icons/settings_username@3x.png differ diff --git a/Telegram/Resources/icons/simple_close@3x.png b/Telegram/Resources/icons/simple_close@3x.png new file mode 100644 index 0000000000..5a5f817033 Binary files /dev/null and b/Telegram/Resources/icons/simple_close@3x.png differ diff --git a/Telegram/Resources/icons/slide_shadow@3x.png b/Telegram/Resources/icons/slide_shadow@3x.png new file mode 100644 index 0000000000..a67d341e0e Binary files /dev/null and b/Telegram/Resources/icons/slide_shadow@3x.png differ diff --git a/Telegram/Resources/icons/stickers_add@3x.png b/Telegram/Resources/icons/stickers_add@3x.png new file mode 100644 index 0000000000..de40bbad2c Binary files /dev/null and b/Telegram/Resources/icons/stickers_add@3x.png differ diff --git a/Telegram/Resources/icons/stickers_empty@3x.png b/Telegram/Resources/icons/stickers_empty@3x.png new file mode 100644 index 0000000000..3b093c0446 Binary files /dev/null and b/Telegram/Resources/icons/stickers_empty@3x.png differ diff --git a/Telegram/Resources/icons/stickers_remove@3x.png b/Telegram/Resources/icons/stickers_remove@3x.png new file mode 100644 index 0000000000..ce5bd3a258 Binary files /dev/null and b/Telegram/Resources/icons/stickers_remove@3x.png differ diff --git a/Telegram/Resources/icons/stickers_reorder@3x.png b/Telegram/Resources/icons/stickers_reorder@3x.png new file mode 100644 index 0000000000..606b39c605 Binary files /dev/null and b/Telegram/Resources/icons/stickers_reorder@3x.png differ diff --git a/Telegram/Resources/icons/stickers_search@3x.png b/Telegram/Resources/icons/stickers_search@3x.png new file mode 100644 index 0000000000..2571f0b6db Binary files /dev/null and b/Telegram/Resources/icons/stickers_search@3x.png differ diff --git a/Telegram/Resources/icons/title_back@3x.png b/Telegram/Resources/icons/title_back@3x.png new file mode 100644 index 0000000000..0f1a497dfb Binary files /dev/null and b/Telegram/Resources/icons/title_back@3x.png differ diff --git a/Telegram/Resources/icons/title_button_close@3x.png b/Telegram/Resources/icons/title_button_close@3x.png new file mode 100644 index 0000000000..18c8496e15 Binary files /dev/null and b/Telegram/Resources/icons/title_button_close@3x.png differ diff --git a/Telegram/Resources/icons/title_button_maximize@3x.png b/Telegram/Resources/icons/title_button_maximize@3x.png new file mode 100644 index 0000000000..4d8073fd5a Binary files /dev/null and b/Telegram/Resources/icons/title_button_maximize@3x.png differ diff --git a/Telegram/Resources/icons/title_button_minimize@3x.png b/Telegram/Resources/icons/title_button_minimize@3x.png new file mode 100644 index 0000000000..93e36c271d Binary files /dev/null and b/Telegram/Resources/icons/title_button_minimize@3x.png differ diff --git a/Telegram/Resources/icons/title_button_restore@3x.png b/Telegram/Resources/icons/title_button_restore@3x.png new file mode 100644 index 0000000000..44b93232b2 Binary files /dev/null and b/Telegram/Resources/icons/title_button_restore@3x.png differ diff --git a/Telegram/Resources/icons/title_menu_dots@3x.png b/Telegram/Resources/icons/title_menu_dots@3x.png new file mode 100644 index 0000000000..029087a43b Binary files /dev/null and b/Telegram/Resources/icons/title_menu_dots@3x.png differ diff --git a/Telegram/Resources/icons/title_search@3x.png b/Telegram/Resources/icons/title_search@3x.png new file mode 100644 index 0000000000..0afeefd813 Binary files /dev/null and b/Telegram/Resources/icons/title_search@3x.png differ diff --git a/Telegram/Resources/icons/top_bar_call@3x.png b/Telegram/Resources/icons/top_bar_call@3x.png new file mode 100644 index 0000000000..4fc5b0d5c7 Binary files /dev/null and b/Telegram/Resources/icons/top_bar_call@3x.png differ diff --git a/Telegram/Resources/icons/top_bar_profile@3x.png b/Telegram/Resources/icons/top_bar_profile@3x.png new file mode 100644 index 0000000000..85c780e6d7 Binary files /dev/null and b/Telegram/Resources/icons/top_bar_profile@3x.png differ diff --git a/Telegram/Resources/icons/top_bar_search@3x.png b/Telegram/Resources/icons/top_bar_search@3x.png new file mode 100644 index 0000000000..34292c1723 Binary files /dev/null and b/Telegram/Resources/icons/top_bar_search@3x.png differ diff --git a/Telegram/Resources/icons/upload_chat_photo@3x.png b/Telegram/Resources/icons/upload_chat_photo@3x.png new file mode 100644 index 0000000000..d7474050f8 Binary files /dev/null and b/Telegram/Resources/icons/upload_chat_photo@3x.png differ diff --git a/Telegram/Resources/icons/volume_mute@3x.png b/Telegram/Resources/icons/volume_mute@3x.png new file mode 100644 index 0000000000..f452b35578 Binary files /dev/null and b/Telegram/Resources/icons/volume_mute@3x.png differ diff --git a/Telegram/Resources/icons/window_shadow@3x.png b/Telegram/Resources/icons/window_shadow@3x.png new file mode 100644 index 0000000000..6864b179e9 Binary files /dev/null and b/Telegram/Resources/icons/window_shadow@3x.png differ diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp index 026e007b1b..a99cc0be26 100644 --- a/Telegram/SourceFiles/codegen/style/generator.cpp +++ b/Telegram/SourceFiles/codegen/style/generator.cpp @@ -27,7 +27,6 @@ namespace style { namespace { constexpr int kErrorBadIconSize = 861; -constexpr int kErrorBadIconFormat = 862; // crc32 hash, taken somewhere from the internet @@ -1184,46 +1183,54 @@ QByteArray iconMaskValuePng(QString filepath) { filepath = directory.filePath(nameAndModifiers[0]); auto modifiers = nameAndModifiers.mid(1); - QImage png100x(filepath + ".png"); - QImage png200x(filepath + "@2x.png"); - png100x.setDevicePixelRatio(1.); - png200x.setDevicePixelRatio(1.); - if (png100x.isNull()) { - common::logError(common::kErrorFileNotOpened, filepath + ".png") << "could not open icon file"; + const auto readImage = [&](const QString &postfix) { + const auto path = filepath + postfix + ".png"; + auto result = QImage(path); + if (result.isNull()) { + common::logError(common::kErrorFileNotOpened, path) << "could not open icon file"; + return QImage(); + } else if (result.format() != QImage::Format_RGB32) { + result = std::move(result).convertToFormat(QImage::Format_RGB32); + } + result.setDevicePixelRatio(1.); + return result; + }; + auto png1x = readImage(""); + auto png2x = readImage("@2x"); + auto png3x = readImage("@3x"); + if (png1x.isNull() || png2x.isNull() || png3x.isNull()) { return result; } - if (png200x.isNull()) { - common::logError(common::kErrorFileNotOpened, filepath + "@2x.png") << "could not open icon file"; + if (png1x.width() * 2 != png2x.width() + || png1x.height() * 2 != png2x.height() + || png1x.width() * 3 != png3x.width() + || png1x.height() * 3 != png3x.height()) { + common::logError(kErrorBadIconSize, filepath + ".png") + << "bad icons size, 1x: " + << png1x.width() << "x" << png1x.height() + << ", 2x: " + << png2x.width() << "x" << png2x.height() + << ", 3x: " + << png3x.width() << "x" << png3x.height(); return result; } - if (png100x.format() != png200x.format()) { - common::logError(kErrorBadIconFormat, filepath + ".png") << "1x and 2x icons have different format"; - return result; - } - if (png100x.width() * 2 != png200x.width() || png100x.height() * 2 != png200x.height()) { - common::logError(kErrorBadIconSize, filepath + ".png") << "bad icons size, 1x: " << png100x.width() << "x" << png100x.height() << ", 2x: " << png200x.width() << "x" << png200x.height(); - return result; - } - for (auto modifierName : modifiers) { - if (auto modifier = GetModifier(modifierName)) { - modifier(png100x, png200x); + for (const auto modifierName : modifiers) { + if (const auto modifier = GetModifier(modifierName)) { + modifier(png1x); + modifier(png2x); + modifier(png3x); } else { common::logError(common::kErrorInternal, filepath) << "modifier should be valid here, name: " << modifierName.toStdString(); return result; } } - QImage png125x = png200x.scaled(structure::data::pxAdjust(png100x.width(), 5), structure::data::pxAdjust(png100x.height(), 5), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - QImage png150x = png200x.scaled(structure::data::pxAdjust(png100x.width(), 6), structure::data::pxAdjust(png100x.height(), 6), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - - QImage composed(png200x.width() + png100x.width(), png200x.height() + png150x.height(), png100x.format()); + QImage composed(png3x.width(), png3x.height() + png2x.height(), QImage::Format_RGB32); + composed.fill(Qt::black); { QPainter p(&composed); - p.setCompositionMode(QPainter::CompositionMode_Source); - p.fillRect(0, 0, composed.width(), composed.height(), QColor(0, 0, 0, 255)); - p.drawImage(0, 0, png200x); - p.drawImage(png200x.width(), 0, png100x); - p.drawImage(0, png200x.height(), png150x); - p.drawImage(png150x.width(), png200x.height(), png125x); + p.drawImage(0, 0, png1x); + p.drawImage(png1x.width(), 0, png2x); + p.drawImage(0, png2x.height(), png3x); } { QBuffer buffer(&result); diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.cpp b/Telegram/SourceFiles/codegen/style/parsed_file.cpp index e9c743e1dd..3a9c299349 100644 --- a/Telegram/SourceFiles/codegen/style/parsed_file.cpp +++ b/Telegram/SourceFiles/codegen/style/parsed_file.cpp @@ -133,17 +133,14 @@ bool validateAlignString(const QString &value) { Modifier GetModifier(const QString &name) { static QMap modifiers; if (modifiers.empty()) { - modifiers.insert("invert", [](QImage &png100x, QImage &png200x) { - png100x.invertPixels(); - png200x.invertPixels(); + modifiers.insert("invert", [](QImage &image) { + image.invertPixels(); }); - modifiers.insert("flip_horizontal", [](QImage &png100x, QImage &png200x) { - png100x = png100x.mirrored(true, false); - png200x = png200x.mirrored(true, false); + modifiers.insert("flip_horizontal", [](QImage &image) { + image = image.mirrored(true, false); }); - modifiers.insert("flip_vertical", [](QImage &png100x, QImage &png200x) { - png100x = png100x.mirrored(false, true); - png200x = png200x.mirrored(false, true); + modifiers.insert("flip_vertical", [](QImage &image) { + image = image.mirrored(false, true); }); } return modifiers.value(name); diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.h b/Telegram/SourceFiles/codegen/style/parsed_file.h index cdd26c6d7d..6b95d1ffbe 100644 --- a/Telegram/SourceFiles/codegen/style/parsed_file.h +++ b/Telegram/SourceFiles/codegen/style/parsed_file.h @@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace codegen { namespace style { -using Modifier = std::function; +using Modifier = std::function; Modifier GetModifier(const QString &name); // Parses an input file to the internal struct. diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style index 38a12aafbd..687a49aea8 100644 --- a/Telegram/SourceFiles/history/history.style +++ b/Telegram/SourceFiles/history/history.style @@ -469,4 +469,5 @@ historyAboutProxy: FlatLabel(defaultFlatLabel) { } historyAboutProxyPadding: margins(20px, 10px, 20px, 10px); -historyMapPoint: icon {{ "map_point", windowBgActive }}; +historyMapPoint: icon {{ "map_point", mapPointDrop }}; +historyMapPointInner: icon {{ "map_point_inner", mapPointDot }}; diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index f686fb6744..a81680d81c 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -42,7 +42,6 @@ namespace { constexpr auto kMaxGifForwardedBarLines = 4; constexpr auto kMaxOriginalEntryLines = 8192; -const auto kMapPointFg = QColor(64, 167, 227); using TextState = HistoryView::TextState; @@ -4845,13 +4844,15 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection, } else { App::complexLocationRect(p, rthumb, roundRadius, roundCorners); } - const auto &point = st::historyMapPoint; - point.paint( - p, - rthumb.x() + ((rthumb.width() - point.width()) / 2), - rthumb.y() + (rthumb.height() / 2) - point.height(), - width(), - kMapPointFg); + const auto paintMarker = [&](const style::icon &icon) { + icon.paint( + p, + rthumb.x() + ((rthumb.width() - icon.width()) / 2), + rthumb.y() + (rthumb.height() / 2) - icon.height(), + width()); + }; + paintMarker(st::historyMapPoint); + paintMarker(st::historyMapPointInner); if (selected) { App::complexOverlayRect(p, rthumb, roundRadius, roundCorners); } diff --git a/Telegram/SourceFiles/info/feed/info_feed_channels.cpp b/Telegram/SourceFiles/info/feed/info_feed_channels.cpp index 124c885637..b99e38c179 100644 --- a/Telegram/SourceFiles/info/feed/info_feed_channels.cpp +++ b/Telegram/SourceFiles/info/feed/info_feed_channels.cpp @@ -95,10 +95,11 @@ void Channels::setupHeader() { parent, rpl::single(QString())); - object_ptr( - parent, - st::infoIconFeed, - st::infoIconPosition); + // #feed + //object_ptr( + // parent, + // st::infoIconFeed, + // st::infoIconPosition); _titleWrap = Ui::CreateChild(parent); _title = setupTitle(); diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index b155d152c5..344e25ad25 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -349,7 +349,7 @@ infoIconInformation: icon {{ "info_information", infoIconFg }}; infoIconMembers: icon {{ "info_members", infoIconFg }}; infoIconNotifications: icon {{ "info_notifications", infoIconFg }}; infoIconActions: icon {{ "info_actions", infoIconFg }}; -infoIconFeed: icon {{ "info_feed", infoIconFg }}; +//infoIconFeed: icon {{ "info_feed", infoIconFg }}; infoIconMediaPhoto: icon {{ "info_media_photo", infoIconFg }}; infoIconMediaVideo: icon {{ "info_media_video", infoIconFg }}; infoIconMediaFile: icon {{ "info_media_file", infoIconFg }}; diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.cpp b/Telegram/SourceFiles/ui/style/style_core_icon.cpp index 064f6beb17..a2d57943f3 100644 --- a/Telegram/SourceFiles/ui/style/style_core_icon.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_icon.cpp @@ -35,27 +35,25 @@ QImage createIconMask(const IconMask *mask, DBIScale scale) { Assert(!maskImage.isNull()); // images are layouted like this: - // 200x 100x - // 150x 125x - int width = maskImage.width() / 3; - int height = qRound((maskImage.height() * 2) / 7.); - auto r = QRect(0, 0, width * 2, height * 2); - if (!cRetina() && scale != dbisTwo) { - if (scale == dbisOne) { - r = QRect(width * 2, 0, width, height); - } else { - int width125 = pxAdjust(width, 5); - int height125 = pxAdjust(height, 5); - int width150 = pxAdjust(width, 6); - int height150 = pxAdjust(height, 6); - if (scale == dbisOneAndQuarter) { - r = QRect(width150, height * 2, width125, height125); - } else { - r = QRect(0, height * 2, width150, height150); - } - } + // 100x 200x + // 300x + const auto width = maskImage.width() / 3; + const auto height = maskImage.height() / 5; + const auto two = QRect(width, 0, width * 2, height * 2); + if (cRetina() || scale == dbisTwo) { + return maskImage.copy(two); + } else if (scale == dbisOne) { + return maskImage.copy(QRect(0, 0, width, height)); } - return maskImage.copy(r); + const auto width125 = pxAdjust(width, 5); + const auto height125 = pxAdjust(height, 5); + const auto width150 = pxAdjust(width, 6); + const auto height150 = pxAdjust(height, 6); + return maskImage.copy(two).scaled( + (scale == dbisOneAndQuarter) ? width125 : width150, + (scale == dbisOneAndQuarter) ? height125 : height150, + Qt::IgnoreAspectRatio, + Qt::SmoothTransformation); } QSize readGeneratedSize(const IconMask *mask, DBIScale scale) {