ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2'

Browse Source 
# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift
This commit is contained in:
Ilya Laktyushin
2018-09-05 01:04:07 +03:00
parent 4ec048feac 25cb418eb3
commit 66de87a550
106 changed files with 1379 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
TelegramUI/ChatListController.swift
View File

@@ -115,7 +115,7 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD
case .waitingForNetwork:
strongSelf.titleView.title = NetworkStatusTitle(text: strongSelf.presentationData.strings.State_WaitingForNetwork, activity: true, hasProxy: hasProxy, connectsViaProxy: connectsViaProxy)
case let .connecting(proxy):
var text = strongSelf.presentationData.strings.State_Connecting
let text = strongSelf.presentationData.strings.State_Connecting
if let proxy = proxy, proxy.hasConnectionIssues {
checkProxy = true
}
@@ -382,7 +382,7 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD
}
}
self.chatListDisplayNode.requestOpenPeerFromSearch = { [weak self] peer in
self.chatListDisplayNode.requestOpenPeerFromSearch = { [weak self] peer, dismissSearch in
if let strongSelf = self {
let storedPeer = strongSelf.account.postbox.transaction { transaction -> Void in
if transaction.getPeer(peer.id) == nil {
@@ -393,9 +393,15 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD
}
strongSelf.openMessageFromSearchDisposable.set((storedPeer |> deliverOnMainQueue).start(completed: { [weak strongSelf] in
if let strongSelf = strongSelf {
strongSelf.dismissSearchOnDisappear = true
if dismissSearch {
strongSelf.dismissSearchOnDisappear = true
}
if let navigationController = strongSelf.navigationController as? NavigationController {
navigateToChatController(navigationController: navigationController, account: strongSelf.account, chatLocation: .peer(peer.id))
navigateToChatController(navigationController: navigationController, account: strongSelf.account, chatLocation: .peer(peer.id), purposefulAction: { [weak self] in
if let strongSelf = self {
strongSelf.deactivateSearch(animated: false)
}
})
strongSelf.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
}
}
@@ -526,7 +532,7 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD
}
}
private func deactivateSearch(animated: Bool) {
func deactivateSearch(animated: Bool) {
if !self.displayNavigationBar {
self.setDisplayNavigationBar(true, transition: animated ? .animated(duration: 0.5, curve: .spring) : .immediate)
self.chatListDisplayNode.deactivateSearch(animated: animated)