Merge commit '241de58edd93b50f9b01df95dbb1801f25295253'

2025-08-08 08:31:13 +00:00 · 2018-12-11 12:18:42 +04:00 · 2018-12-11 12:18:42 +04:00 · ab57583c52
commit ab57583c52
parent 4881f49bf1 241de58edd
208 changed files with 1454 additions and 173 deletions
--- a/List/OutgoingIcon.imageset/CallOutgoing@2x.png
+++ b/List/OutgoingIcon.imageset/CallOutgoing@2x.png
--- a/Images.xcassets/Call/CallMuteButton.imageset/CallMuteIcon@2x.png
+++ b/Images.xcassets/Call/CallMuteButton.imageset/CallMuteIcon@2x.png
--- a/Images.xcassets/Call/CallMuteButton.imageset/CallMuteIcon@3x.png
+++ b/Images.xcassets/Call/CallMuteButton.imageset/CallMuteIcon@3x.png
--- a/Images.xcassets/Call/CallSpeakerButton.imageset/CallSpeakerIcon@3x.png
+++ b/Images.xcassets/Call/CallSpeakerButton.imageset/CallSpeakerIcon@3x.png
--- a/List/EmptyMasterDetailIcon.imageset/DetailLogoBlank@2x.png
+++ b/List/EmptyMasterDetailIcon.imageset/DetailLogoBlank@2x.png
--- a/List/RevealActionMuteIcon.imageset/ic_unmute@2x.png
+++ b/List/RevealActionMuteIcon.imageset/ic_unmute@2x.png
--- a/List/RevealActionMuteIcon.imageset/ic_unmute@3x.png
+++ b/List/RevealActionMuteIcon.imageset/ic_unmute@3x.png
--- a/List/RevealActionPinIcon.imageset/ic_pin@2x.png
+++ b/List/RevealActionPinIcon.imageset/ic_pin@2x.png
--- a/List/RevealActionPinIcon.imageset/ic_pin@3x.png
+++ b/List/RevealActionPinIcon.imageset/ic_pin@3x.png
--- a/List/RevealActionUnmuteIcon.imageset/ic_unmute@2x.png
+++ b/List/RevealActionUnmuteIcon.imageset/ic_unmute@2x.png
--- a/List/RevealActionUnmuteIcon.imageset/ic_unmute@3x.png
+++ b/List/RevealActionUnmuteIcon.imageset/ic_unmute@3x.png
--- a/List/RevealActionUnpinIcon.imageset/ic_unpin@2x.png
+++ b/List/RevealActionUnpinIcon.imageset/ic_unpin@2x.png
--- a/List/RevealActionUnpinIcon.imageset/ic_unpin@3x.png
+++ b/List/RevealActionUnpinIcon.imageset/ic_unpin@3x.png
--- a/List/Tabs/IconCallsHW.imageset/Calls@2x.png
+++ b/List/Tabs/IconCallsHW.imageset/Calls@2x.png
--- a/List/Tabs/IconCallsHW.imageset/Calls@3x.png
+++ b/List/Tabs/IconCallsHW.imageset/Calls@3x.png
--- a/List/Tabs/IconCallsHW.imageset/Contents.json
+++ b/List/Tabs/IconCallsHW.imageset/Contents.json
@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Calls@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Calls@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/List/Tabs/IconChatsHW.imageset/Chats@2x.png
+++ b/List/Tabs/IconChatsHW.imageset/Chats@2x.png
--- a/List/Tabs/IconChatsHW.imageset/Chats@3x.png
+++ b/List/Tabs/IconChatsHW.imageset/Chats@3x.png
--- a/List/Tabs/IconContactsHW.imageset/Contacts@2x.png
+++ b/List/Tabs/IconContactsHW.imageset/Contacts@2x.png
--- a/List/Tabs/IconContactsHW.imageset/Contacts@3x.png
+++ b/List/Tabs/IconContactsHW.imageset/Contacts@3x.png
--- a/List/Tabs/IconContactsHW.imageset/Contents.json
+++ b/List/Tabs/IconContactsHW.imageset/Contents.json
@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Contacts@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Contacts@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/List/Tabs/IconSettingsHW.imageset/Contents.json
+++ b/List/Tabs/IconSettingsHW.imageset/Contents.json
@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Settings@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Settings@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/List/Tabs/IconSettingsHW.imageset/Settings@2x.png
+++ b/List/Tabs/IconSettingsHW.imageset/Settings@2x.png
--- a/List/Tabs/IconSettingsHW.imageset/Settings@3x.png
+++ b/List/Tabs/IconSettingsHW.imageset/Settings@3x.png
--- a/Chat/Cloud.imageset/ChatCloudInfoIcon@2x.png
+++ b/Chat/Cloud.imageset/ChatCloudInfoIcon@2x.png
--- a/Chat/Cloud.imageset/ChatCloudInfoIcon@3x.png
+++ b/Chat/Cloud.imageset/ChatCloudInfoIcon@3x.png
--- a/Images.xcassets/Chat/Info/CallButton.imageset/TabIconCalls@2x.png
+++ b/Images.xcassets/Chat/Info/CallButton.imageset/TabIconCalls@2x.png
--- a/Images.xcassets/Chat/Info/CallButton.imageset/TabIconCalls@3x.png
+++ b/Images.xcassets/Chat/Info/CallButton.imageset/TabIconCalls@3x.png
--- a/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/StickerKeyboardGifIcon@3x.png
+++ b/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/StickerKeyboardGifIcon@3x.png
--- a/Images.xcassets/Chat/Input/Media/GridSetupIcon.imageset/StickersGroupSettings@2x.png
+++ b/Images.xcassets/Chat/Input/Media/GridSetupIcon.imageset/StickersGroupSettings@2x.png
--- a/Images.xcassets/Chat/Input/Media/GridSetupIcon.imageset/StickersGroupSettings@3x.png
+++ b/Images.xcassets/Chat/Input/Media/GridSetupIcon.imageset/StickersGroupSettings@3x.png
--- a/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/StickerKeyboardRecentTab@2x.png
+++ b/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/StickerKeyboardRecentTab@2x.png
--- a/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@2x.png
+++ b/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@2x.png
--- a/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@3x.png
+++ b/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@3x.png
--- a/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@2x.png
+++ b/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@2x.png
--- a/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@3x.png
+++ b/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@3x.png
--- a/Images.xcassets/Chat/Input/Media/StickersNotFoundIcon.imageset/StickersPlaceholderIcon@2x.png
+++ b/Images.xcassets/Chat/Input/Media/StickersNotFoundIcon.imageset/StickersPlaceholderIcon@2x.png
--- a/Images.xcassets/Chat/Input/Media/StickersNotFoundIcon.imageset/StickersPlaceholderIcon@3x.png
+++ b/Images.xcassets/Chat/Input/Media/StickersNotFoundIcon.imageset/StickersPlaceholderIcon@3x.png
--- a/Images.xcassets/Chat/Intro/ChannelIntro.imageset/ChannelIntro@2x.png
+++ b/Images.xcassets/Chat/Intro/ChannelIntro.imageset/ChannelIntro@2x.png
--- a/Images.xcassets/Chat/Message/LocationPinBackground.imageset/LocationMessagePinBackground@2x.png
+++ b/Images.xcassets/Chat/Message/LocationPinBackground.imageset/LocationMessagePinBackground@2x.png
--- a/Images.xcassets/Chat/Message/LocationPinBackground.imageset/LocationMessagePinBackground@3x.png
+++ b/Images.xcassets/Chat/Message/LocationPinBackground.imageset/LocationMessagePinBackground@3x.png
--- a/Images.xcassets/Chat/Message/LocationPinForeground.imageset/LocationMessagePinIcon@2x.png
+++ b/Images.xcassets/Chat/Message/LocationPinForeground.imageset/LocationMessagePinIcon@2x.png
--- a/Images.xcassets/Chat/Message/LocationPinForeground.imageset/LocationMessagePinIcon@3x.png
+++ b/Images.xcassets/Chat/Message/LocationPinForeground.imageset/LocationMessagePinIcon@3x.png
--- a/Images.xcassets/Chat/Message/LocationPinShadow.imageset/LocationMessagePinShadow@2x.png
+++ b/Images.xcassets/Chat/Message/LocationPinShadow.imageset/LocationMessagePinShadow@2x.png
--- a/Images.xcassets/Chat/Message/LocationPinShadow.imageset/LocationMessagePinShadow@3x.png
+++ b/Images.xcassets/Chat/Message/LocationPinShadow.imageset/LocationMessagePinShadow@3x.png
--- a/Images.xcassets/Chat/Message/NavigateToMessageIcon.imageset/ConversationGoToIcon@2x.png
+++ b/Images.xcassets/Chat/Message/NavigateToMessageIcon.imageset/ConversationGoToIcon@2x.png
--- a/Images.xcassets/Chat/Message/NavigateToMessageIcon.imageset/ConversationGoToIcon@3x.png
+++ b/Images.xcassets/Chat/Message/NavigateToMessageIcon.imageset/ConversationGoToIcon@3x.png
--- a/Images.xcassets/Chat/Message/OverlayInstantVideoShadow.imageset/VideoMessagePIPShadow@2x.png
+++ b/Images.xcassets/Chat/Message/OverlayInstantVideoShadow.imageset/VideoMessagePIPShadow@2x.png
--- a/Images.xcassets/Chat/Message/OverlayInstantVideoShadow.imageset/VideoMessagePIPShadow@3x.png
+++ b/Images.xcassets/Chat/Message/OverlayInstantVideoShadow.imageset/VideoMessagePIPShadow@3x.png
--- a/Images.xcassets/Chat/Message/OverlayPlainVideoShadow.imageset/PictureInPictureShadow@2x.png
+++ b/Images.xcassets/Chat/Message/OverlayPlainVideoShadow.imageset/PictureInPictureShadow@2x.png
--- a/Images.xcassets/Chat/Message/RadialProgressIconDocumentIncoming.imageset/ModernMessageDocumentIconIncoming@2x.png
+++ b/Images.xcassets/Chat/Message/RadialProgressIconDocumentIncoming.imageset/ModernMessageDocumentIconIncoming@2x.png
--- a/Images.xcassets/Chat/Message/RadialProgressIconDocumentIncoming.imageset/ModernMessageDocumentIconIncoming@3x.png
+++ b/Images.xcassets/Chat/Message/RadialProgressIconDocumentIncoming.imageset/ModernMessageDocumentIconIncoming@3x.png
--- a/Images.xcassets/Chat/Message/RadialProgressIconDocumentOutgoing.imageset/ModernMessageDocumentIconOutgoing@2x.png
+++ b/Images.xcassets/Chat/Message/RadialProgressIconDocumentOutgoing.imageset/ModernMessageDocumentIconOutgoing@2x.png
--- a/Images.xcassets/Chat/Message/RadialProgressIconDocumentOutgoing.imageset/ModernMessageDocumentIconOutgoing@3x.png
+++ b/Images.xcassets/Chat/Message/RadialProgressIconDocumentOutgoing.imageset/ModernMessageDocumentIconOutgoing@3x.png
--- a/Images.xcassets/Chat/NavigateToMentions.imageset/ic_mention@2x.png
+++ b/Images.xcassets/Chat/NavigateToMentions.imageset/ic_mention@2x.png
--- a/Images.xcassets/Chat/NavigateToMentions.imageset/ic_mention@3x.png
+++ b/Images.xcassets/Chat/NavigateToMentions.imageset/ic_mention@3x.png
--- a/Bar/Loupe.imageset/SearchBarIconLight@2x.png
+++ b/Bar/Loupe.imageset/SearchBarIconLight@2x.png
--- a/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@2x.png
+++ b/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@2x.png
--- a/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@3x.png
+++ b/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@3x.png
--- a/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@2x.png
+++ b/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@2x.png
--- a/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@3x.png
+++ b/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@3x.png
--- a/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@2x.png
+++ b/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@2x.png
--- a/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@3x.png
+++ b/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/CollapseArrow.imageset/MusicPlayerArrow@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/CollapseArrow.imageset/MusicPlayerArrow@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/CollapseArrow.imageset/MusicPlayerArrow@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/CollapseArrow.imageset/MusicPlayerArrow@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/OrderRandom.imageset/MusicPlayerControlShuffle@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/OrderRandom.imageset/MusicPlayerControlShuffle@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/OrderRandom.imageset/MusicPlayerControlShuffle@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/OrderRandom.imageset/MusicPlayerControlShuffle@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/OrderReverse.imageset/MusicPlayerControlReverse@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/OrderReverse.imageset/MusicPlayerControlReverse@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/OrderReverse.imageset/MusicPlayerControlReverse@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/OrderReverse.imageset/MusicPlayerControlReverse@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/Pause.imageset/MusicPlayerControlPause@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Pause.imageset/MusicPlayerControlPause@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/Pause.imageset/MusicPlayerControlPause@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Pause.imageset/MusicPlayerControlPause@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/Play.imageset/MusicPlayerControlPlay@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Play.imageset/MusicPlayerControlPlay@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/Play.imageset/MusicPlayerControlPlay@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Play.imageset/MusicPlayerControlPlay@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/Previous.imageset/MusicPlayerControlBack@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Previous.imageset/MusicPlayerControlBack@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/Previous.imageset/MusicPlayerControlBack@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Previous.imageset/MusicPlayerControlBack@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/Repeat.imageset/MusicPlayerControlRepeat@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Repeat.imageset/MusicPlayerControlRepeat@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/Repeat.imageset/MusicPlayerControlRepeat@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Repeat.imageset/MusicPlayerControlRepeat@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/RepeatOne.imageset/MusicPlayerControlRepeatOne@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/RepeatOne.imageset/MusicPlayerControlRepeatOne@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/RepeatOne.imageset/MusicPlayerControlRepeatOne@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/RepeatOne.imageset/MusicPlayerControlRepeatOne@3x.png
--- a/Images.xcassets/GlobalMusicPlayer/Shuffle.imageset/MusicPlayerControlShuffle@2x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Shuffle.imageset/MusicPlayerControlShuffle@2x.png
--- a/Images.xcassets/GlobalMusicPlayer/Shuffle.imageset/MusicPlayerControlShuffle@3x.png
+++ b/Images.xcassets/GlobalMusicPlayer/Shuffle.imageset/MusicPlayerControlShuffle@3x.png
--- a/View/ActionIcon.imageset/ic_share@2x.png
+++ b/View/ActionIcon.imageset/ic_share@2x.png
--- a/View/ActionIcon.imageset/ic_share@3x.png
+++ b/View/ActionIcon.imageset/ic_share@3x.png
--- a/View/ImageLink.imageset/Link@2x.png
+++ b/View/ImageLink.imageset/Link@2x.png
--- a/View/ImageLink.imageset/Link@3x.png
+++ b/View/ImageLink.imageset/Link@3x.png
--- a/View/SettingsArrow.imageset/InstantViewRightCorner@2x.png
+++ b/View/SettingsArrow.imageset/InstantViewRightCorner@2x.png
--- a/View/SettingsArrow.imageset/InstantViewRightCorner@3x.png
+++ b/View/SettingsArrow.imageset/InstantViewRightCorner@3x.png
--- a/View/SettingsBrightnessMaxIcon.imageset/InstantViewBrightnessMaxIcon@3x.png
+++ b/View/SettingsBrightnessMaxIcon.imageset/InstantViewBrightnessMaxIcon@3x.png
--- a/List/AddExceptionIcon.imageset/plus@2x.png
+++ b/List/AddExceptionIcon.imageset/plus@2x.png
--- a/List/AddExceptionIcon.imageset/plus@3x.png
+++ b/List/AddExceptionIcon.imageset/plus@3x.png
--- a/List/SearchIcon.imageset/ic_search@3x.png
+++ b/List/SearchIcon.imageset/ic_search@3x.png
--- a/List/Tabs/IconChatsHW.imageset/Contents.json
+++ b/List/Tabs/IconChatsHW.imageset/Contents.json
@ -6,12 +6,12 @@
    },
    {
      "idiom" : "universal",
-      "filename" : "Chats@2x.png",
+      "filename" : "Giphy@2x.png",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
-      "filename" : "Chats@3x.png",
+      "filename" : "Giphy@3x.png",
      "scale" : "3x"
    }
  ],
