From e263622b6410970325bc22f0e8456846d412353f Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 21 May 2023 20:29:25 +0400 Subject: [PATCH] Always show camera button --- .../Sources/TelegramRootController.swift | 82 +++++++++---------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/submodules/TelegramUI/Sources/TelegramRootController.swift b/submodules/TelegramUI/Sources/TelegramRootController.swift index 4d2909c79f..46737ce2ab 100644 --- a/submodules/TelegramUI/Sources/TelegramRootController.swift +++ b/submodules/TelegramUI/Sources/TelegramRootController.swift @@ -190,50 +190,48 @@ public final class TelegramRootController: NavigationController, TelegramRootCon accountSettingsController.parentController = self controllers.append(accountSettingsController) - if self.context.sharedContext.immediateExperimentalUISettings.storiesExperiment { - tabBarController.cameraItemAndAction = ( - UITabBarItem(title: "Camera", image: UIImage(bundleImageName: "Chat List/Tabs/IconCamera"), tag: 2), - { [weak self] in - guard let self else { - return - } - var transitionIn: StoryCameraTransitionIn? - if let cameraItemView = self.rootTabController?.viewForCameraItem() { - transitionIn = StoryCameraTransitionIn( - sourceView: cameraItemView, - sourceRect: cameraItemView.bounds, - sourceCornerRadius: cameraItemView.bounds.height / 2.0 - ) - } - self.openStoryCamera( - transitionIn: transitionIn, - transitionOut: { [weak self] finished in - guard let self else { - return nil - } - if finished { - if let chatListController = self.chatListController as? ChatListControllerImpl, let transitionView = chatListController.transitionViewForOwnStoryItem() { - return StoryCameraTransitionOut( - destinationView: transitionView, - destinationRect: transitionView.bounds, - destinationCornerRadius: transitionView.bounds.height / 2.0 - ) - } - } else { - if let cameraItemView = self.rootTabController?.viewForCameraItem() { - return StoryCameraTransitionOut( - destinationView: cameraItemView, - destinationRect: cameraItemView.bounds, - destinationCornerRadius: cameraItemView.bounds.height / 2.0 - ) - } - } - return nil - } + tabBarController.cameraItemAndAction = ( + UITabBarItem(title: "Camera", image: UIImage(bundleImageName: "Chat List/Tabs/IconCamera"), tag: 2), + { [weak self] in + guard let self else { + return + } + var transitionIn: StoryCameraTransitionIn? + if let cameraItemView = self.rootTabController?.viewForCameraItem() { + transitionIn = StoryCameraTransitionIn( + sourceView: cameraItemView, + sourceRect: cameraItemView.bounds, + sourceCornerRadius: cameraItemView.bounds.height / 2.0 ) } - ) - } + self.openStoryCamera( + transitionIn: transitionIn, + transitionOut: { [weak self] finished in + guard let self else { + return nil + } + if finished { + if let chatListController = self.chatListController as? ChatListControllerImpl, let transitionView = chatListController.transitionViewForOwnStoryItem() { + return StoryCameraTransitionOut( + destinationView: transitionView, + destinationRect: transitionView.bounds, + destinationCornerRadius: transitionView.bounds.height / 2.0 + ) + } + } else { + if let cameraItemView = self.rootTabController?.viewForCameraItem() { + return StoryCameraTransitionOut( + destinationView: cameraItemView, + destinationRect: cameraItemView.bounds, + destinationCornerRadius: cameraItemView.bounds.height / 2.0 + ) + } + } + return nil + } + ) + } + ) tabBarController.setControllers(controllers, selectedIndex: restoreSettignsController != nil ? (controllers.count - 1) : (controllers.count - 2))