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

no message

Browse Source
This commit is contained in:
Peter
2017-02-11 17:05:23 +03:00
parent d0a9b00844
commit 32efb5962d
240 changed files with 16763 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
TelegramUI/ChatListSearchContainerNode.swift
View File

@@ -5,6 +5,104 @@ import SwiftSignalKit
import Postbox
import TelegramCore
enum ChatListRecentEntryStableId: Hashable {
case topPeers
case peerId(PeerId)
static func ==(lhs: ChatListRecentEntryStableId, rhs: ChatListRecentEntryStableId) -> Bool {
switch lhs {
case .topPeers:
if case .topPeers = rhs {
return true
} else {
return false
}
case let .peerId(peerId):
if case .peerId(peerId) = rhs {
return true
} else {
return false
}
}
}
var hashValue: Int {
switch self {
case .topPeers:
return 0
case let .peerId(peerId):
return peerId.hashValue
}
}
}
enum ChatListRecentEntry: Comparable, Identifiable {
case topPeers([Peer])
case peer(index: Int, peer: Peer)
var stableId: ChatListRecentEntryStableId {
switch self {
case .topPeers:
return .topPeers
case let .peer(_, peer):
return .peerId(peer.id)
}
}
static func ==(lhs: ChatListRecentEntry, rhs: ChatListRecentEntry) -> Bool {
switch lhs {
case let .topPeers(lhsPeers):
if case let .topPeers(rhsPeers) = rhs {
if lhsPeers.count != rhsPeers.count {
return false
}
for i in 0 ..< lhsPeers.count {
if !lhsPeers[i].isEqual(rhsPeers[i]) {
return false
}
}
return true
} else {
return false
}
case let .peer(lhsIndex, lhsPeer):
if case let .peer(rhsIndex, rhsPeer) = rhs, lhsPeer.isEqual(rhsPeer) && lhsIndex == rhsIndex {
return true
} else {
return false
}
}
}
static func <(lhs: ChatListRecentEntry, rhs: ChatListRecentEntry) -> Bool {
switch lhs {
case .topPeers:
return true
case let .peer(lhsIndex, _):
switch rhs {
case .topPeers:
return false
case let .peer(rhsIndex, _):
return lhsIndex < rhsIndex
}
}
}
func item(account: Account, peerSelected: @escaping (Peer) -> Void) -> ListViewItem {
switch self {
case let .topPeers(peers):
return ChatListRecentPeersListItem(account: account, peers: peers, peerSelected: { peer in
peerSelected(peer)
})
case let .peer(_, peer):
return ContactsPeerItem(account: account, peer: peer, chatPeer: peer, status: .none, selection: .none, index: nil, header: ChatListSearchItemHeader(type: .recentPeers), action: { _ in
peerSelected(peer)
})
}
}
}
enum ChatListSearchEntryStableId: Hashable {
case localPeerId(PeerId)
case globalPeerId(PeerId)
@@ -133,6 +231,12 @@ enum ChatListSearchEntry: Comparable, Identifiable {
}
}
struct ChatListSearchContainerRecentTransition {
let deletions: [ListViewDeleteItem]
let insertions: [ListViewInsertItem]
let updates: [ListViewUpdateItem]
}
struct ChatListSearchContainerTransition {
let deletions: [ListViewDeleteItem]
let insertions: [ListViewInsertItem]
@@ -140,6 +244,16 @@ struct ChatListSearchContainerTransition {
let displayingResults: Bool
}
func chatListSearchContainerPreparedRecentTransition(from fromEntries: [ChatListRecentEntry], to toEntries: [ChatListRecentEntry], account: Account, peerSelected: @escaping (Peer) -> Void) -> ChatListSearchContainerRecentTransition {
let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, peerSelected: peerSelected), directionHint: nil) }
let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, peerSelected: peerSelected), directionHint: nil) }
return ChatListSearchContainerRecentTransition(deletions: deletions, insertions: insertions, updates: updates)
}
func chatListSearchContainerPreparedTransition(from fromEntries: [ChatListSearchEntry], to toEntries: [ChatListSearchEntry], displayingResults: Bool, account: Account, enableHeaders: Bool, interaction: ChatListNodeInteraction) -> ChatListSearchContainerTransition {
let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
@@ -154,11 +268,16 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
private let account: Account
private let openMessage: (Peer, MessageId) -> Void
private let recentPeersNode: ChatListSearchRecentPeersNode
//private let recentPeersNode: ChatListSearchRecentPeersNode
private let recentListNode: ListView
private let listNode: ListView
private var enqueuedRecentTransitions: [(ChatListSearchContainerRecentTransition, Bool)] = []
private var enqueuedTransitions: [(ChatListSearchContainerTransition, Bool)] = []
private var hasValidLayout = false
private let recentDisposable = MetaDisposable()
private let searchQuery = Promise<String?>()
private let searchDisposable = MetaDisposable()
@@ -166,18 +285,21 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
self.account = account
self.openMessage = openMessage
self.recentPeersNode = ChatListSearchRecentPeersNode(account: account, peerSelected: openPeer)
//self.recentPeersNode = ChatListSearchRecentPeersNode(account: account, peerSelected: openPeer)
self.recentListNode = ListView()
self.listNode = ListView()
super.init()
self.backgroundColor = UIColor.white
self.addSubnode(self.recentPeersNode)
//self.addSubnode(self.recentPeersNode)
self.addSubnode(self.recentListNode)
self.addSubnode(self.listNode)
self.listNode.isHidden = true
let foundItems = searchQuery.get()
|> mapToSignal { query -> Signal<[ChatListSearchEntry]?, NoError> in
if let query = query, !query.isEmpty {
@@ -224,6 +346,7 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
let interaction = ChatListNodeInteraction(activateSearch: {
}, peerSelected: { [weak self] peer in
openPeer(peer)
let _ = addRecentlySearchedPeer(postbox: account.postbox, peerId: peer.id).start()
self?.listNode.clearHighlightAnimated(true)
}, messageSelected: { [weak self] message in
if let peer = message.peers[message.id.peerId] {
@@ -236,6 +359,29 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
}, deletePeer: { _ in
})
let previousRecentItems = Atomic<[ChatListRecentEntry]?>(value: nil)
let recentItemsTransition = recentlySearchedPeers(postbox: account.postbox)
|> mapToSignal { [weak self] peers -> Signal<(ChatListSearchContainerRecentTransition, Bool), NoError> in
var entries: [ChatListRecentEntry] = []
entries.append(.topPeers([]))
for i in 0 ..< peers.count {
entries.append(.peer(index: i, peer: peers[i]))
}
let previousEntries = previousRecentItems.swap(entries)
let transition = chatListSearchContainerPreparedRecentTransition(from: previousEntries ?? [], to: entries, account: account, peerSelected: { peer in
self?.recentListNode.clearHighlightAnimated(true)
openPeer(peer)
})
return .single((transition, previousEntries == nil))
}
self.recentDisposable.set((recentItemsTransition |> deliverOnMainQueue).start(next: { [weak self] (transition, firstTime) in
if let strongSelf = self {
strongSelf.enqueueRecentTransition(transition, firstTime: firstTime)
}
}))
self.searchDisposable.set((foundItems
|> deliverOnMainQueue).start(next: { [weak self] entries in
if let strongSelf = self {
@@ -249,6 +395,7 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
}
deinit {
self.recentDisposable.dispose()
self.searchDisposable.dispose()
}
@@ -260,6 +407,31 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
}
}
private func enqueueRecentTransition(_ transition: ChatListSearchContainerRecentTransition, firstTime: Bool) {
enqueuedRecentTransitions.append((transition, firstTime))
if self.hasValidLayout {
while !self.enqueuedRecentTransitions.isEmpty {
self.dequeueRecentTransition()
}
}
}
private func dequeueRecentTransition() {
if let (transition, firstTime) = self.enqueuedRecentTransitions.first {
self.enqueuedRecentTransitions.remove(at: 0)
var options = ListViewDeleteAndInsertOptions()
options.insert(.PreferSynchronousResourceLoading)
if firstTime {
} else {
}
self.recentListNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { _ in
})
}
}
private func enqueueTransition(_ transition: ChatListSearchContainerTransition, firstTime: Bool) {
enqueuedTransitions.append((transition, firstTime))
@@ -286,7 +458,7 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
if let strongSelf = self {
if displayingResults != !strongSelf.listNode.isHidden {
strongSelf.listNode.isHidden = !displayingResults
strongSelf.recentPeersNode.isHidden = displayingResults
strongSelf.recentListNode.isHidden = displayingResults
}
}
})
@@ -296,9 +468,9 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
super.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition)
let recentPeersSize = self.recentPeersNode.measure(CGSize(width: layout.size.width, height: CGFloat.infinity))
self.recentPeersNode.frame = CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight), size: recentPeersSize)
self.recentPeersNode.layout()
//let recentPeersSize = self.recentPeersNode.measure(CGSize(width: layout.size.width, height: CGFloat.infinity))
//self.recentPeersNode.frame = CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight), size: recentPeersSize)
//self.recentPeersNode.layout()
var duration: Double = 0.0
var curve: UInt = 0
@@ -323,11 +495,17 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode {
listViewCurve = .Default
}
self.recentListNode.frame = CGRect(origin: CGPoint(), size: layout.size)
self.recentListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: UIEdgeInsets(top: navigationBarHeight, left: 0.0, bottom: layout.insets(options: [.input]).bottom, right: 0.0), duration: duration, curve: listViewCurve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
self.listNode.frame = CGRect(origin: CGPoint(), size: layout.size)
self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: UIEdgeInsets(top: navigationBarHeight, left: 0.0, bottom: layout.insets(options: [.input]).bottom, right: 0.0), duration: duration, curve: listViewCurve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
if !hasValidLayout {
hasValidLayout = true
while !self.enqueuedRecentTransitions.isEmpty {
self.dequeueRecentTransition()
}
while !self.enqueuedTransitions.isEmpty {
self.dequeueTransition()
}