From 6861e472d6b13afc67ff24420a9876bc8e22aad8 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 27 Aug 2021 02:01:52 +0300 Subject: [PATCH] Various Fixes --- .../Telegram-iOS/en.lproj/Localizable.strings | 4 + .../Sources/VoiceChatController.swift | 2 +- .../VoiceChatFullscreenParticipantItem.swift | 20 +- .../Sources/DefaultDayPresentationTheme.swift | 2 +- .../Sources/MakePresentationTheme.swift | 8 +- .../Sources/ServiceMessageStrings.swift | 8 +- .../Media/GifsTabIcon.imageset/Contents.json | 2 +- .../Media/GifsTabIcon.imageset/gif_48.pdf | 249 ++++++++++++++++++ .../GifsTabIcon.imageset/ic_input_gifs.pdf | Bin 4516 -> 0 bytes .../RecentTabIcon.imageset/Contents.json | 2 +- .../ic_input_recent.pdf | Bin 4065 -> 0 bytes .../RecentTabIcon.imageset/recent_48.pdf | 89 +++++++ .../Contents.json | 20 +- .../StickerKeyboardFavoriteTab@2x.png | Bin 1138 -> 0 bytes .../StickerKeyboardFavoriteTab@3x.png | Bin 1777 -> 0 bytes .../SavedStickersTabIcon.imageset/fave_48.pdf | 247 +++++++++++++++++ .../Media/SettingsIcon.imageset/Contents.json | 20 +- .../StickerKeyboardSettingsIcon@2x.png | Bin 859 -> 0 bytes .../StickerKeyboardSettingsIcon@3x.png | Bin 1109 -> 0 bytes .../SettingsIcon.imageset/settings_48.pdf | 198 ++++++++++++++ .../Media/StickersMode.imageset/Contents.json | 2 +- .../ic_input_stickers.pdf | Bin 4625 -> 0 bytes .../StickersMode.imageset/stickers_48.pdf | 123 +++++++++ .../Media/TrendingGifs.imageset/Contents.json | 2 +- .../ic_input_trending.pdf | Bin 4517 -> 0 bytes .../TrendingGifs.imageset/trending_48.pdf | 110 ++++++++ .../Media/TrendingIcon.imageset/Contents.json | 2 +- .../Media/TrendingIcon.imageset/add_48.pdf | 95 +++++++ .../ic_input_addstickers.pdf | Bin 4081 -> 0 bytes .../TelegramUI/Sources/ChatController.swift | 18 +- .../Sources/ChatHistoryListNode.swift | 9 +- .../ChatMediaInputMetaSectionItemNode.swift | 7 +- .../ChatMediaInputRecentGifsItem.swift | 1 + .../Sources/ChatMediaInputSettingsItem.swift | 1 + .../Sources/ChatMediaInputTrendingItem.swift | 1 + .../Sources/ChatMessageBubbleItemNode.swift | 17 +- .../Sources/ForwardAccessoryPanelNode.swift | 15 +- .../Sources/PeerInfo/PeerInfoScreen.swift | 2 + 38 files changed, 1210 insertions(+), 66 deletions(-) create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/gif_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/ic_input_gifs.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/ic_input_recent.pdf create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/recent_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@2x.png delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@3x.png create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/fave_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@2x.png delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@3x.png create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/settings_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/ic_input_stickers.pdf create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/stickers_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/ic_input_trending.pdf create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/trending_48.pdf create mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/add_48.pdf delete mode 100644 submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/ic_input_addstickers.pdf diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index eb32196aca..3be4062005 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -6605,6 +6605,7 @@ Sorry for the inconvenience."; "Conversation.ForwardOptions.SendMessages" = "Send Messages"; "Conversation.ForwardOptions.TapForOptions" = "Tap here for forwarding options"; +"Conversation.ForwardOptions.TapForOptionsShort" = "Tap here for options"; "Conversation.ForwardOptions.UserMessageForwardVisible" = "%@ will see that it was forwarded"; "Conversation.ForwardOptions.UserMessageForwardHidden" = "%@ won't see that it was forwarded"; @@ -6671,6 +6672,9 @@ Sorry for the inconvenience."; "Notification.YouChangedTheme" = "You changed chat theme to %@"; "Notification.YouDisabledTheme" = "You disabled chat theme"; +"Notification.ChannelChangedTheme" = "Channel theme changed to %2$@"; +"Notification.ChannelDisabledTheme" = "Channel theme disabled"; + "Appstore.Cloud" = "**Cloud-based**\nUnlimited storage for chats,\nmedia and documents."; "Appstore.Cloud.Profile" = "**Jennifer**\n23 y.o. designer from San Francisco."; "Appstore.Creative" = "**Creative**\nColor themes, stickers, GIFs,\nvideo messages and more."; diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift index 101d082160..869fdd3dc1 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift @@ -4258,7 +4258,7 @@ public final class VoiceChatController: ViewController { childrenSafeInsets.right = childrenSafeInsets.left + (size.width - contentLeftInset) } } else if !self.isLandscape, case .fullscreen = effectiveDisplayMode { - childrenInsets.bottom += self.effectiveBottomAreaHeight + fullscreenListHeight + 30.0 + childrenInsets.bottom += self.effectiveBottomAreaHeight + fullscreenListHeight + 36.0 } childrenLayout.safeInsets = childrenSafeInsets childrenLayout.intrinsicInsets = childrenInsets diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift index d2b25b7365..16a2c7b461 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift @@ -389,7 +389,7 @@ class VoiceChatFullscreenParticipantItemNode: ItemListRevealOptionsItemNode { profileNode.frame = CGRect(origin: CGPoint(), size: extractedRect.size) self.profileNode = profileNode self.contextSourceNode.contentNode.addSubnode(profileNode) - + profileNode.animateIn(from: self, targetRect: extractedRect, transition: transition) var appearenceTransition = transition if transition.isAnimated { @@ -706,20 +706,28 @@ class VoiceChatFullscreenParticipantItemNode: ItemListRevealOptionsItemNode { audioLevelView.layer.mask = playbackMaskLayer audioLevelView.setColor(wavesColor) - audioLevelView.alpha = strongSelf.isExtracted ? 0.0 : 1.0 strongSelf.audioLevelView = audioLevelView strongSelf.offsetContainerNode.view.insertSubview(audioLevelView, at: 0) - - if let _ = strongSelf.item, strongSelf.videoNode != nil && !active { - audioLevelView.alpha = 0.0 - } } let level = min(1.0, max(0.0, CGFloat(value))) if let audioLevelView = strongSelf.audioLevelView { audioLevelView.updateLevel(CGFloat(value)) + var hasVideo = false + if let videoNode = strongSelf.videoNode, videoNode.supernode == strongSelf.videoContainerNode, !videoNode.alpha.isZero { + hasVideo = true + } + + var audioLevelAlpha: CGFloat = 1.0 + if strongSelf.isExtracted { + audioLevelAlpha = 0.0 + } else { + audioLevelAlpha = hasVideo ? 0.0 : 1.0 + } + audioLevelView.alpha = audioLevelAlpha + let avatarScale: CGFloat if value > 0.02 { audioLevelView.startAnimating() diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index 413a7daeac..c5a2e5b316 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -35,7 +35,7 @@ public let defaultServiceBackgroundColor = UIColor(rgb: 0x000000, alpha: 0.2) public let defaultPresentationTheme = makeDefaultDayPresentationTheme(serviceBackgroundColor: defaultServiceBackgroundColor, day: false, preview: false) public let defaultDayAccentColor = UIColor(rgb: 0x007ee5) -public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: [UInt32], animateBubbleColors: Bool?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor?) -> PresentationTheme { +public func customizeDefaultDayTheme(theme: PresentationTheme, specialMode: Bool = false, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: [UInt32], animateBubbleColors: Bool?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor?) -> PresentationTheme { if (theme.referenceTheme != .day && theme.referenceTheme != .dayClassic) { return theme } diff --git a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift index 0f5b73c3a0..f2ef3a78e1 100644 --- a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift @@ -19,13 +19,13 @@ public func makeDefaultPresentationTheme(reference: PresentationBuiltinThemeRefe return theme } -public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool, title: String? = nil, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: [UInt32], animateBubbleColors: Bool?, wallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil) -> PresentationTheme { +public func customizePresentationTheme(_ theme: PresentationTheme, specialMode: Bool = false, editing: Bool, title: String? = nil, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: [UInt32], animateBubbleColors: Bool?, wallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil) -> PresentationTheme { if accentColor == nil && bubbleColors.isEmpty && backgroundColors.isEmpty && wallpaper == nil { return theme } switch theme.referenceTheme { case .day, .dayClassic: - return customizeDefaultDayTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, animateBubbleColors: animateBubbleColors ?? false, wallpaper: wallpaper, serviceBackgroundColor: nil) + return customizeDefaultDayTheme(theme: theme, specialMode: specialMode, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, animateBubbleColors: animateBubbleColors ?? false, wallpaper: wallpaper, serviceBackgroundColor: nil) case .night: return customizeDefaultDarkPresentationTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, animateBubbleColors: animateBubbleColors ?? false, wallpaper: wallpaper, baseColor: baseColor) case .nightAccent: @@ -33,9 +33,9 @@ public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool } } -public func makePresentationTheme(settings: TelegramThemeSettings, title: String? = nil, serviceBackgroundColor: UIColor? = nil) -> PresentationTheme? { +public func makePresentationTheme(settings: TelegramThemeSettings, specialMode: Bool = false, title: String? = nil, serviceBackgroundColor: UIColor? = nil) -> PresentationTheme? { let defaultTheme = makeDefaultPresentationTheme(reference: PresentationBuiltinThemeReference(baseTheme: settings.baseTheme), extendingThemeReference: nil, serviceBackgroundColor: serviceBackgroundColor, preview: false) - return customizePresentationTheme(defaultTheme, editing: true, title: title, accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors, animateBubbleColors: settings.animateMessageColors, wallpaper: settings.wallpaper) + return customizePresentationTheme(defaultTheme, specialMode: specialMode, editing: true, title: title, accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors, animateBubbleColors: settings.animateMessageColors, wallpaper: settings.wallpaper) } public func makePresentationTheme(mediaBox: MediaBox, themeReference: PresentationThemeReference, extendingThemeReference: PresentationThemeReference? = nil, accentColor: UIColor? = nil, backgroundColors: [UInt32] = [], bubbleColors: [UInt32] = [], animateBubbleColors: Bool? = nil, wallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil, serviceBackgroundColor: UIColor? = nil, preview: Bool = false) -> PresentationTheme? { diff --git a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift index b091173984..58cf89ea86 100644 --- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift @@ -531,7 +531,9 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, attributedString = addAttributesToStringWithRanges(resultTitleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds)) case let .setChatTheme(emoji): if emoji.isEmpty { - if message.author?.id == accountPeerId { + if message.author?.id.namespace == Namespaces.Peer.CloudChannel { + attributedString = NSAttributedString(string: strings.Notification_ChannelDisabledTheme, font: titleFont, textColor: primaryTextColor) + } else if message.author?.id == accountPeerId { attributedString = NSAttributedString(string: strings.Notification_YouDisabledTheme, font: titleFont, textColor: primaryTextColor) } else { let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)] @@ -539,7 +541,9 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, attributedString = addAttributesToStringWithRanges(resultTitleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds)) } } else { - if message.author?.id == accountPeerId { + if message.author?.id.namespace == Namespaces.Peer.CloudChannel { + attributedString = NSAttributedString(string: strings.Notification_ChannelChangedTheme(emoji).string, font: titleFont, textColor: primaryTextColor) + } else if message.author?.id == accountPeerId { attributedString = NSAttributedString(string: strings.Notification_YouChangedTheme(emoji).string, font: titleFont, textColor: primaryTextColor) } else { let resultTitleString = strings.Notification_ChangedTheme(authorName, emoji) diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/Contents.json index b741dea23c..4441035928 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_input_gifs.pdf", + "filename" : "gif_48.pdf", "idiom" : "universal" } ], diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/gif_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/gif_48.pdf new file mode 100644 index 0000000000..13ef0f5898 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/gif_48.pdf @@ -0,0 +1,249 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 30.400024 17.342773 cm +0.000000 0.000000 0.000000 scn +-1.328000 2.657227 m +-1.328000 1.923792 -0.733434 1.329226 0.000000 1.329226 c +0.733434 1.329226 1.328000 1.923792 1.328000 2.657227 c +-1.328000 2.657227 l +h +4.000000 9.329226 m +4.733434 9.329226 5.328000 9.923793 5.328000 10.657227 c +5.328000 11.390660 4.733434 11.985227 4.000000 11.985227 c +4.000000 9.329226 l +h +1.328000 2.657227 m +1.328000 9.377226 l +-1.328000 9.377226 l +-1.328000 2.657227 l +1.328000 2.657227 l +h +1.280000 9.329226 m +4.000000 9.329226 l +4.000000 11.985227 l +1.280000 11.985227 l +1.280000 9.329226 l +h +1.328000 9.377226 m +1.328000 9.492270 1.328034 9.578946 1.329198 9.653058 c +1.330364 9.727207 1.332460 9.769691 1.334489 9.794523 c +1.338678 9.845800 1.338141 9.750368 1.270451 9.617519 c +-1.096062 10.823318 l +-1.250946 10.519341 -1.295081 10.226333 -1.312690 10.010806 c +-1.329033 9.810783 -1.328000 9.579334 -1.328000 9.377226 c +1.328000 9.377226 l +h +1.280000 11.985227 m +1.077892 11.985227 0.846443 11.986259 0.646420 11.969916 c +0.430894 11.952308 0.137886 11.908173 -0.166092 11.753288 c +1.039707 9.386775 l +0.906858 9.319085 0.811426 9.318548 0.862703 9.322738 c +0.887536 9.324766 0.930019 9.326862 1.004169 9.328028 c +1.078280 9.329193 1.164957 9.329226 1.280000 9.329226 c +1.280000 11.985227 l +h +1.270451 9.617519 m +1.219830 9.518170 1.139057 9.437396 1.039707 9.386775 c +-0.166092 11.753288 l +-0.566501 11.549270 -0.892043 11.223727 -1.096062 10.823318 c +1.270451 9.617519 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 30.400024 22.144531 cm +0.000000 0.000000 0.000000 scn +0.000000 3.183762 m +-0.733434 3.183762 -1.328000 2.589196 -1.328000 1.855762 c +-1.328000 1.122328 -0.733434 0.527762 0.000000 0.527762 c +0.000000 3.183762 l +h +4.000000 0.527762 m +4.733434 0.527762 5.328000 1.122328 5.328000 1.855762 c +5.328000 2.589196 4.733434 3.183762 4.000000 3.183762 c +4.000000 0.527762 l +h +0.000000 0.527762 m +4.000000 0.527762 l +4.000000 3.183762 l +0.000000 3.183762 l +0.000000 0.527762 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 24.799927 17.343750 cm +0.000000 0.000000 0.000000 scn +2.128000 10.656250 m +2.128000 11.389684 1.533434 11.984250 0.800000 11.984250 c +0.066566 11.984250 -0.528000 11.389684 -0.528000 10.656250 c +2.128000 10.656250 l +h +-0.528000 2.656250 m +-0.528000 1.922815 0.066566 1.328250 0.800000 1.328250 c +1.533434 1.328250 2.128000 1.922815 2.128000 2.656250 c +-0.528000 2.656250 l +h +-0.528000 10.656250 m +-0.528000 2.656250 l +2.128000 2.656250 l +2.128000 10.656250 l +-0.528000 10.656250 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 13.599976 17.343750 cm +0.000000 0.000000 0.000000 scn +5.231635 9.028395 m +5.882138 8.689614 6.684110 8.942316 7.022890 9.592818 c +7.361670 10.243321 7.108968 11.045293 6.458466 11.384073 c +5.231635 9.028395 l +h +7.584592 5.588284 m +8.889243 5.340351 l +8.901488 5.404787 l +8.907325 5.470116 l +7.584592 5.588284 l +h +5.600000 7.984250 m +4.866566 7.984250 4.272000 7.389684 4.272000 6.656250 c +4.272000 5.922816 4.866566 5.328250 5.600000 5.328250 c +5.600000 7.984250 l +h +6.458466 11.384073 m +5.721497 11.767884 4.884068 11.984250 4.000000 11.984250 c +4.000000 9.328250 l +4.446894 9.328250 4.864512 9.219591 5.231635 9.028395 c +6.458466 11.384073 l +h +4.000000 11.984250 m +1.057427 11.984250 -1.328000 9.598824 -1.328000 6.656250 c +1.328000 6.656250 l +1.328000 8.131955 2.524295 9.328250 4.000000 9.328250 c +4.000000 11.984250 l +h +-1.328000 6.656250 m +-1.328000 3.713677 1.057427 1.328250 4.000000 1.328250 c +4.000000 3.984250 l +2.524295 3.984250 1.328000 5.180545 1.328000 6.656250 c +-1.328000 6.656250 l +h +4.000000 1.328250 m +6.144260 1.328250 8.394547 2.737200 8.889243 5.340351 c +6.279942 5.836216 l +6.056704 4.661514 5.055740 3.984250 4.000000 3.984250 c +4.000000 1.328250 l +h +8.907325 5.470116 m +8.956036 6.015371 l +6.310571 6.251707 l +6.261860 5.706451 l +8.907325 5.470116 l +h +7.155208 7.984250 m +5.600000 7.984250 l +5.600000 5.328250 l +7.155208 5.328250 l +7.155208 7.984250 l +h +8.956036 6.015371 m +9.050537 7.073197 8.217244 7.984250 7.155208 7.984250 c +7.155208 5.328250 l +6.657084 5.328250 6.266247 5.755558 6.310571 6.251707 c +8.956036 6.015371 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 5.599976 2.943848 cm +0.000000 0.000000 0.000000 scn +35.472000 21.056055 m +35.472000 11.627451 27.828604 3.984055 18.400000 3.984055 c +18.400000 1.328056 l +29.295473 1.328056 38.127998 10.160582 38.127998 21.056055 c +35.472000 21.056055 l +h +18.400000 3.984055 m +8.971395 3.984055 1.328000 11.627451 1.328000 21.056055 c +-1.328000 21.056055 l +-1.328000 10.160582 7.504526 1.328056 18.400000 1.328056 c +18.400000 3.984055 l +h +1.328000 21.056055 m +1.328000 30.484661 8.971395 38.128056 18.400000 38.128056 c +18.400000 40.784054 l +7.504526 40.784054 -1.328000 31.951529 -1.328000 21.056055 c +1.328000 21.056055 l +h +18.400000 38.128056 m +27.828604 38.128056 35.472000 30.484661 35.472000 21.056055 c +38.127998 21.056055 l +38.127998 31.951529 29.295473 40.784054 18.400000 40.784054 c +18.400000 38.128056 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 5025 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000005115 00000 n +0000005138 00000 n +0000005311 00000 n +0000005385 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +5444 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/ic_input_gifs.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/GifsTabIcon.imageset/ic_input_gifs.pdf deleted file mode 100644 index 50f89933d7b8f83c423815c708bdc519552ee577..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4516 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 diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/Contents.json index 8f506681e9..c35e65f2c0 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_input_recent.pdf", + "filename" : "recent_48.pdf", "idiom" : "universal" } ], diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/ic_input_recent.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/ic_input_recent.pdf deleted file mode 100644 index 7afd3b024ff75b942e81b38630ce506a286ea4c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4065 zcmai%cT^MI*2XDOARvO$i;PGSX$c_#l-@#9sz`@GLMI?y5GhimNtdF4^j;K{8hRBa zB3%VUnh1yp(vdGw-~0OBd%tyO&6+uDpMCb6InVRQZ}aLXs|rI!U|`;^g>MThMVpUb zclCh90SMq~?Fg2Z21KnUK#p_I)BjJF?GLRscKEaUaLs`XMd)C(>ir-CO|F5$`}CMQvC2SL=*BcDenWzMt z>fGE)C8F}B8$z8YC6Hl#WbRlMA*Lmh{1bGH2M=S~E2TM#b8%1e2PgRwU$MDiZ55pI zh7)wRGnl`=+YRNazWITDS}yDPG=H+e7LD~I$x?`}O0PL5fdKeE^FLxV^ z2Y~n$P;$k366QSsq7C$j^8T(zod3%fI_|DE`WR2Zlu%Sz6)*=xm0X=&-Syp2HW+~D z8zm1YAo07vA2lTZsPWrcQa`gquMsvRsz9_Cmf$TwR2k##V1v;^D*kWRWj^pR(4SFHW6+DO6alets2EcYRc<-=TvwIzcG03>Q-4}2-+T_6@gQrn zcvei4&U6OvY+ei~$1IKagI(Tj3JlIbJ%eOn=i>12?jtP{2t&H%%O$=X=SVRX2G%c; z-^fTPle?sv-D#uur0laud<*U7qd<}B)`j%rX$}jY`fT?%YV`N4p@PYsS7-0}YT>tP zY3@UqgQ{E~sF3m+yQJGEtW|KVtr?Fk+V8ba&YZiWe;9hq%6I4VT(UANX=$c%_h8F8G2vBMhUmP*_x`sr>RK4Q(nOeY8V&Jl7`W@T$L4 z=uvhX^G4XG>$;zksX`;|o5G}njp9Yn;LyO)*+3QqKLzWZOeY3=FH4euFe#mSb&5V$ z84{%nfBCtCZ59cF<3lU1VSccb&4Yh=0-jZkc0-Q(UCtO7f~Z~kOw_gkewg_D?lemz3)1@ zk&FcUy#`$iLAaeX1Knslz|w`)R3r-L0RL%z~6<|>rNGv%L7R~(~bH=(?x zq@W|oK;Eqs8BdoezxSH2nB~&l(i|lnnXL<+Y>kxWclRGtyavQi9+3uw(x;IPqfSkb zJP(?zzQRF?>=^i!Smz>)V`i-lQDfE`kkK@oG(#=s zMT9LKEO;-Zzev>J<*!-Zs{c9By~&SG7DRpq0*3vwR!A&6lPb)KuI6k{Hy(d6@Nh1k!7R4b&aE z&G}^baOacyFQbv}EXMK{+Lb)nfFp)8su-u-%={jJ5`Jw zF)B@K%rw!)DFD{S`@N2~H_1ss6m$$>XU$sg@$y{FdhfHGUKx)|2VB z%eU(X=T#f#sLs}Q$b_k@WaOq;-?PrJjE?ZWg}3u2OD znquNM#TOg!bNF|NDhG?>W`UHwOV~@dQ@B%XQ%Fn^7CGbEbUNk(ug=>aqP-^(RKA4XhgRwRjq*MSDK+GI&#O zZuNU(<8sxp$5NfreYf*&J=_zdmWeis&SaWmvJ_eq(idJ4;xZO6K4Iii`?-3*^KDm# zletYmZ@A-}P0e88)Z(*>65$!|*0q2u8RpefOikCC@Y}T8+y{IIPzsp{-v}J-&V;A; z#ir1JQTmlnv-N`;F>@6B{`^md)r)2_jRyq=PYvc#(=dN!9ua17AG$eP&*7dRf)vy;@wgfAi9e>B0KWlpV}P%y0kxjpbe4)l~a8J=Yv#1h7_{Y zVpL~Nc!4_GN!y!3xJ2Jr@|cY7c zcv4fuLE=)6;8N^{`7Y)#0hAj0G;~NgwaYxxM!iyacWZ|gc~Mc-g61$8ew=8hcpgNl@rA?am+NP9<%bfqE_xW-Hl^MFq4ixY zhUX#gU1RDR$EVYFNKEz%-Iw%>Tk{$7*a6P|&HjTsa9g;KmtBkZkMP5G_!lSIimGe9YS$XTP_s#JK=2YLj0FR0m=)>@(P?=@H$>y45XK_BHE^J&FyAy0bXpK~q}i zZf8d4wJF=03deV;+!jOMtp`3vebnZCpSUt(9B^ZA>g9Im8m?fw;K1jDH>J<}spZB^ zqjYOyi^6bPNT{ZIa>5N|8p=~T*e~q zvwz)M=G)$P4_E%RBKaxt|+b?E)B*_tH=D$o|M?buO15tbHk~RIcJ^ba&jg1h=*Nc-#tK zbI&d=yk1H4IAyO&yYmFT1TUystNIyPfyBq`#Z37<+3Nl}5R*DQ7uG89nVr}<$YhxNjusOhp6x$WSioCBM!-h|~{vOU+f;|&eED2#7iV@tHxK@kpNSOu6Pgjwe*rX+Ux_gS45eiz%voi3Dy1pWGFHH zpB0r*o+xKmyI=V3@tfQK#&YN%3kX<__Oc;#Xct{jHro1tA;#Uq!4(TYAtF$?2n;a0 zsOaV3j0T`m$`S}O0YKLadhDIPH zr4TR#1}=d{iP>5s5Vp2(gf+qz28GCi|98qS19^B7wETI{FodKen3q>YTNV6&ol*3; diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/recent_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/recent_48.pdf new file mode 100644 index 0000000000..07d586fff2 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/RecentTabIcon.imageset/recent_48.pdf @@ -0,0 +1,89 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.271973 4.271973 cm +0.000000 0.000000 0.000000 scn +2.656000 19.728054 m +2.656000 29.156660 10.299395 36.800056 19.728001 36.800056 c +29.156605 36.800056 36.799999 29.156660 36.799999 19.728054 c +36.799999 10.299450 29.156605 2.656055 19.728001 2.656055 c +10.299395 2.656055 2.656000 10.299450 2.656000 19.728054 c +h +19.728001 39.456055 m +8.832526 39.456055 0.000000 30.623528 0.000000 19.728054 c +0.000000 8.832581 8.832526 0.000057 19.728001 0.000057 c +30.623474 0.000057 39.455997 8.832581 39.455997 19.728054 c +39.455997 30.623528 30.623474 39.456055 19.728001 39.456055 c +h +21.056000 30.928055 m +21.056000 31.661489 20.461435 32.256054 19.728001 32.256054 c +18.994566 32.256054 18.400002 31.661489 18.400002 30.928055 c +18.400002 20.440632 l +18.400002 19.610584 18.752302 18.819542 19.369272 18.264267 c +26.839615 11.540958 l +27.384773 11.050316 28.224453 11.094513 28.715096 11.639668 c +29.205738 12.184826 29.161543 13.024506 28.616386 13.515148 c +21.146042 20.238457 l +21.088728 20.290041 21.056000 20.363525 21.056000 20.440632 c +21.056000 30.928055 l +h +f* +n +Q + +endstream +endobj + +3 0 obj + 1137 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000001227 00000 n +0000001250 00000 n +0000001423 00000 n +0000001497 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1556 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/Contents.json index e46f4e6129..eca3bfc65e 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/Contents.json @@ -1,22 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "StickerKeyboardFavoriteTab@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "StickerKeyboardFavoriteTab@3x.png", - "scale" : "3x" + "filename" : "fave_48.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@2x.png b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@2x.png deleted file mode 100644 index 33cc76e6b31b5e138bcaad3a5fde482c050c3256..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1138 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bYNg$ObYM`aRqY!|Nr0CKdZHGW?TQv z-l_B2`euPd`ev?LwW?z>NU*(sHjo60&zw24wSN{!aX*kTvt!cSj)^ndC(Z_n0~K@u zr6$bWzkh%G1fUv_2v8+hX8XiB5G^3{`ygHek?oV_0F4E@0c7|Tka{2jii6ZZ zj0JfF%;^TY2X2oa2}LcCDMH zIMuN@OD7;ukDJeefq}`()5S5QBJSpvXyh`sBvaqU*gS!-R7F*Z09=1OKrO%WBH-f*5> z_2?GS1>1C11q8ahVeJ+W`yh62S4hb9*Gmn)DBCwKy|B&o^qw5n3|-b^zh-zZShitX zaD0Je#@yB|Ph$mYL>*sf)z{y?&HnCa_{Ynv(60B2VU~NY?A^Da zpVpPEQm>e!a5(1n{dKv0Je`jd&WF659U^(@LTCKmk4wV~OSUMgp4OY}mivbPs^79X zO6=)bo6N4WFCc_zSW-Z44n92sPL=T~9PtrIi9hwm)y1gXLH}6VV;vueqHejC;);ewD;09A0y`Dfgw;)Z80Jowgg4&8;68c9tJhH0Qfv+A03PLA-8% z9$&&i6}y(jJrc!pR@~}L)=BPra6!ecwR4NbeucwFD{uK6SXo%jIZ?c@b}^HR5W}mp zU%R^xEKS_QU+xs~es$xkh={;L8^65W8`@!g!@MVZVV&tKwhzl(W=#=4ARD{3{e9a; z-n{b+^UO;({^Thr<2FnDX3xw&FX!W1MuWfe*9t!Ps2Of!%Otqk;K g&-+h*%?I|$hqoQ_UvY{Rn5-E*UHx3vIVCg!0OYAJ;s5{u diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@3x.png b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/StickerKeyboardFavoriteTab@3x.png deleted file mode 100644 index 908cc7c207d531525a93c7c983319a9047fba3eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1777 zcmXw33pCSv9RJM{nMhiV+_*hOX(U&VBZZKx%%fC$Y;Cr0KRArn@vm;#4vkx(e4XCrtT2Y##L@(XEP$QAMVHPmcmLP1!Ff>bJH@}xQu z1PmLtT+ZbGa-4*nl*#B&jVq#X#dI#ThA?4Hj+`x#F!)FSs5ANS`6Y-cS47icU>Jy; zn3$jog*50mxdj^rM7Ds$hK2@6M0&Q6uFH>P_{9|>Ivg=O?=*}-<07VT1z4dJOCW)= z6s`~&(YQzkcrI9JIt;`^*~yg=7Ge!2x}k1yDkQ>#AlHK~a9QLU&<*zxj=sKKDZK_YRJywO$(Q&`EUpku189oh>*eqLMSt?OzpnHu+mU z;rb@;H}>X_6Y_3t{a}f6R%1KweYxw?Gi0@MzQ2Y$yLn#z5~l}UevQv|L@+kLNg5pn z0R7I_b3@QysP~QEcKK(3JD;}>Zi-D*$YRq<+xS5(M4GHEdY1Xsm|pn+vBjyGP|O?n zabqm+%TOl!M`wTf$JMKkY2KAiGe4GkAbW9BAB`?G4tza~-cm3XpCrGYN9Nf)^uOa0 z7B0?8Ii{nAjqix%BS=i8g!A3-hS&IY5s>a{9> z=`N|G0M+2V`PS~tg{5G0w#vR7WY6)_yjFqo!4|$V`JhD~i1X8)GA7?!W)Ug`7K68m z>y=I&xv0^+yO<83PK#EDnsAq!YI{*y`-RpvE4Fu4fg%!RW5_JMS#PhMA3|3U^Mk>7 z&Uc4%C)>5CSyjRLSDHXZ0y8ARYV&4wdue4CdAZlEl8EOQ+zy3>#xbmxZtbj#`;u!! zEw6TF1*`DbT`nol@^@4^CcOv=t}if*8E7?J8#ANvYri~c7j{Fy?`CaJ+T#RQpIOeg zTc)w?!LmZSTI()*n&k{6CZ642%}hNtWdE-y{b$WJ#XgSg^4DtTk1wyCV~`pWN}O2j znJY)itYR@O6!+&@f}bl#u0#pqN?g`^#IH&=uy~#F*!J%TZGvR{_NZU6zG-B2!tQ5| zCi>V7cyzHxcWV~UEXXs`3Rbt|_y`nM+67?u7zTyucmBda^E zkt)Y`Q<@Jnk!CJfYeUoPz%9W(Udn1NvYO@+CE=sPaAnzAcTF72VRh<^y(!xq^+%$t z1Ri~E)Pr_s2-Hzc&yHGC<6s`_EccdfqL*pOTe2K zc?S%G=&3!L3^Inwmwli6O4fPR_<~QsPc$jiAq*AkPYm)s54LLw>y*Jw zB&<#NhuvtOVB>P|RQuo%IlZaXgcSCn6V#RClJz>dYimI&*26)$T#-7r$gL>y!_e@H zNBFG6`FQYUSR3g?*~PME{3{eh;OqB9DCc3C*2nVXsKOS719^L9 z&Ob+0RoKBb9klb8K4RVTBneY+TJecLEPMU+x{URl?<#6flsjl_z1mJ>*uQycruh_Z zR-a;{Es*>mzwch+xA%fu=IyT=9%MG>Yj&5}_KV6Qj^<+ajNx~POL3Rt4H_rBD%Xwe mv=pElHC0EPBX6FNwomk^t0v~9IDUhFR>0Sb;90pb;`o1nY;?~6 diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/fave_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/fave_48.pdf new file mode 100644 index 0000000000..f72b91cced --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SavedStickersTabIcon.imageset/fave_48.pdf @@ -0,0 +1,247 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 5.000000 3.946289 cm +0.000000 0.000000 0.000000 scn +8.635828 2.820679 m +9.321689 1.681164 l +8.635828 2.820679 l +h +9.731453 16.567810 m +10.600920 17.574253 l +9.731453 16.567810 l +h +1.384685 25.091970 m +1.496809 23.766705 l +1.384685 25.091970 l +h +1.051567 24.066368 m +1.921034 25.072811 l +1.051567 24.066368 l +h +20.038393 37.786930 m +18.814356 37.266705 l +20.038393 37.786930 l +h +18.961609 37.786930 m +17.737572 38.307156 l +18.961609 37.786930 l +h +26.180216 26.059437 m +26.292339 27.384703 l +26.180216 26.059437 l +h +24.508167 27.270023 m +23.284132 26.749798 l +24.508167 27.270023 l +h +37.948433 24.066368 m +38.817898 23.059925 l +37.948433 24.066368 l +h +37.615314 25.091970 m +37.503193 23.766705 l +37.615314 25.091970 l +h +28.628592 14.598795 m +27.333555 14.295841 l +28.628592 14.598795 l +h +29.268547 16.567810 m +28.399080 17.574253 l +29.268547 16.567810 l +h +30.364174 2.820679 m +31.050034 3.960194 l +31.050034 3.960194 l +30.364174 2.820679 l +h +31.235470 3.455151 m +32.530506 3.758102 l +31.235470 3.455151 l +h +19.801676 9.178118 m +19.115814 8.038603 l +19.115814 8.038603 l +19.801676 9.178118 l +h +19.115814 8.038603 m +29.678312 1.681164 l +31.050034 3.960194 l +20.487535 10.317635 l +19.115814 8.038603 l +h +32.530506 3.758102 m +29.923628 14.901747 l +27.333555 14.295841 l +29.940432 3.152195 l +32.530506 3.758102 l +h +30.138014 15.561367 m +38.817898 23.059925 l +37.078964 25.072811 l +28.399080 17.574253 l +30.138014 15.561367 l +h +37.727440 26.417236 m +26.292339 27.384703 l +26.068092 24.734173 l +37.503193 23.766705 l +37.727440 26.417236 l +h +25.732204 27.790249 m +21.262428 38.307156 l +18.814356 37.266705 l +23.284132 26.749798 l +25.732204 27.790249 l +h +17.737572 38.307156 m +13.267798 27.790249 l +15.715871 26.749798 l +20.185644 37.266705 l +17.737572 38.307156 l +h +12.707662 27.384703 m +1.272561 26.417236 l +1.496809 23.766705 l +12.931910 24.734173 l +12.707662 27.384703 l +h +0.182100 23.059925 m +8.861986 15.561367 l +10.600920 17.574253 l +1.921034 25.072811 l +0.182100 23.059925 l +h +9.076371 14.901747 m +6.469495 3.758102 l +9.059568 3.152195 l +11.666444 14.295841 l +9.076371 14.901747 l +h +9.321689 1.681164 m +19.884186 8.038603 l +18.512465 10.317635 l +7.949968 3.960194 l +9.321689 1.681164 l +h +6.469495 3.758102 m +6.083770 2.109238 7.870839 0.807915 9.321689 1.681164 c +7.949968 3.960194 l +8.514397 4.299919 9.209628 3.793659 9.059568 3.152195 c +6.469495 3.758102 l +h +8.861986 15.561367 m +9.050550 15.398468 9.133131 15.144379 9.076371 14.901747 c +11.666444 14.295841 l +11.948550 15.501760 11.538106 16.764618 10.600920 17.574253 c +8.861986 15.561367 l +h +1.272561 26.417236 m +-0.416872 26.274302 -1.100905 24.168316 0.182100 23.059925 c +1.921034 25.072811 l +2.420168 24.641609 2.154054 23.822311 1.496809 23.766705 c +1.272561 26.417236 l +h +13.267798 27.790249 m +13.170667 27.561710 12.955100 27.405638 12.707662 27.384703 c +12.931910 24.734173 l +14.161719 24.838221 15.233116 25.613928 15.715871 26.749798 c +13.267798 27.790249 l +h +21.262428 38.307156 m +20.601709 39.861759 18.398293 39.861763 17.737572 38.307156 c +20.185644 37.266705 l +19.928600 36.661911 19.071398 36.661915 18.814356 37.266705 c +21.262428 38.307156 l +h +26.292339 27.384703 m +26.044901 27.405638 25.829334 27.561710 25.732204 27.790249 c +23.284132 26.749798 l +23.766886 25.613926 24.838282 24.838221 26.068092 24.734173 c +26.292339 27.384703 l +h +38.817898 23.059925 m +40.100903 24.168312 39.416878 26.274300 37.727440 26.417236 c +37.503193 23.766705 l +36.845943 23.822311 36.579834 24.641613 37.078964 25.072811 c +38.817898 23.059925 l +h +29.923628 14.901747 m +29.866869 15.144379 29.949450 15.398466 30.138014 15.561367 c +28.399080 17.574253 l +27.461895 16.764618 27.051451 15.501762 27.333555 14.295841 c +29.923628 14.901747 l +h +29.678312 1.681164 m +31.129168 0.807911 32.916229 2.109245 32.530506 3.758102 c +29.940432 3.152195 l +29.790373 3.793655 30.485600 4.299923 31.050034 3.960194 c +29.678312 1.681164 l +h +20.487535 10.317635 m +19.879963 10.683325 19.120041 10.683329 18.512465 10.317635 c +19.884186 8.038603 l +19.647816 7.896336 19.352180 7.896338 19.115814 8.038603 c +20.487535 10.317635 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 4135 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000004225 00000 n +0000004248 00000 n +0000004421 00000 n +0000004495 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +4554 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/Contents.json index ef6daa8e54..651a30dd81 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/Contents.json @@ -1,22 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "StickerKeyboardSettingsIcon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "StickerKeyboardSettingsIcon@3x.png", - "scale" : "3x" + "filename" : "settings_48.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@2x.png b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/StickerKeyboardSettingsIcon@2x.png deleted file mode 100644 index 18dc7b95f8941a184d7830bf7c555b46831add52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1El=nh z#7z@en1IwEX$KNw2gN3U{5uYwK5P5h_joiH@16SI>G|$G_d8$DJq0f##44+VFg6lY zsE{xRxQig{ngbM_Z61AO*(8py?s=~T*jx9;N1RQv^mzkZL=g6f)j3UCfXTYW#Mna+ zUU&n{sM`$!bl@jQgc;U3wE$09XNCwt{B#gtL!U2s103Q|9c+Enhd3y5dWFuUg3JkSx!zUkR(i3gH;z{ zk`y?xY;*K@f$Jt^IVm&A03A(jI~Zh=vbDGr-DiiJ>T#jA+zOG* z9Nb)2wfx3w+xdz|x~H*!{O*z<1gli)bT8_-@=<=aEHd^O1|VAZyu#`Q02&XechcPP zMw$yti?b#Er*4XI zhBK7<#xFC*uWRSKkPe*pLV5vLZu_P}v7xC@Y+qBsc-zEyW5{^x>xIhFeN)Xny000CWNklp%!vTQwdEVht@--=t(pfJ$VXPNb?tH1641rIkjR@Q(`VT%U`m%`8ruxeZA|O(P2o`CY1j{Rmq4h(!#oQig$lY1%-_^S1u29W zUJt5-W5<4=MFv6%0RTZHP{4);pqe&NKmtJk0hE|0Mf-t<(PmWiRKIzsjh^av*ootm z5eC+eGR~N%DcgZgIs-IpsIZF~@|Z^q5%}SS7k)$#LkfA+bPm}+3OfTdt)uD?WhCJ< zmGdEqGBHUfly(AU6#FVQ`^du2EkA~=&J0nzVP3(h?lRL? z415mHm_~(}Yu7%gEX*EO2A*++v8R@xE~9}R6v=svGK=2AtSx_j7AYoUFFHE0p4oM8qg&}p`K=Mt`SppYk}KF?ky`oVN(Itjtm17dp8B&vEg;BT!#j z1ezq5Yt9iOhRMez;lno~bJG$~A2CuPK9Q6nu+FXK2H9hqxMT@xO_?Dj>M8O9YMu_9 z|HzwqLQ_96FQn)_fqLHp&{SVvNb;L;CL&Gw4)@6Txn9{(i9uS$~Ozg<(nMN4ZnON zO+ieW5~KcbWzm)gs%y*Okf*T#HneK^htsM7ljfH>cQwD5w-c@FwiC@GkM-fV6G_vc zB}vPhG);shS=utCX>@Ja*gD*CvUT{R8T+{*k1Lw7rD<>H8)siO*gd5As70F3grxcK b%CYeabW=>x*jMuJ00000NkvXXu0mjf;Yjpd diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/settings_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/settings_48.pdf new file mode 100644 index 0000000000..f5d5321729 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/SettingsIcon.imageset/settings_48.pdf @@ -0,0 +1,198 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 3.500000 3.500000 cm +0.000000 0.000000 0.000000 scn +22.000000 39.500000 m +22.000000 40.328426 21.328428 41.000000 20.500000 41.000000 c +19.671574 41.000000 19.000000 40.328426 19.000000 39.500000 c +19.000000 38.338337 l +19.000000 37.690460 18.579983 37.117363 17.962181 36.922268 c +17.088881 36.646984 l +16.504770 36.524204 15.932035 36.370529 15.372461 36.187752 c +14.486683 35.991013 l +13.854101 35.851067 13.203807 36.137375 12.879869 36.698452 c +12.299038 37.704483 l +11.884825 38.421921 10.967439 38.667736 10.250000 38.253521 c +9.532561 37.839306 9.286749 36.921921 9.700962 36.204483 c +10.281794 35.198452 l +10.605731 34.637375 10.528535 33.931049 10.091049 33.453190 c +9.444299 32.748505 l +9.026765 32.371395 8.628606 31.973236 8.251495 31.555702 c +7.546809 30.908951 l +7.068950 30.471466 6.362623 30.394268 5.801547 30.718206 c +4.795517 31.299038 l +4.078078 31.713251 3.160693 31.467438 2.746479 30.750000 c +2.332266 30.032562 2.578078 29.115175 3.295517 28.700962 c +4.301547 28.120131 l +4.862623 27.796192 5.148933 27.145899 5.008989 26.513317 c +4.812248 25.627539 l +4.629469 25.067965 4.475796 24.495230 4.353016 23.911119 c +4.077733 23.037819 l +3.882637 22.420017 3.309538 22.000000 2.661662 22.000000 c +1.500000 22.000000 l +0.671573 22.000000 0.000000 21.328426 0.000000 20.500000 c +0.000000 19.671572 0.671573 19.000000 1.500000 19.000000 c +2.661662 19.000000 l +3.309538 19.000000 3.882637 18.579983 4.077733 17.962181 c +4.353333 17.087372 l +4.475950 16.504307 4.629352 15.932577 4.811759 15.373960 c +5.008989 14.486683 l +5.148933 13.854101 4.862623 13.203808 4.301547 12.879869 c +3.295517 12.299038 l +2.578078 11.884825 2.332266 10.967440 2.746479 10.250000 c +3.160693 9.532560 4.078078 9.286747 4.795517 9.700962 c +5.801547 10.281792 l +6.362623 10.605730 7.068950 10.528536 7.546809 10.091049 c +8.250140 9.445797 l +8.627652 9.027718 9.026265 8.629059 9.444299 8.251495 c +10.091049 7.546806 l +10.528535 7.068951 10.605731 6.362625 10.281794 5.801548 c +9.700962 4.795517 l +9.286749 4.078079 9.532561 3.160690 10.250000 2.746479 c +10.967439 2.332264 11.884825 2.578079 12.299038 3.295517 c +12.879869 4.301548 l +13.203807 4.862625 13.854101 5.148933 14.486683 5.008987 c +15.384456 4.808334 l +15.943589 4.626175 16.515841 4.473072 17.099430 4.350803 c +17.962181 4.077732 l +18.125601 4.015381 l +18.652878 3.777821 19.000000 3.250641 19.000000 2.661663 c +19.000000 1.500000 l +19.010092 1.325066 l +19.096739 0.579060 19.730747 0.000000 20.500000 0.000000 c +21.328428 0.000000 22.000000 0.671574 22.000000 1.500000 c +22.000000 2.661663 l +22.010246 2.836273 l +22.078001 3.410614 22.476181 3.900372 23.037819 4.077732 c +23.905090 4.351749 l +24.486071 4.473644 25.055811 4.626099 25.612547 4.807358 c +26.513317 5.008987 l +27.145899 5.148933 27.796192 4.862625 28.120131 4.301548 c +28.700962 3.295517 l +29.115175 2.578079 30.032560 2.332264 30.750000 2.746479 c +31.467440 3.160690 31.713253 4.078079 31.299038 4.795517 c +30.718208 5.801548 l +30.394270 6.362625 30.471464 7.068951 30.908951 7.546806 c +31.555702 8.251495 l +31.973736 8.629059 32.372349 9.027718 32.749863 9.445797 c +33.453194 10.091049 l +33.931049 10.528536 34.637375 10.605730 35.198452 10.281792 c +36.204483 9.700962 l +36.921921 9.286747 37.839310 9.532560 38.253521 10.250000 c +38.667736 10.967440 38.421921 11.884825 37.704483 12.299038 c +36.698452 12.879869 l +36.137375 13.203808 35.851067 13.854101 35.991013 14.486683 c +36.192642 15.387453 l +36.373901 15.944189 36.526356 16.513929 36.648251 17.094910 c +36.922268 17.962181 l +37.117363 18.579983 37.690460 19.000000 38.338337 19.000000 c +39.500000 19.000000 l +40.328426 19.000000 41.000000 19.671572 41.000000 20.500000 c +41.000000 21.328426 40.328426 22.000000 39.500000 22.000000 c +38.338337 22.000000 l +37.690460 22.000000 37.117363 22.420017 36.922268 23.037819 c +36.648884 23.902077 l +36.526775 24.484623 36.373940 25.055870 36.192154 25.614044 c +35.991013 26.513317 l +35.851067 27.145899 36.137375 27.796192 36.698452 28.120131 c +37.704483 28.700962 l +38.421921 29.115175 38.667736 30.032562 38.253521 30.750000 c +37.839310 31.467438 36.921921 31.713251 36.204483 31.299038 c +35.198452 30.718206 l +34.637375 30.394268 33.931049 30.471466 33.453194 30.908951 c +32.748505 31.555702 l +32.370941 31.973736 31.972282 32.372349 31.554203 32.749859 c +30.908951 33.453190 l +30.471464 33.931049 30.394270 34.637375 30.718208 35.198452 c +31.299038 36.204483 l +31.713253 36.921921 31.467440 37.839306 30.750000 38.253521 c +30.032560 38.667736 29.115175 38.421921 28.700962 37.704483 c +28.120131 36.698452 l +27.796192 36.137375 27.145899 35.851067 26.513317 35.991013 c +25.626040 36.188240 l +25.067423 36.370647 24.495693 36.524048 23.912628 36.646667 c +23.037819 36.922268 l +22.420017 37.117363 22.000000 37.690460 22.000000 38.338337 c +22.000000 39.500000 l +h +6.999939 20.500244 m +6.999939 27.956089 13.044094 34.000244 20.499939 34.000244 c +27.955784 34.000244 33.999939 27.956089 33.999939 20.500244 c +33.999939 13.044399 27.955784 7.000244 20.499939 7.000244 c +13.044094 7.000244 6.999939 13.044399 6.999939 20.500244 c +h +14.233011 30.086567 m +14.833106 30.510162 15.662971 30.367085 16.086567 29.766989 c +21.689148 21.830000 l +30.500000 21.830000 l +31.234539 21.830000 31.830000 21.234539 31.830000 20.500000 c +31.830000 19.765461 31.234539 19.170000 30.500000 19.170000 c +21.689148 19.170000 l +16.086567 11.233011 l +15.662971 10.632917 14.833106 10.489836 14.233011 10.913433 c +13.632916 11.337029 13.489837 12.166895 13.913433 12.766989 c +19.372028 20.500000 l +13.913433 28.233011 l +13.489837 28.833107 13.632916 29.662971 14.233011 30.086567 c +h +f* +n +Q + +endstream +endobj + +3 0 obj + 5648 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000005738 00000 n +0000005761 00000 n +0000005934 00000 n +0000006008 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +6067 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/Contents.json index 06c3a823d3..636fda6a5f 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_input_stickers.pdf", + "filename" : "stickers_48.pdf", "idiom" : "universal" } ], diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/ic_input_stickers.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/StickersMode.imageset/ic_input_stickers.pdf deleted file mode 100644 index 67ae05a3153bf6583a723266f15ed396106f06cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4625 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 x#9^UeI39tshvH#SC7w+2{{mBE6> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.270020 4.152344 cm +0.000000 0.000000 0.000000 scn +16.315697 39.500134 m +17.465136 39.695385 18.643398 39.519531 19.692223 38.997250 c +20.036819 38.810360 l +20.329382 38.633312 l +22.423059 37.333458 25.297297 34.879963 28.991110 31.253437 c +30.068821 30.185352 l +30.611883 29.639896 l +34.713905 25.501024 37.402637 22.349218 38.705769 20.126995 c +39.294643 19.122784 39.547707 17.960588 39.433071 16.802202 c +39.381195 16.416437 l +39.289803 15.914349 l +39.216812 15.566687 l +39.100006 15.079699 l +36.891888 6.359375 29.005989 0.117638 19.853556 0.117638 c +8.888740 0.117638 0.000000 9.006048 0.000000 19.970463 c +0.000000 29.125599 6.246058 37.013073 14.970581 39.218063 c +15.710625 39.388660 l +16.315697 39.500134 l +h +12.798756 35.489426 m +12.631100 35.425148 l +12.241472 35.242031 l +6.578289 32.429054 2.786009 26.584171 2.786009 19.970726 c +2.786009 10.544853 10.427470 2.903671 19.853691 2.903671 c +26.466494 2.903671 32.311123 6.694832 35.134140 12.353510 c +35.125557 12.358789 l +35.308681 12.748402 l +35.384480 12.909666 35.423779 13.085659 35.423779 13.263847 c +35.423779 13.877327 34.967880 14.384329 34.376385 14.464569 c +34.211948 14.475632 l +32.160770 14.475632 l +22.489969 14.475632 14.620218 22.186560 14.364793 31.795357 c +14.358393 32.277351 l +14.358393 34.328457 l +14.358393 34.506645 14.319095 34.682640 14.243299 34.843903 c +13.984495 35.394527 13.364433 35.659653 12.798756 35.489426 c +h +16.782263 36.753235 m +17.411953 36.860195 18.059189 36.741272 18.609720 36.417446 c +18.873783 36.257626 l +19.147327 36.083416 l +21.103546 34.807701 23.928543 32.350906 27.572746 28.738895 c +28.098915 28.215038 l +29.130342 27.174446 l +32.797047 23.440453 35.195877 20.604664 36.302593 18.717381 c +36.625195 18.167248 36.743385 17.520950 36.636360 16.892254 c +36.563797 16.495956 l +35.903824 16.976896 35.090961 17.260666 34.211819 17.260666 c +32.160641 17.260666 l +31.717884 17.267069 l +23.629288 17.501270 17.144138 24.131626 17.144138 32.276615 c +17.144138 34.327721 l +17.128656 34.679214 l +17.087467 35.145836 16.964489 35.602531 16.764452 36.028126 c +16.655125 36.260727 16.526255 36.477886 16.380722 36.678566 c +16.574390 36.716927 l +16.782263 36.753235 l +h +f* +n +Q + +endstream +endobj + +3 0 obj + 2244 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000002334 00000 n +0000002357 00000 n +0000002530 00000 n +0000002604 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +2663 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/Contents.json index 7e3c34b404..db24d83a9c 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_input_trending.pdf", + "filename" : "trending_48.pdf", "idiom" : "universal" } ], diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/ic_input_trending.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/ic_input_trending.pdf deleted file mode 100644 index 79a53a462c4fa0c74de75729d043b31b6ac55c52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4517 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 diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/trending_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/trending_48.pdf new file mode 100644 index 0000000000..a456c3f12a --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingGifs.imageset/trending_48.pdf @@ -0,0 +1,110 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.170044 0.499023 cm +0.000000 0.000000 0.000000 scn +32.698776 36.649349 m +33.196007 37.230061 33.128334 38.103909 32.547619 38.601139 c +24.752439 45.275715 13.077241 44.850506 5.778737 37.552002 c +-1.926246 29.847019 -1.926246 17.354773 5.778737 9.649792 c +13.483720 1.944809 25.975967 1.944809 33.680950 9.649792 c +35.733494 11.702333 37.280899 14.138113 38.257706 16.806875 c +38.402122 17.201443 38.533802 17.600437 38.652599 18.003250 c +38.868858 18.736530 38.449730 19.506285 37.716450 19.722542 c +36.983170 19.938799 36.213417 19.519670 35.997158 18.786390 c +35.895077 18.440252 35.781937 18.097435 35.657864 17.758453 c +34.818737 15.465839 33.489719 13.373833 31.723314 11.607428 c +25.099504 4.983616 14.360184 4.983616 7.736373 11.607428 c +1.112563 18.231237 1.112563 28.970556 7.736373 35.594368 c +14.010414 41.868408 24.048201 42.233982 30.746983 36.498192 c +31.327696 36.000961 32.201546 36.068634 32.698776 36.649349 c +h +38.615009 32.391445 m +38.529594 33.073990 37.947231 33.602066 37.241535 33.602066 c +28.902636 33.602066 l +28.728996 33.591278 l +28.046450 33.505859 27.518377 32.923504 27.518377 32.217808 c +27.529161 32.044167 l +27.614580 31.361622 28.196938 30.833549 28.902636 30.833549 c +34.177799 30.834362 l +25.567074 22.223354 l +20.660971 27.129120 l +20.471394 27.300470 l +19.490988 28.100105 18.044804 28.042988 17.130936 27.129120 c +8.744342 18.742527 l +8.620458 18.600773 l +8.207510 18.058197 8.248805 17.280428 8.744342 16.784891 c +8.886098 16.661007 l +9.428673 16.248058 10.206441 16.289354 10.701978 16.784891 c +18.894285 24.980196 l +23.802057 20.072762 l +23.991632 19.901411 l +24.972040 19.101778 26.418222 19.158894 27.332090 20.072762 c +35.857254 28.599537 l +35.857281 23.878904 l +35.868065 23.705265 l +35.953484 23.022720 36.535839 22.494646 37.241535 22.494646 c +38.006042 22.494646 38.625793 23.114401 38.625793 23.878904 c +38.625793 32.217808 l +38.615009 32.391445 l +h +f* +n +Q + +endstream +endobj + +3 0 obj + 1977 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000002067 00000 n +0000002090 00000 n +0000002263 00000 n +0000002337 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +2396 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/Contents.json index 52c50ded21..6ce76d9c8a 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_input_addstickers.pdf", + "filename" : "add_48.pdf", "idiom" : "universal" } ], diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/add_48.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/add_48.pdf new file mode 100644 index 0000000000..d33ac42f34 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/add_48.pdf @@ -0,0 +1,95 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.272095 4.271973 cm +0.000000 0.000000 0.000000 scn +19.728001 36.800056 m +10.299395 36.800056 2.656000 29.156660 2.656000 19.728054 c +2.656000 10.299450 10.299395 2.656055 19.728001 2.656055 c +29.156605 2.656055 36.799999 10.299450 36.799999 19.728054 c +36.799999 29.156660 29.156605 36.800056 19.728001 36.800056 c +h +0.000000 19.728054 m +0.000000 30.623528 8.832526 39.456055 19.728001 39.456055 c +30.623474 39.456055 39.455997 30.623528 39.455997 19.728054 c +39.455997 8.832581 30.623474 0.000057 19.728001 0.000057 c +8.832526 0.000057 0.000000 8.832581 0.000000 19.728054 c +h +19.728001 29.056055 m +20.461435 29.056055 21.056002 28.461489 21.056002 27.728054 c +21.056002 21.056053 l +27.728001 21.056053 l +28.461435 21.056053 29.056002 20.461487 29.056002 19.728054 c +29.056002 18.994619 28.461435 18.400053 27.728001 18.400053 c +21.056002 18.400053 l +21.056002 11.728054 l +21.056002 10.994619 20.461435 10.400053 19.728001 10.400053 c +18.994568 10.400053 18.400002 10.994619 18.400002 11.728054 c +18.400002 18.400053 l +11.728000 18.400053 l +10.994566 18.400053 10.400000 18.994619 10.400000 19.728054 c +10.400000 20.461487 10.994566 21.056053 11.728000 21.056053 c +18.400002 21.056053 l +18.400002 27.728054 l +18.400002 28.461489 18.994568 29.056055 19.728001 29.056055 c +h +f* +n +Q + +endstream +endobj + +3 0 obj + 1349 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000001439 00000 n +0000001462 00000 n +0000001635 00000 n +0000001709 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1768 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/ic_input_addstickers.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Input/Media/TrendingIcon.imageset/ic_input_addstickers.pdf deleted file mode 100644 index 4e0a98ec48f973a8017effcdcbf5acf230f32ed0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4081 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 + for message in messages { + if let author = message.effectiveAuthor, !uniquePeerIds.contains(author.id) { + uniquePeerIds.insert(author.id) + } if !message.text.isEmpty { for media in message.media { if media is TelegramMediaImage || media is TelegramMediaFile { hasCaptions = true - break loop } } } } - items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_ForwardOptions_ShowSendersNames, icon: { theme in + + items.append(.action(ContextMenuActionItem(text: uniquePeerIds.count == 1 ? presentationData.strings.Conversation_ForwardOptions_ShowSendersName : presentationData.strings.Conversation_ForwardOptions_ShowSendersNames, icon: { theme in if presentationInterfaceState.interfaceState.forwardOptionsState?.hideNames == true { return nil } else { @@ -5513,7 +5519,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G }) }))) - items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_ForwardOptions_HideSendersNames, icon: { theme in + items.append(.action(ContextMenuActionItem(text: uniquePeerIds.count == 1 ? presentationData.strings.Conversation_ForwardOptions_HideSendersName : presentationData.strings.Conversation_ForwardOptions_HideSendersNames, icon: { theme in if presentationInterfaceState.interfaceState.forwardOptionsState?.hideNames == true { return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Check"), color: theme.contextMenu.primaryColor) } else { diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift index 16cfaa4fd7..23cc9029fd 100644 --- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift @@ -2428,7 +2428,14 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { updatedToggledMessageIds = state.toggledMessageIds let isSelected = (self.controllerInteraction.selectionState?.selectedIds.contains(message.id) ?? false) if state.selecting != isSelected { - let messageIds = messages.map { $0.id } + let messageIds = messages.filter { message -> Bool in + for media in messages { + if media is TelegramMediaAction { + return false + } + } + return true + }.map { $0.id } updatedToggledMessageIds.append(messageIds) self.controllerInteraction.toggleMessagesSelection(messageIds, state.selecting) } diff --git a/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift index f3210da8b5..fe0d876116 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift @@ -129,6 +129,7 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode { self.imageNode = ASImageNode() self.imageNode.isLayerBacked = true + self.imageNode.contentMode = .scaleAspectFit self.textNodeContainer = ASDisplayNode() self.textNodeContainer.isUserInteractionEnabled = false @@ -227,12 +228,6 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode { default: break } -// if emoji == "🥳" { -// if #available(iOSApplicationExtension 12.1, iOS 12.1, *) { -// } else { -// emoji = "🎉" -// } -// } self.imageNode.image = nil if let file = file { diff --git a/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift index 9520e80399..cfb9ccaa7f 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift @@ -86,6 +86,7 @@ final class ChatMediaInputRecentGifsItemNode: ListViewItemNode { self.imageNode = ASImageNode() self.imageNode.isLayerBacked = true + self.imageNode.contentMode = .scaleAspectFit self.titleNode = ImmediateTextNode() diff --git a/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift index 0480a8c0bc..77a0c95c80 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift @@ -82,6 +82,7 @@ final class ChatMediaInputSettingsItemNode: ListViewItemNode { self.imageNode = ASImageNode() self.imageNode.isLayerBacked = true + self.imageNode.contentMode = .scaleAspectFit self.titleNode = ImmediateTextNode() diff --git a/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift index f27923b5c8..ad8158ce84 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift @@ -91,6 +91,7 @@ final class ChatMediaInputTrendingItemNode: ListViewItemNode { self.imageNode = ASImageNode() self.imageNode.isLayerBacked = true + self.imageNode.contentMode = .scaleAspectFit self.badgeBackground = ASImageNode() self.badgeBackground.displaysAsynchronously = false diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift index f757cf18a2..10e70c3ded 100644 --- a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift @@ -2411,6 +2411,10 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode } item.controllerInteraction.displayPsa(type, sourceNode) } + + if animation.isAnimated { + forwardInfoNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } } let previousForwardInfoNodeFrame = forwardInfoNode.frame forwardInfoNode.frame = CGRect(origin: CGPoint(x: contentOrigin.x + layoutConstants.text.bubbleInsets.left, y: layoutConstants.bubble.contentInsets.top + forwardInfoOriginY), size: CGSize(width: bubbleContentWidth, height: forwardInfoSizeApply.0.height)) @@ -2420,8 +2424,17 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode } } } else { - strongSelf.forwardInfoNode?.removeFromSupernode() - strongSelf.forwardInfoNode = nil + if animation.isAnimated { + if let forwardInfoNode = strongSelf.forwardInfoNode { + strongSelf.forwardInfoNode = nil + forwardInfoNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.1, removeOnCompletion: false, completion: { [weak forwardInfoNode] _ in + forwardInfoNode?.removeFromSupernode() + }) + } + } else { + strongSelf.forwardInfoNode?.removeFromSupernode() + strongSelf.forwardInfoNode = nil + } } if let replyInfoNode = replyInfoSizeApply.1() { diff --git a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift index f45fdc528d..114d51c871 100644 --- a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift +++ b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift @@ -161,7 +161,11 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode { if !authors.isEmpty { authors.append(", ") } - authors.append(author.compactDisplayTitle) + if author.id == context.account.peerId { + authors.append(strongSelf.strings.DialogList_You) + } else { + authors.append(author.compactDisplayTitle) + } } if let peer = message.peers[message.id.peerId] { sourcePeer = (peer.id.namespace == Namespaces.Peer.CloudUser, peer.displayTitle(strings: strongSelf.strings, displayOrder: strongSelf.nameDisplayOrder)) @@ -201,7 +205,14 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode { if let strongSelf = self, count < 3 { Queue.mainQueue().after(3.0) { if let snapshotView = strongSelf.textNode.view.snapshotContentTree() { - strongSelf.textNode.attributedText = NSAttributedString(string: strongSelf.strings.Conversation_ForwardOptions_TapForOptions, font: Font.regular(15.0), textColor: strongSelf.theme.chat.inputPanel.secondaryTextColor) + let text: String + if let (size, _) = strongSelf.validLayout, size.width > 320.0 { + text = strongSelf.strings.Conversation_ForwardOptions_TapForOptions + } else { + text = strongSelf.strings.Conversation_ForwardOptions_TapForOptionsShort + } + + strongSelf.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: strongSelf.theme.chat.inputPanel.secondaryTextColor) strongSelf.view.addSubview(snapshotView) diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift index 54148e48da..8352545820 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift @@ -3491,6 +3491,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD canChangeColors = peer.hasPermission(.changeInfo) } else if let peer = peer as? TelegramGroup, case .member = peer.role { canChangeColors = !peer.hasBannedPermission(.banChangeInfo) + } else if self.data?.encryptionKeyFingerprint != nil { + canChangeColors = false } if canChangeColors {