ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-01 16:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bb27a2ba5d46b3f5832e4c62da4ee6201ce49608'

Browse Source
This commit is contained in:
Ali 2020-09-24 23:23:32 +04:00
commit c7591bb2fc
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/SearchBarNode/Sources/SearchBarNode.swift
View File

@ -480,7 +480,7 @@ private class SearchBarTextField: UITextField, UIScrollViewDelegate {
rect.origin.x += prefixOffset
rect.size.width -= prefixOffset
}
if !self.tokensWidth.isZero && self.scrollView == nil {
if !self.tokensWidth.isZero && self.scrollView?.superview == nil {
rect.origin.x += self.tokensWidth
rect.size.width -= self.tokensWidth
}

20
submodules/TelegramIntents/Sources/TelegramIntents.swift
View File

@ -12,7 +12,7 @@ import AvatarNode
import AccountContext
private let savedMessagesAvatar: UIImage = {
return generateImage(CGSize(width: 60.0, height: 60.0), contextGenerator: { size, context in
return generateImage(CGSize(width: 60.0, height: 60.0), rotatedContext: { size, context in
var locations: [CGFloat] = [1.0, 0.0]
let colorSpace = CGColorSpaceCreateDeviceRGB()
@ -68,6 +68,7 @@ public func donateSendMessageIntent(account: Account, sharedContext: SharedAccou
|> mapToSignal { unlocked -> Signal<[(Peer, SendMessageIntentSubject, UIImage?)], NoError> in
if unlocked {
return sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.intentsSettings])
|> take(1)
|> mapToSignal { sharedData -> Signal<[(Peer, SendMessageIntentSubject)], NoError> in
let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.intentsSettings] as? IntentsSettings) ?? IntentsSettings.defaultSettings
if let accountId = settings.account, accountId != account.peerId {
@ -136,7 +137,20 @@ public func donateSendMessageIntent(account: Account, sharedContext: SharedAccou
} else {
let peerAndAvatar = (peerAvatarImage(account: account, peerReference: PeerReference(peer), authorOfMessage: nil, representation: peer.smallProfileImage, round: false) ?? .single(nil))
|> map { imageVersions -> (Peer, SendMessageIntentSubject, UIImage?) in
let avatarImage = imageVersions?.0
var avatarImage: UIImage?
if let image = imageVersions?.0 {
avatarImage = image
} else {
let avatarFont = avatarPlaceholderFont(size: 26.0)
let size = CGSize(width: 60.0, height: 60.0)
if let image = generateImage(size, rotatedContext: { size, context in
context.clear(CGRect(origin: CGPoint(), size: size))
drawPeerAvatarLetters(context: context, size: CGSize(width: size.width, height: size.height), font: avatarFont, letters: peer.displayLetters, peerId: peer.id)
})?.withRenderingMode(.alwaysOriginal) {
avatarImage = image
}
}
return (peer, subject, avatarImage)
}
signals.append(peerAndAvatar)
@ -151,7 +165,7 @@ public func donateSendMessageIntent(account: Account, sharedContext: SharedAccou
|> deliverOnMainQueue).start(next: { peers in
let presentationData = sharedContext.currentPresentationData.with { $0 }
for (peer, subject, avatarImage) in peers {
for (peer, _, avatarImage) in peers {
let recipientHandle = INPersonHandle(value: "tg\(peer.id.toInt64())", type: .unknown)
let displayTitle: String
var nameComponents = PersonNameComponents()