--- a/Grid/Giphy.imageset/Giphy@2x.png
+++ b/Grid/Giphy.imageset/Giphy@2x.png
--- a/Grid/Giphy.imageset/Giphy@3x.png
+++ b/Grid/Giphy.imageset/Giphy@3x.png
--- a/Images.xcassets/Peek/Arrow.imageset/PreviewUpArrow@2x.png
+++ b/Images.xcassets/Peek/Arrow.imageset/PreviewUpArrow@2x.png
--- a/Info/GroupStickerPackNotFound.imageset/StickerPackNotFoundIcon@2x.png
+++ b/Info/GroupStickerPackNotFound.imageset/StickerPackNotFoundIcon@2x.png
--- a/Info/GroupStickerPackNotFound.imageset/StickerPackNotFoundIcon@3x.png
+++ b/Info/GroupStickerPackNotFound.imageset/StickerPackNotFoundIcon@3x.png
--- a/ID/DocumentInputBackSide.imageset/reverse@2x.png
+++ b/ID/DocumentInputBackSide.imageset/reverse@2x.png
--- a/ID/DocumentInputBackSide.imageset/reverse@3x.png
+++ b/ID/DocumentInputBackSide.imageset/reverse@3x.png
--- a/ID/DocumentInputSelfie.imageset/selfie@2x.png
+++ b/ID/DocumentInputSelfie.imageset/selfie@2x.png
--- a/Show More
+++ b/Show More