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

Fix chat list navigation bar transitions

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-03-23 16:55:31 +05:00
parent 6c6e287427
commit 472699a7af
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/ChatListUI/Sources/ChatListController.swift
View File

@ -345,12 +345,17 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
} else {
let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(strongSelf.presentationData.theme), style: .plain, target: strongSelf, action: #selector(strongSelf.composePressed))
rightBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.VoiceOver_Navigation_Compose
strongSelf.navigationItem.setRightBarButton(rightBarButtonItem, animated: true)
if strongSelf.navigationItem.rightBarButtonItem?.accessibilityLabel != rightBarButtonItem.accessibilityLabel {
strongSelf.navigationItem.setRightBarButton(rightBarButtonItem, animated: true)
}
}
if isReorderingTabs {
let leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.reorderingDonePressed))
strongSelf.navigationItem.setLeftBarButton(leftBarButtonItem, animated: true)
leftBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Done
if strongSelf.navigationItem.leftBarButtonItem?.accessibilityLabel != leftBarButtonItem.accessibilityLabel {
strongSelf.navigationItem.setLeftBarButton(leftBarButtonItem, animated: true)
}
} else {
let editItem: UIBarButtonItem
if stateAndFilterId.state.editing {
@ -360,7 +365,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
editItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(strongSelf.editPressed))
editItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Edit
}
strongSelf.navigationItem.setLeftBarButton(editItem, animated: true)
if strongSelf.navigationItem.leftBarButtonItem?.accessibilityLabel != editItem.accessibilityLabel {
strongSelf.navigationItem.setLeftBarButton(editItem, animated: true)
}
}
}
@ -904,6 +911,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
}
}
let previousToolbarValue = Atomic<Toolbar?>(value: nil)
self.stateDisposable.set(combineLatest(queue: .mainQueue(),
self.presentationDataValue.get(),
peerIdsAndOptions
@ -954,7 +962,12 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
toolbar = Toolbar(leftAction: leftAction, rightAction: ToolbarAction(title: presentationData.strings.Common_Delete, isEnabled: options.delete), middleAction: middleAction)
}
}
strongSelf.setToolbar(toolbar, transition: .animated(duration: 0.3, curve: .easeInOut))
var transition: ContainedViewLayoutTransition = .immediate
let previousToolbar = previousToolbarValue.swap(toolbar)
if (previousToolbar == nil) != (toolbar == nil) {
transition = .animated(duration: 0.3, curve: .easeInOut)
}
strongSelf.setToolbar(toolbar, transition: transition)
}))
self.tabContainerNode.tabSelected = { [weak self] id in