ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-27 18:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/5.0.3'

Browse Source
This commit is contained in:
Peter Iakovlev 2018-04-12 16:31:45 +04:00
commit 4066190337
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TelegramUI/ChatEmptyNode.swift
View File

@ -142,9 +142,9 @@ private final class ChatEmptyNodeSecretChatContent: ASDisplayNode, ChatEmptyNode
}
}
let insets = UIEdgeInsets(top: 10.0, left: 10.0, bottom: 10.0, right: 10.0)
let titleSpacing: CGFloat = 4.0
let subtitleSpacing: CGFloat = 3.0
let insets = UIEdgeInsets(top: 15.0, left: 15.0, bottom: 15.0, right: 15.0)
let titleSpacing: CGFloat = 5.0
let subtitleSpacing: CGFloat = 4.0
let iconInset: CGFloat = 14.0
var contentWidth: CGFloat = 100.0

3
TelegramUI/ChatListController.swift
View File

@ -508,11 +508,10 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD
chatController.canReadHistory.set(true)
chatController.updatePresentationMode(.standard(previewing: false))
if let navigationController = self.navigationController as? NavigationController {
navigateToChatController(navigationController: navigationController, chatController: chatController, account: self.account, chatLocation: chatController.chatLocation)
navigateToChatController(navigationController: navigationController, chatController: chatController, account: self.account, chatLocation: chatController.chatLocation, animated: false)
self.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
}
}
}
}
}

2
TelegramUI/GenerateTextEntities.swift
View File

@ -86,7 +86,7 @@ func generateChatInputTextEntities(_ text: NSAttributedString) -> [MessageTextEn
} else if key == ChatTextInputAttributes.italic {
entities.append(MessageTextEntity(range: range.lowerBound ..< range.upperBound, type: .Italic))
} else if key == ChatTextInputAttributes.monospace {
entities.append(MessageTextEntity(range: range.lowerBound ..< range.upperBound, type: .Pre))
entities.append(MessageTextEntity(range: range.lowerBound ..< range.upperBound, type: .Code))
} else if key == ChatTextInputAttributes.textMention, let value = value as? ChatTextInputTextMentionAttribute {
entities.append(MessageTextEntity(range: range.lowerBound ..< range.upperBound, type: .TextMention(peerId: value.peerId)))
}