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

Folder improvements

Browse Source
This commit is contained in:
Ali
2020-03-09 00:13:25 +04:00
parent 88cc91a43c
commit 9dd7c42f27
7 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/Display/Source/Navigation/NavigationController.swift
View File

@@ -420,14 +420,14 @@ open class NavigationController: UINavigationController, ContainableController,
self.modalContainers.append(modalContainer) self.modalContainers.append(modalContainer)
if !modalContainer.isReady { if !modalContainer.isReady {
modalContainer.isReadyUpdated = { [weak self, weak modalContainer] in modalContainer.isReadyUpdated = { [weak self, weak modalContainer] in
guard let strongSelf = self, let modalContainer = modalContainer else { guard let strongSelf = self, let _ = modalContainer else {
return return
} }
strongSelf.updateContainersNonReentrant(transition: .animated(duration: 0.5, curve: .spring)) strongSelf.updateContainersNonReentrant(transition: .animated(duration: 0.5, curve: .spring))
} }
} }
modalContainer.updateDismissProgress = { [weak self, weak modalContainer] _, transition in modalContainer.updateDismissProgress = { [weak self, weak modalContainer] _, transition in
guard let strongSelf = self, let modalContainer = modalContainer else { guard let strongSelf = self, let _ = modalContainer else {
return return
} }
strongSelf.updateContainersNonReentrant(transition: transition) strongSelf.updateContainersNonReentrant(transition: transition)
@@ -454,7 +454,7 @@ open class NavigationController: UINavigationController, ContainableController,
container.view.endEditing(true) container.view.endEditing(true)
} }
transition = container.dismiss(transition: transition, completion: { [weak self, weak container] in transition = container.dismiss(transition: transition, completion: { [weak container] in
container?.removeFromSupernode() container?.removeFromSupernode()
}) })
} }

2
submodules/Display/Source/Navigation/NavigationModalContainer.swift
View File

@@ -437,7 +437,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes
return return
} }
for controller in strongSelf.container.controllers { for controller in strongSelf.container.controllers {
controller.viewWillDisappear(transition.isAnimated) controller.viewDidDisappear(transition.isAnimated)
} }
completion() completion()
}) })

5
submodules/Postbox/Sources/ChatListHolesView.swift
View File

