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

Roll back the replaceTopController improvement, need to rewrite the call site

Browse Source
This commit is contained in:
Ali
2020-05-29 10:17:35 +04:00
parent 85d5e93dca
commit 4b342879ac
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1058,30 +1058,10 @@ open class NavigationController: UINavigationController, ContainableController,
} }
public func replaceTopController(_ controller: ViewController, animated: Bool, ready: Promise<Bool>? = nil) { public func replaceTopController(_ controller: ViewController, animated: Bool, ready: Promise<Bool>? = nil) {
ready?.set(.single(true))
var controllers = self.viewControllers var controllers = self.viewControllers
if let rootContainer = self.rootContainer {
var controllerToReplace: ViewController?
switch rootContainer {
case let .flat(container):
controllerToReplace = container.controllers.last
case let .split(container):
controllerToReplace = container.detailControllers.last
}
if let controllerToReplace = controllerToReplace, let index = controllers.firstIndex(where: { $0 === controllerToReplace }) {
controllers[index] = controller
ready?.set(controller.ready.get())
} else {
ready?.set(controller.ready.get())
controllers.removeLast() controllers.removeLast()
controllers.append(controller) controllers.append(controller)
}
} else {
ready?.set(controller.ready.get())
controllers.removeLast()
controllers.append(controller)
}
self.setViewControllers(controllers, animated: animated) self.setViewControllers(controllers, animated: animated)
} }