Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: laktyushin

.vscode/launch.json

@@ -12,6 +12,18 @@
             "internalConsoleOptions": "openOnSessionStart",
             "timeout": 1000
         },
+        {
+            "name": "Restart Debug Telegram",
+            "type": "lldb-dap",
+            "request": "attach",
+            "preLaunchTask": "Restart Telegram Debug",
+            "debuggerRoot": "${workspaceFolder}",
+            "attachCommands": [
+                "process connect connect://localhost:6667"
+            ],
+            "internalConsoleOptions": "openOnSessionStart",
+            "timeout": 1000
+        },
     ],
     "options": {
         "console": "integratedTerminal",

.vscode/tasks.json

@@ -4,7 +4,7 @@
     {
       "label": "Build Telegram",
       "type": "shell",
-      "command": "${workspaceFolder}/build-input/bazel-8.3.1-darwin-arm64",
+      "command": "${workspaceFolder}/build-input/bazel-8.4.2-darwin-arm64",
       "args": [
         "build",
         "Telegram/Telegram",
@@ -74,6 +74,28 @@
         "reveal": "always",
         "panel": "dedicated"
       }
+    },
+    {
+      "label": "Stop Telegram Debug Session",
+      "type": "shell",
+      "command": "pkill -f 'launch_and_debug.sh' || true; lsof -ti:6667 | xargs kill -9 2>/dev/null || true",
+      "problemMatcher": [],
+      "presentation": {
+        "reveal": "silent",
+        "close": true
+      }
+    },
+    {
+      "label": "Restart Telegram Debug",
+      "dependsOrder": "sequence",
+      "dependsOn": [
+        "Stop Telegram Debug Session",
+        "_launch_telegram"
+      ],
+      "problemMatcher": [],
+      "presentation": {
+        "reveal": "always"
+      }
     }
   ]
 }

BUILD.bazel

