feat: add searching for apps - WPB-20362 #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

caldrian wants to merge 286 commits into chore/replace-old-search-requests-WPB-20362 from feat/search-for-apps-WPB-20362

+82 −27

...mages/ConversationCreationControllerSnapshotTests/testForEditingTextField.1.png

This file was deleted.

.../ConversationCreationControllerSnapshotTests/testTeamGroupOptions.DarkTheme.png

This file was deleted.

...ConversationCreationControllerSnapshotTests/testTeamGroupOptions.LightTheme.png

This file was deleted.

...ationCreationControllerSnapshotTests/testTeamGroupOptions_withoutServices.1.png

This file was deleted.

wire-ios/Wire-iOS/Sources/UserInterface/AddContacts/AddParticipantsViewController.swift

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -222,7 +222,7 @@ final class AddParticipantsViewController: UIViewController {
  
            self.searchHeaderViewController = SearchHeaderViewController(userSelection: userSelection)

            self.searchGroupSelector = SearchGroupSelector()

            self.searchGroupSelector = SearchGroupSelector(for: viewModel.filterConversation?.messageProtocol ?? userSession.defaultProtocol) // TODO: what is filterConversation?

            self.searchResultsViewController = SearchResultsViewController(

                userSelection: userSelection,

    @@ -469,9 +469,13 @@ final class AddParticipantsViewController: UIViewController {
  
            emptyResultView.updateStatus(searchingForServices: searchingForServices, hasFilter: hasFilter)

            switch (searchResultsViewController.searchGroup, hasFilter) {

            case (.services, _):

            case (.apps, _):

                searchResultsViewController.mode = .search // TODO: searching apps is more similar to searching people

                fatalError() // TODO: searchForApps?

                // searchResultsViewController.searchForServices(withQuery: searchHeaderViewController.tokenField.filterText)

            case (.bots, _):

                searchResultsViewController.mode = .search

                searchResultsViewController.searchForServices(withQuery: searchHeaderViewController.tokenField.filterText)

                searchResultsViewController.searchForServices(withQuery: searchHeaderViewController.tokenField.filterText) // TODO: rename searchForBots?

            case (.people, false):

                searchResultsViewController.mode = .list

                searchResultsViewController.searchContactList()

wire-ios/Wire-iOS/Sources/UserInterface/Conversation Options/TitleBodyCell.swift

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     //
     // Wire
-    // Copyright (C) 2026 Wire Swiss GmbH
+    // Copyright (C) 2025 Wire Swiss GmbH
     //
     // This program is free software: you can redistribute it and/or modify
     // it under the terms of the GNU General Public License as published by
@@ Expand Down @@

...es/UserInterface/StartUI/Common/SectionControllers/Apps/SearchAppsSectionController.swift

-Original file line number
+Diff line change
@@ -0,0 +1,19 @@
+    //
+    // Wire
+    // Copyright (C) 2025 Wire Swiss GmbH
+    //
+    // This program is free software: you can redistribute it and/or modify
+    // it under the terms of the GNU General Public License as published by
+    // the Free Software Foundation, either version 3 of the License, or
+    // (at your option) any later version.
+    //
+    // This program is distributed in the hope that it will be useful,
+    // but WITHOUT ANY WARRANTY; without even the implied warranty of
+    // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    // GNU General Public License for more details.
+    //
+    // You should have received a copy of the GNU General Public License
+    // along with this program. If not, see http://www.gnu.org/licenses/.
+    //
+    final class SearchAppsSectionController: SearchSectionController {}

...rces/UserInterface/StartUI/Common/SectionControllers/Apps/SearchAppsSectionDelegate.swift

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    //
+    // Wire
+    // Copyright (C) 2025 Wire Swiss GmbH
+    //
+    // This program is free software: you can redistribute it and/or modify
+    // it under the terms of the GNU General Public License as published by
+    // the Free Software Foundation, either version 3 of the License, or
+    // (at your option) any later version.
+    //
+    // This program is distributed in the hope that it will be useful,
+    // but WITHOUT ANY WARRANTY; without even the implied warranty of
+    // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    // GNU General Public License for more details.
+    //
+    // You should have received a copy of the GNU General Public License
+    // along with this program. If not, see http://www.gnu.org/licenses/.
+    //
+    // TODO: needed?
+    //protocol SearchAppsSectionDelegate: SearchSectionControllerDelegate {
+    //    func addAppsSectionDidRequestOpenServicesAdmin()
+    //}

wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchGroupSelector.swift

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
     //
     import UIKit
+    import WireDataModel
     import WireDesign
     final class SearchGroupSelector: UIView {
@@ Expand All / @@ -36,8 +37,8 @@ final class SearchGroupSelector: UIView { @@
         // MARK: - Init
-        init() {
-            self.groups = SearchGroup.all
+        init(for messageProtocol: MessageProtocol) {
+            self.groups = SearchGroup.all(for: messageProtocol)
             let groupItems: [String] = groups.map(\.name)
@@ Expand Down @@

wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -22,7 +22,11 @@ import WireSyncEngine
  
    enum SearchGroup: Int {

        case people

        case services // TODO: [WPB-20362] consider having apps and bots instead

        case apps

        case bots

        @available(*, deprecated, renamed: "bots")

        static var services: Self { .bots }

    }

    extension SearchGroup {

    @@ -31,7 +35,7 @@ extension SearchGroup {
  
            switch self {

            case .people:

                return true

            case .services:

            case .apps, .bots: // TODO: searching apps is more similar to searching people

                guard let user = SelfUser.provider?.providedSelfUser else {

                    assertionFailure("expected available 'user'!")

                    return false

    @@ -42,18 +46,27 @@ extension SearchGroup {
  
        #if ADD_SERVICE_DISABLED

            // remove service from the tab

            static let all: [SearchGroup] = [.people]

            static func all(for messageProtocol: MessageProtocol) -> [SearchGroup] { [.people] }

        #else

            static var all: [SearchGroup] {

                [.people, .services].filter(\.accessible)

            static func all(for messageProtocol: MessageProtocol) -> [SearchGroup] {

                switch messageProtocol {

                case .mls:

                    [.people, .apps]

                        .filter(\.accessible)

                case .proteus:

                    [.people, .bots]

                        .filter(\.accessible)

                case .mixed:

                    [.people] // TODO: correct?

                }

            }

        #endif

        var name: String {

            switch self {

            case .people:

                L10n.Localizable.Peoplepicker.Header.people

            case .services:

            case .apps, .bots:

                L10n.Localizable.Peoplepicker.Header.apps

            }

        }

    @@ -165,6 +178,7 @@ final class SearchResultsViewController: UIViewController {
  
            return TopPeopleSectionController(topConversationsDirectory: directory)

        }()

        let appsSection: SearchAppsSectionController

        let servicesSection: SearchServicesSectionController

        // TODO: [WPB-20362] add apps section?

        let inviteTeamMemberSection: InviteTeamMemberSection

    @@ -212,6 +226,7 @@ final class SearchResultsViewController: UIViewController {
  
            teamMemberAndContactsSection.allowsSelection = isAddingParticipants

            teamMemberAndContactsSection.selection = userSelection

            teamMemberAndContactsSection.title = L10n.Localizable.Peoplepicker.Header.contacts

            self.appsSection = SearchAppsSectionController()

            self.servicesSection = SearchServicesSectionController(

                canSelfUserManageTeam: userSession.selfUser.canManageTeam

            )

    @@ -324,7 +339,9 @@ final class SearchResultsViewController: UIViewController {
  
            let team = userSession.selfUser.membership?.team

            switch (searchGroup, isAddingParticipants) {

            case (.services, _):

            case (.apps, _):

                sections = [appsSection]

            case (.bots, _):

                sections = [servicesSection]

            case (.people, true):

                switch (mode, team != nil) {

wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/StartUIViewController.swift

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -41,7 +41,7 @@ final class StartUIViewController: UIViewController {
  
        let searchController = UISearchController(searchResultsController: nil)

        let groupSelector = SearchGroupSelector()

        let groupSelector: SearchGroupSelector

        lazy var conversationTypePicker: UIViewController = {

            let canCreateChannels = userSession.channelsFeature.canCreateChannels(

    @@ -119,7 +119,10 @@ final class StartUIViewController: UIViewController {
  
        /// - the team's default protocol is Proteus the team has been using bots

        /// - the team's default protocol is MLS and the `apps` feature flag is enabled.

        var showsGroupSelector: Bool {

            guard SearchGroup.all.count > 1, userSession.selfUser.canSeeServices else { return false }

            guard

                SearchGroup.all(for: userSession.defaultProtocol).count > 1,

                userSession.selfUser.canSeeServices

            else { return false }

            switch userSession.defaultProtocol {

            case .mls:

    @@ -167,6 +170,7 @@ final class StartUIViewController: UIViewController {
  
                selfProfileUIBuilder: selfProfileUIBuilder,

                conversationCreationRepository: conversationCreationRepository

            )

            groupSelector = SearchGroupSelector(for: userSession.defaultProtocol)

            super.init(nibName: nil, bundle: nil)

            configGroupSelector()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add searching for apps - WPB-20362 #4243

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

feat: add searching for apps - WPB-20362 #4243

Are you sure you want to change the base?

feat: add searching for apps - WPB-20362 #4243

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!