@@ -3,6 +3,11 @@ import Foundation
public struct ChatListHolesEntry: Hashable { public struct ChatListHolesEntry: Hashable {
public let groupId: PeerGroupId public let groupId: PeerGroupId
public let hole: ChatListHole public let hole: ChatListHole
public init(groupId: PeerGroupId, hole: ChatListHole) {
self.groupId = groupId
self.hole = hole
}
} }
final class MutableChatListHolesView { final class MutableChatListHolesView {

2
submodules/Postbox/Sources/ChatListView.swift
View File

@@ -528,7 +528,7 @@ final class MutableChatListView {
} }
func firstHole() -> ChatListHole? { func firstHole() -> (PeerGroupId, ChatListHole)? {
return self.sampledState.hole return self.sampledState.hole
} }

79
submodules/Postbox/Sources/ChatListViewState.swift
View File

@@ -99,7 +99,7 @@ private final class ChatListViewSpaceState {
self.filterPredicate = filterPredicate self.filterPredicate = filterPredicate
self.summaryComponents = summaryComponents self.summaryComponents = summaryComponents
self.halfLimit = halfLimit self.halfLimit = halfLimit
self.orderedEntries = OrderedChatListViewEntries(lowerOrAtAnchor: [], higherThanAnchor: []) self.orderedEntries = OrderedChatListViewEntries(anchorIndex: anchorIndex.index, lowerOrAtAnchor: [], higherThanAnchor: [])
self.fillSpace(postbox: postbox) self.fillSpace(postbox: postbox)
} }
@@ -142,7 +142,7 @@ private final class ChatListViewSpaceState {
if let lastMessage = lowerOrAtAnchorMessages.min(by: { $0.entryIndex < $1.entryIndex }) { if let lastMessage = lowerOrAtAnchorMessages.min(by: { $0.entryIndex < $1.entryIndex }) {
nextLowerIndex = lastMessage.entryIndex.predecessor nextLowerIndex = lastMessage.entryIndex.predecessor
} else { } else {
nextLowerIndex = resolvedAnchorIndex nextLowerIndex = min(resolvedAnchorIndex, self.anchorIndex)
} }
var loadedLowerMessages = Array(loadedMessages.filter({ $0.entryIndex <= nextLowerIndex }).reversed()) var loadedLowerMessages = Array(loadedMessages.filter({ $0.entryIndex <= nextLowerIndex }).reversed())
let lowerLimit = self.halfLimit - lowerOrAtAnchorMessages.count let lowerLimit = self.halfLimit - lowerOrAtAnchorMessages.count
@@ -156,9 +156,9 @@ private final class ChatListViewSpaceState {
if let lastMessage = higherThanAnchorMessages.max(by: { $0.entryIndex < $1.entryIndex }) { if let lastMessage = higherThanAnchorMessages.max(by: { $0.entryIndex < $1.entryIndex }) {
nextHigherIndex = lastMessage.entryIndex.successor nextHigherIndex = lastMessage.entryIndex.successor
} else { } else {
nextHigherIndex = resolvedAnchorIndex nextHigherIndex = max(resolvedAnchorIndex, self.anchorIndex.successor)
} }
var loadedHigherMessages = loadedMessages.filter({ $0.entryIndex >= nextHigherIndex }) var loadedHigherMessages = loadedMessages.filter({ $0.entryIndex > nextHigherIndex })
let higherLimit = self.halfLimit - higherThanAnchorMessages.count let higherLimit = self.halfLimit - higherThanAnchorMessages.count
if loadedHigherMessages.count > higherLimit { if loadedHigherMessages.count > higherLimit {
loadedHigherMessages.removeLast(loadedHigherMessages.count - higherLimit) loadedHigherMessages.removeLast(loadedHigherMessages.count - higherLimit)
@@ -198,7 +198,7 @@ private final class ChatListViewSpaceState {
assert(Set(allIndices).count == allIndices.count) assert(Set(allIndices).count == allIndices.count)
assert(allIndices.sorted() == allIndices) assert(allIndices.sorted() == allIndices)
let entries = OrderedChatListViewEntries(lowerOrAtAnchor: lowerOrAtAnchorMessages, higherThanAnchor: higherThanAnchorMessages) let entries = OrderedChatListViewEntries(anchorIndex: self.anchorIndex.index, lowerOrAtAnchor: lowerOrAtAnchorMessages, higherThanAnchor: higherThanAnchorMessages)
self.orderedEntries = entries self.orderedEntries = entries
} }
} }
@@ -571,12 +571,18 @@ private extension MutableChatListEntry {
} }
private struct OrderedChatListViewEntries { private struct OrderedChatListViewEntries {
private let anchorIndex: ChatListIndex
private(set) var lowerOrAtAnchor: [MutableChatListEntry] private(set) var lowerOrAtAnchor: [MutableChatListEntry]
private(set) var higherThanAnchor: [MutableChatListEntry] private(set) var higherThanAnchor: [MutableChatListEntry]
private(set) var reverseIndices: [PeerId: [MutableChatListEntryIndex]] = [:] private(set) var reverseIndices: [PeerId: [MutableChatListEntryIndex]] = [:]
fileprivate init(lowerOrAtAnchor: [MutableChatListEntry], higherThanAnchor: [MutableChatListEntry]) { fileprivate init(anchorIndex: ChatListIndex, lowerOrAtAnchor: [MutableChatListEntry], higherThanAnchor: [MutableChatListEntry]) {
self.anchorIndex = anchorIndex
assert(!lowerOrAtAnchor.contains(where: { $0.index > anchorIndex }))
assert(!higherThanAnchor.contains(where: { $0.index <= anchorIndex }))
self.lowerOrAtAnchor = lowerOrAtAnchor self.lowerOrAtAnchor = lowerOrAtAnchor
self.higherThanAnchor = higherThanAnchor self.higherThanAnchor = higherThanAnchor
@@ -601,6 +607,8 @@ private struct OrderedChatListViewEntries {
} }
mutating func setLowerOrAtAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) { mutating func setLowerOrAtAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) {
assert(value.index <= self.anchorIndex)
let previousIndex = self.lowerOrAtAnchor[index].entryIndex let previousIndex = self.lowerOrAtAnchor[index].entryIndex
let updatedIndex = value.entryIndex let updatedIndex = value.entryIndex
let previousPeerId = self.lowerOrAtAnchor[index].messagePeerId let previousPeerId = self.lowerOrAtAnchor[index].messagePeerId
@@ -626,6 +634,8 @@ private struct OrderedChatListViewEntries {
} }
mutating func setHigherThanAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) { mutating func setHigherThanAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) {
assert(value.index > self.anchorIndex)
let previousIndex = self.higherThanAnchor[index].entryIndex let previousIndex = self.higherThanAnchor[index].entryIndex
let updatedIndex = value.entryIndex let updatedIndex = value.entryIndex
let previousPeerId = self.higherThanAnchor[index].messagePeerId let previousPeerId = self.higherThanAnchor[index].messagePeerId
@@ -651,6 +661,7 @@ private struct OrderedChatListViewEntries {
} }
mutating func insertLowerOrAtAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) { mutating func insertLowerOrAtAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) {
assert(value.index <= self.anchorIndex)
self.lowerOrAtAnchor.insert(value, at: index) self.lowerOrAtAnchor.insert(value, at: index)
if let peerId = value.messagePeerId { if let peerId = value.messagePeerId {
@@ -663,6 +674,7 @@ private struct OrderedChatListViewEntries {
} }
mutating func insertHigherThanAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) { mutating func insertHigherThanAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) {
assert(value.index > self.anchorIndex)
self.higherThanAnchor.insert(value, at: index) self.higherThanAnchor.insert(value, at: index)
if let peerId = value.messagePeerId { if let peerId = value.messagePeerId {
@@ -736,11 +748,13 @@ private struct OrderedChatListViewEntries {
mutating func update(index: MutableChatListEntryIndex, _ f: (MutableChatListEntry) -> MutableChatListEntry?) -> Bool { mutating func update(index: MutableChatListEntryIndex, _ f: (MutableChatListEntry) -> MutableChatListEntry?) -> Bool {
if let entryIndex = binarySearch(self.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: index) { if let entryIndex = binarySearch(self.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: index) {
if let updated = f(self.lowerOrAtAnchor[entryIndex]) { if let updated = f(self.lowerOrAtAnchor[entryIndex]) {
assert(updated.index == self.lowerOrAtAnchor[entryIndex].index)
self.setLowerOrAtAnchorAtArrayIndex(entryIndex, to: updated) self.setLowerOrAtAnchorAtArrayIndex(entryIndex, to: updated)
return true return true
} }
} else if let entryIndex = binarySearch(self.higherThanAnchor, extract: { $0.entryIndex }, searchItem: index) { } else if let entryIndex = binarySearch(self.higherThanAnchor, extract: { $0.entryIndex }, searchItem: index) {
if let updated = f(self.higherThanAnchor[entryIndex]) { if let updated = f(self.higherThanAnchor[entryIndex]) {
assert(updated.index == self.lowerOrAtAnchor[entryIndex].index)
self.setHigherThanAnchorAtArrayIndex(entryIndex, to: updated) self.setHigherThanAnchorAtArrayIndex(entryIndex, to: updated)
return true return true
} }
@@ -766,9 +780,9 @@ final class ChatListViewSample {
let lower: MutableChatListEntry? let lower: MutableChatListEntry?
let upper: MutableChatListEntry? let upper: MutableChatListEntry?
let anchorIndex: ChatListIndex let anchorIndex: ChatListIndex
let hole: ChatListHole? let hole: (PeerGroupId, ChatListHole)?
fileprivate init(entries: [MutableChatListEntry], lower: MutableChatListEntry?, upper: MutableChatListEntry?, anchorIndex: ChatListIndex, hole: ChatListHole?) { fileprivate init(entries: [MutableChatListEntry], lower: MutableChatListEntry?, upper: MutableChatListEntry?, anchorIndex: ChatListIndex, hole: (PeerGroupId, ChatListHole)?) {
self.entries = entries self.entries = entries
self.lower = lower self.lower = lower
self.upper = upper self.upper = upper
@@ -814,7 +828,9 @@ struct ChatListViewState {
} }
var backwardsResult: [(ChatListViewSpace, Int)] = [] var backwardsResult: [(ChatListViewSpace, Int)] = []
var backwardsResultIndices: [ChatListIndex] = []
var result: [(ChatListViewSpace, Int)] = [] var result: [(ChatListViewSpace, Int)] = []
var resultIndices: [ChatListIndex] = []
while true { while true {
var minSpace: ChatListViewSpace? var minSpace: ChatListViewSpace?
@@ -831,6 +847,7 @@ struct ChatListViewState {
} }
if let minSpace = minSpace { if let minSpace = minSpace {
backwardsResult.append((minSpace, previousAnchorIndices[minSpace]!)) backwardsResult.append((minSpace, previousAnchorIndices[minSpace]!))
backwardsResultIndices.append(self.stateBySpace[minSpace]!.orderedEntries.lowerOrAtAnchor[previousAnchorIndices[minSpace]!].index)
previousAnchorIndices[minSpace]! -= 1 previousAnchorIndices[minSpace]! -= 1
if backwardsResult.count == self.halfLimit { if backwardsResult.count == self.halfLimit {
break break
@@ -857,6 +874,7 @@ struct ChatListViewState {
} }
if let maxSpace = maxSpace { if let maxSpace = maxSpace {
result.append((maxSpace, nextAnchorIndices[maxSpace]!)) result.append((maxSpace, nextAnchorIndices[maxSpace]!))
resultIndices.append(self.stateBySpace[maxSpace]!.orderedEntries.higherThanAnchor[nextAnchorIndices[maxSpace]!].index)
nextAnchorIndices[maxSpace]! += 1 nextAnchorIndices[maxSpace]! += 1
if result.count == self.halfLimit { if result.count == self.halfLimit {
break break
@@ -867,17 +885,26 @@ struct ChatListViewState {
break break
} }
} }
backwardsResultIndices.reverse()
assert(backwardsResultIndices.sorted() == backwardsResultIndices)
assert(resultIndices.sorted() == resultIndices)
let combinedIndices = (backwardsResultIndices + resultIndices)
assert(combinedIndices.sorted() == combinedIndices)
return (backwardsResult.reversed(), result) return (backwardsResult.reversed(), result)
} }
func sample(postbox: Postbox) -> ChatListViewSample { func sample(postbox: Postbox) -> ChatListViewSample {
let combinedSpacesAndIndicesByDirection = self.sampleIndices() let combinedSpacesAndIndicesByDirection = self.sampleIndices()
var result: [MutableChatListEntry] = [] var result: [(ChatListViewSpace, MutableChatListEntry)] = []
var sampledHoleIndices: [Int] = [] var sampledHoleIndices: [Int] = []
var sampledAnchorBoundaryIndex: Int? var sampledAnchorBoundaryIndex: Int?
var sampledHoleChatListIndices = Set<ChatListIndex>()
let directions = [combinedSpacesAndIndicesByDirection.lowerOrAtAnchor, combinedSpacesAndIndicesByDirection.higherThanAnchor] let directions = [combinedSpacesAndIndicesByDirection.lowerOrAtAnchor, combinedSpacesAndIndicesByDirection.higherThanAnchor]
for directionIndex in 0 ..< directions.count { for directionIndex in 0 ..< directions.count {
outer: for i in 0 ..< directions[directionIndex].count { outer: for i in 0 ..< directions[directionIndex].count {
@@ -934,20 +961,26 @@ struct ChatListViewState {
} else { } else {
self.stateBySpace[space]!.orderedEntries.setHigherThanAnchorAtArrayIndex(listIndex, to: updatedEntry) self.stateBySpace[space]!.orderedEntries.setHigherThanAnchorAtArrayIndex(listIndex, to: updatedEntry)
} }
result.append(updatedEntry) result.append((space, updatedEntry))
case .MessageEntry: case .MessageEntry:
result.append(entry) result.append((space, entry))
case .HoleEntry: case .HoleEntry:
if !sampledHoleChatListIndices.contains(entry.index) {
sampledHoleChatListIndices.insert(entry.index)
sampledHoleIndices.append(result.count) sampledHoleIndices.append(result.count)
result.append(entry) result.append((space, entry))
}
} }
} }
} }
let allIndices = result.map { $0.entryIndex } let allIndices = result.map { $0.1.entryIndex }
let allIndicesSorted = allIndices.sorted()
for i in 0 ..< allIndicesSorted.count {
assert(allIndicesSorted[i] == allIndices[i])
}
assert(Set(allIndices).count == allIndices.count) assert(Set(allIndices).count == allIndices.count)
assert(allIndices.sorted() == allIndices)
var sampledHoleIndex: Int? var sampledHoleIndex: Int?
if !sampledHoleIndices.isEmpty { if !sampledHoleIndices.isEmpty {
@@ -968,10 +1001,11 @@ struct ChatListViewState {
} }
} }
var sampledHole: ChatListHole? var sampledHole: (ChatListViewSpace, ChatListHole)?
if let index = sampledHoleIndex { if let index = sampledHoleIndex {
if case let .HoleEntry(hole) = result[index] { let (space, entry) = result[index]
sampledHole = hole if case let .HoleEntry(hole) = entry {
sampledHole = (space, hole)
} else { } else {
assertionFailure() assertionFailure()
} }
@@ -979,16 +1013,21 @@ struct ChatListViewState {
var lower: MutableChatListEntry? var lower: MutableChatListEntry?
if combinedSpacesAndIndicesByDirection.lowerOrAtAnchor.count >= self.halfLimit { if combinedSpacesAndIndicesByDirection.lowerOrAtAnchor.count >= self.halfLimit {
lower = result[0] lower = result[0].1
result.removeFirst() result.removeFirst()
} }
var upper: MutableChatListEntry? var upper: MutableChatListEntry?
if combinedSpacesAndIndicesByDirection.higherThanAnchor.count >= self.halfLimit { if combinedSpacesAndIndicesByDirection.higherThanAnchor.count >= self.halfLimit {
upper = result.last upper = result.last?.1
result.removeLast() result.removeLast()
} }
return ChatListViewSample(entries: result, lower: lower, upper: upper, anchorIndex: self.anchorIndex.index, hole: sampledHole) return ChatListViewSample(entries: result.map { $0.1 }, lower: lower, upper: upper, anchorIndex: self.anchorIndex.index, hole: sampledHole.flatMap { space, hole in
switch space {
case let .group(groupId, _):
return (groupId, hole)
}
})
} }
} }

2
submodules/Postbox/Sources/ViewTracker.swift
View File

@@ -455,7 +455,7 @@ final class ViewTracker {
for (view, _) in self.chatListViews.copyItems() { for (view, _) in self.chatListViews.copyItems() {
if let hole = view.firstHole() { if let hole = view.firstHole() {
firstHoles.insert(ChatListHolesEntry(groupId: view.groupId, hole: hole)) firstHoles.insert(ChatListHolesEntry(groupId: hole.0, hole: hole.1))
} }
} }

14
submodules/TelegramCore/Sources/ManagedChatListHoles.swift
View File

@@ -79,11 +79,15 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee
var additionalLatestArchiveHole: ChatListHole? var additionalLatestArchiveHole: ChatListHole?
if let preferencesView = combinedView.views[filtersKey] as? PreferencesView, let filtersState = preferencesView.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState, !filtersState.filters.isEmpty { if let preferencesView = combinedView.views[filtersKey] as? PreferencesView, let filtersState = preferencesView.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState, !filtersState.filters.isEmpty {
if let topRootHole = combinedView.views[topRootHoleKey] as? AllChatListHolesView { if let topRootHole = combinedView.views[topRootHoleKey] as? AllChatListHolesView, let hole = topRootHole.latestHole {
additionalLatestHole = topRootHole.latestHole if !view.entries.contains(ChatListHolesEntry(groupId: .root, hole: hole)) {
additionalLatestHole = hole
}
}
if let topArchiveHole = combinedView.views[topArchiveHoleKey] as? AllChatListHolesView, let hole = topArchiveHole.latestHole {
if !view.entries.contains(ChatListHolesEntry(groupId: Namespaces.PeerGroup.archive, hole: hole)) {
additionalLatestArchiveHole = hole
} }
if let topArchiveHole = combinedView.views[topArchiveHoleKey] as? AllChatListHolesView {
additionalLatestArchiveHole = topArchiveHole.latestHole
} }
} }
@@ -104,7 +108,7 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee
} }
if let (hole, disposable) = addedAdditionalLatestArchiveHole { if let (hole, disposable) = addedAdditionalLatestArchiveHole {
disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: .root, hole: hole).start()) disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: Namespaces.PeerGroup.archive, hole: hole).start())
} }
}) })