@@ -2,7 +2,7 @@ load("@sourcekit_bazel_bsp//rules:setup_sourcekit_bsp.bzl", "setup_sourcekit_bsp
 
 setup_sourcekit_bsp(
     name = "setup_sourcekit_bsp_telegram_project",
-    bazel_wrapper = "./build-input/bazel-8.3.1-darwin-arm64",
+    bazel_wrapper = "./build-input/bazel-8.4.2-darwin-arm64",
     files_to_watch = [
         "**/*.swift",
     ],

MODULE.bazel.lock

@@ -8,8 +8,6 @@ load("@build_bazel_rules_apple//apple:ios.bzl",
     "ios_application",
     "ios_extension",
     "ios_framework",
-    "ios_unit_test",
-    "ios_ui_test",
 )
 
 load("@build_bazel_rules_apple//apple:resources.bzl",
@@ -22,7 +20,6 @@ load("@build_bazel_rules_swift//swift:swift.bzl",
 
 load(
     "@rules_xcodeproj//xcodeproj:defs.bzl",
-    "top_level_target",
     "top_level_targets",
     "xcodeproj",
     "xcode_provisioning_profile",

Telegram/BUILD

@@ -7,7 +7,7 @@ set -e
 # Ideally we should upstream these changes back to rules_apple since they should be useful for everyone.
 
 echo "Building..."
-./build-input/bazel-8.3.1-darwin-arm64 build Telegram/Telegram --announce_rc --features=swift.use_global_module_cache --verbose_failures --remote_cache_async --features=swift.skip_function_bodies_for_derived_files --jobs=16 --define=buildNumber=10000 --define=telegramVersion=12.2.1 --disk_cache=/Users/ali/telegram-bazel-cache -c dbg --ios_multi_cpus=sim_arm64 --watchos_cpus=arm64_32 --features=swift.enable_batch_mode
+./build-input/bazel-8.4.2-darwin-arm64 build Telegram/Telegram --announce_rc --features=swift.use_global_module_cache --verbose_failures --remote_cache_async --jobs=16 --define=buildNumber=10000 --define=telegramVersion=12.2.1 --disk_cache=/Users/ali/telegram-bazel-cache -c dbg --ios_multi_cpus=sim_arm64 --watchos_cpus=arm64_32 --features=swift.enable_batch_mode
 chmod -R 777 ./bazel-bin/Telegram
 
 tmp_file=$(pwd)/bazel-bin/Telegram/pid.txt

scripts/launch_and_debug.sh

@@ -155,6 +155,8 @@ public final class CallListController: TelegramBaseController {
         if case .navigation = self.mode {
             self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
         }
+
+        self.updateTabBarSearchState(ViewController.TabBarSearchState(isActive: false), transition: .immediate)
     }
 
     required public init(coder aDecoder: NSCoder) {

submodules/CallListUI/Sources/CallListController.swift

@@ -118,6 +118,7 @@ swift_library(
         "//submodules/TelegramUI/Components/ButtonComponent",
         "//submodules/TelegramUI/Components/AnimatedTextComponent",
         "//submodules/TelegramUI/Components/EdgeEffect",
+        "//submodules/TelegramUI/Components/ChatList/ChatListFilterTabContainerNode",
     ],
     visibility = [
         "//visibility:public",

submodules/ChatListUI/BUILD

@@ -55,6 +55,8 @@ import TextFormat
 import AvatarUploadToastScreen
 import AdsInfoScreen
 import AdsReportScreen
+import SearchBarNode
+import ChatListFilterTabContainerNode
 
 private final class ContextControllerContentSourceImpl: ContextControllerContentSource {
     let controller: ViewController
@@ -768,6 +770,8 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         })
 
         self.updateNavigationMetadata()
+
+        self.updateTabBarSearchState(ViewController.TabBarSearchState(isActive: false), transition: .immediate)
     }
 
     required public init(coder aDecoder: NSCoder) {
@@ -2838,14 +2842,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     func updateHeaderContent() -> (primaryContent: ChatListHeaderComponent.Content?, secondaryContent: ChatListHeaderComponent.Content?) {
         var primaryContent: ChatListHeaderComponent.Content?
         if let primaryContext = self.primaryContext {
-            var backTitle: String?
-            if let previousItem = self.previousItem {
-                switch previousItem {
-                case let .item(item):
-                    backTitle = item.title ?? self.presentationData.strings.Common_Back
-                case .close:
-                    backTitle = self.presentationData.strings.Common_Close
-                }
+            var displayBackButton: Bool = false
+            if self.previousItem != nil {
+                displayBackButton = true
             }
             var navigationBackTitle: String?
             if case .chatList(.archive) = self.location {
@@ -2858,8 +2857,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 chatListTitle: primaryContext.chatListTitle,
                 leftButton: primaryContext.leftButton,
                 rightButtons: primaryContext.rightButtons,
-                backTitle: backTitle,
-                backPressed: backTitle != nil ? { [weak self] in
+                backPressed: displayBackButton ? { [weak self] in
                     guard let self else {
                         return
                     }
@@ -2876,7 +2874,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 chatListTitle: secondaryContext.chatListTitle,
                 leftButton: secondaryContext.leftButton,
                 rightButtons: secondaryContext.rightButtons,
-                backTitle: nil,
                 backPressed: { [weak self] in
                     guard let self else {
                         return
@@ -4638,9 +4635,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             searchContentNode = navigationBarView.searchContentNode
         }
 
-        if let searchContentNode {
-            self.activateSearch(filter: filter, query: query, skipScrolling: false, searchContentNode: searchContentNode)
-        }
+        self.activateSearch(filter: filter, query: query, skipScrolling: false, searchContentNode: searchContentNode)
     }
 
     public func activateSearch(query: String? = nil) {
@@ -4654,45 +4649,37 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     }
 
     private var previousSearchToggleTimestamp: Double?
-    func activateSearch(filter: ChatListSearchFilter = .chats, query: String? = nil, skipScrolling: Bool = false, searchContentNode: NavigationBarSearchContentNode) {
-        let currentTimestamp = CACurrentMediaTime()
-        if let previousSearchActivationTimestamp = self.previousSearchToggleTimestamp, currentTimestamp < previousSearchActivationTimestamp + 0.6 {
-            return
-        }
-        self.previousSearchToggleTimestamp = currentTimestamp
-        
-        if let storyTooltip = self.storyTooltip {
-            storyTooltip.dismiss()
-        }
-        
-        var filter = filter
-        if case .forum = self.chatListDisplayNode.effectiveContainerNode.location {
-            filter = .topics
-        }
-        
-        if self.chatListDisplayNode.searchDisplayController == nil {
-            /*if !skipScrolling, let searchContentNode = self.searchContentNode, searchContentNode.expansionProgress != 1.0 {
-                self.scrollToTop?()
-                DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.2, execute: { [weak self] in
-                    self?.activateSearch(filter: filter, query: query, skipScrolling: true)
-                })
+    func activateSearch(filter: ChatListSearchFilter = .chats, query: String? = nil, skipScrolling: Bool = false, searchContentNode: NavigationBarSearchContentNode?) {
+        Task { @MainActor [weak self] in
+            guard let self else {
+                return
+            }
+
+            let currentTimestamp = CACurrentMediaTime()
+            if let previousSearchActivationTimestamp = self.previousSearchToggleTimestamp, currentTimestamp < previousSearchActivationTimestamp + 0.6 {
                 return
-            }*/
-            //TODO:scroll to top?
+            }
+            self.previousSearchToggleTimestamp = currentTimestamp
 
-            let _ = (combineLatest(self.chatListDisplayNode.mainContainerNode.currentItemNode.contentsReady |> take(1), self.context.account.postbox.tailChatListView(groupId: .root, count: 16, summaryComponents: ChatListEntrySummaryComponents(components: [:])) |> take(1))
-            |> deliverOnMainQueue).startStandalone(next: { [weak self] _, chatListView in
-                Task { @MainActor in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    
+            if let storyTooltip = self.storyTooltip {
+                storyTooltip.dismiss()
+            }
+            
+            var filter = filter
+            if case .forum = self.chatListDisplayNode.effectiveContainerNode.location {
+                filter = .topics
+            }
+            
+            if self.chatListDisplayNode.searchDisplayController == nil {            
+                let (_, _) = await combineLatest(self.chatListDisplayNode.mainContainerNode.currentItemNode.contentsReady |> take(1), self.context.account.postbox.tailChatListView(groupId: .root, count: 16, summaryComponents: ChatListEntrySummaryComponents(components: [:])) |> take(1)).get()
+
+                do {
                     /*if let scrollToTop = strongSelf.scrollToTop {
-                     scrollToTop()
-                     }*/
+                    scrollToTop()
+                    }*/
 
                     let tabsIsEmpty: Bool
-                    if let (resolvedItems, displayTabsAtBottom, _) = strongSelf.tabContainerData {
+                    if let (resolvedItems, displayTabsAtBottom, _) = self.tabContainerData {
                         tabsIsEmpty = resolvedItems.count <= 1 || displayTabsAtBottom
                     } else {
                         tabsIsEmpty = true
@@ -4702,40 +4689,43 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
 
                     let displaySearchFilters = true
 
-                    if let filterContainerNodeAndActivate = await strongSelf.chatListDisplayNode.activateSearch(placeholderNode: searchContentNode.placeholderNode, displaySearchFilters: displaySearchFilters, hasDownloads: strongSelf.hasDownloads, initialFilter: filter, navigationController: strongSelf.navigationController as? NavigationController) {
+                    if let filterContainerNodeAndActivate = await self.chatListDisplayNode.activateSearch(placeholderNode: searchContentNode?.placeholderNode, displaySearchFilters: displaySearchFilters, hasDownloads: self.hasDownloads, initialFilter: filter, navigationController: self.navigationController as? NavigationController, searchBarIsExternal: true) {
                         let (filterContainerNode, activate) = filterContainerNodeAndActivate
                         if displaySearchFilters {
                             let searchTabsNode = SparseNode()
-                            strongSelf.searchTabsNode = searchTabsNode
+                            self.searchTabsNode = searchTabsNode
                             searchTabsNode.addSubnode(filterContainerNode)
                         }
 
                         activate(filter != .downloads)
 
-                        if let searchContentNode = strongSelf.chatListDisplayNode.searchDisplayController?.contentNode as? ChatListSearchContainerNode {
+                        if let searchContentNode = self.chatListDisplayNode.searchDisplayController?.contentNode as? ChatListSearchContainerNode {
                             searchContentNode.search(filter: filter, query: query)
                         }
                     }
 
                     let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
-                    strongSelf.setDisplayNavigationBar(false, transition: transition)
-                    
-                    (strongSelf.parent as? TabBarController)?.updateIsTabBarHidden(true, transition: .animated(duration: 0.4, curve: .spring))
-                }
-            })
-            
-            self.isSearchActive = true
-            if let navigationController = self.navigationController as? NavigationController {
-                for controller in navigationController.globalOverlayControllers {
-                    if let controller = controller as? VoiceChatOverlayController {
-                        controller.updateVisibility()
-                        break
+                    self.setDisplayNavigationBar(false, transition: transition)
+                    self.updateTabBarSearchState(ViewController.TabBarSearchState(isActive: true), transition: transition)
+                    if let searchBarNode = self.currentTabBarSearchNode?() as? SearchBarNode {
+                        self.chatListDisplayNode.searchDisplayController?.setSearchBar(searchBarNode)
+                        searchBarNode.activate()
+                    }
+
+                    self.isSearchActive = true
+                    if let navigationController = self.navigationController as? NavigationController {
+                        for controller in navigationController.globalOverlayControllers {
+                            if let controller = controller as? VoiceChatOverlayController {
+                                controller.updateVisibility()
+                                break
+                            }
+                        }
                     }
                 }
-            }
-        } else if self.isSearchActive {
-            if let searchContentNode = self.chatListDisplayNode.searchDisplayController?.contentNode as? ChatListSearchContainerNode {
-                searchContentNode.search(filter: filter, query: query)
+            } else if self.isSearchActive {
+                if let searchContentNode = self.chatListDisplayNode.searchDisplayController?.contentNode as? ChatListSearchContainerNode {
+                    searchContentNode.search(filter: filter, query: query)
+                }
             }
         }
     }
@@ -4766,6 +4756,8 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             }
             completion = self.chatListDisplayNode.deactivateSearch(placeholderNode: searchContentNode.placeholderNode, animated: animated)
             searchContentNode.placeholderNode.frame = previousFrame
+        } else {
+            completion = self.chatListDisplayNode.deactivateSearch(placeholderNode: nil, animated: animated)
         }
 
         self.chatListDisplayNode.tempAllowAvatarExpansion = true
@@ -4780,7 +4772,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
 
         completion?()
 
-        (self.parent as? TabBarController)?.updateIsTabBarHidden(false, transition: .animated(duration: 0.4, curve: .spring))
+        self.updateTabBarSearchState(ViewController.TabBarSearchState(isActive: false), transition: transition)
 
         self.isSearchActive = false
         if let navigationController = self.navigationController as? NavigationController {
@@ -6236,6 +6228,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             strongSelf.context.sharedContext.mainWindow?.presentInGlobalOverlay(controller)
         })
     }
+
+    override public func tabBarActivateSearch() {
+        self.activateSearch()
+    }
+
+    override public func tabBarDeactivateSearch() {
+        self.deactivateSearch(animated: true)
+    }
 
     private var playedSignUpCompletedAnimation = false
     public func playSignUpCompletedAnimation() {