Merge pull request #35 from tchapgouv/5-implementer-l-annuaire-des-fo…

…rums-dans-tchap-x

Implémenter l'annuaire des forums dans Tchap X

ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift

@@ -289,8 +289,12 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
                 break
             case (.roomList, .showRoomDirectorySearchScreen, .roomDirectorySearchScreen):
                 presentRoomDirectorySearch()
-            case (.roomDirectorySearchScreen, .dismissedRoomDirectorySearchScreen, .roomList):
-                dismissRoomDirectorySearch()
+            // Tchap: handle dismissing mode for dismissedRoomDirectorySearchScreen
+//            case (.roomDirectorySearchScreen, .dismissedRoomDirectorySearchScreen, .roomList):
+//                dismissRoomDirectorySearch()
+            case (.roomDirectorySearchScreen, .dismissedRoomDirectorySearchScreen(let isPresentedInFullScreenMode), .roomList),
+                 (.roomList, .dismissedRoomDirectorySearchScreen(let isPresentedInFullScreenMode), .roomList):
+                dismissRoomDirectorySearch(isPresentedInFullScreenMode: isPresentedInFullScreenMode)
             case (_, .showUserProfileScreen(let userID), .userProfileScreen):
                 presentUserProfileScreen(userID: userID, animated: animated)
             case (.userProfileScreen, .dismissedUserProfileScreen, .roomList):
@@ -634,6 +638,8 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
             case .openRoom(let roomID):
                 self.navigationSplitCoordinator.setSheetCoordinator(nil)
                 self.stateMachine.processEvent(.selectRoom(roomID: roomID, via: [], entryPoint: .room))
+            case .joinForum: // Tchap: handle `joinForum` action
+                presentRoomDirectorySearch(inFullScreenMode: false)
             }
         }
         .store(in: &cancellables)
@@ -847,7 +853,12 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
 
     // MARK: Room Directory Search
 
-    private func presentRoomDirectorySearch() {
+    // Tchap: add a flag to present the view fullscreen or in sheet.
+    // Because in Tchap, it is called from am already fullScreenCover view.
+    // And the system can't stack 2 fullScreenCover views.
+    // Sp, present it in a sheet for Tchap "Start Chat" view.
+//    private func presentRoomDirectorySearch() {
+    private func presentRoomDirectorySearch(inFullScreenMode: Bool = true) {
         let coordinator = RoomDirectorySearchScreenCoordinator(parameters: .init(clientProxy: userSession.clientProxy,
                                                                                  mediaProvider: userSession.mediaProvider,
                                                                                  userIndicatorController: ServiceLocator.shared.userIndicatorController))
@@ -857,24 +868,45 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
 
             switch action {
             case .selectAlias(let alias):
-                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                // Tchap: handle presentation mode to dismiss the view in the correct way.
+//                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen(isPresentedInFullScreenMode: inFullScreenMode))
                 handleAppRoute(.roomAlias(alias), animated: true)
             case .selectRoomID(let roomID):
-                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                // Tchap: handle presentation mode to dismiss the view in the correct way.
+//                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen(isPresentedInFullScreenMode: inFullScreenMode))
                 handleAppRoute(.room(roomID: roomID, via: []), animated: true)
             case .dismiss:
-                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                // Tchap: handle presentation mode to dismiss the view in the correct way.
+//                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen)
+                stateMachine.processEvent(.dismissedRoomDirectorySearchScreen(isPresentedInFullScreenMode: inFullScreenMode))
             }
         }
         .store(in: &cancellables)
 
-        navigationSplitCoordinator.setFullScreenCoverCoordinator(coordinator)
+        // Tchap: handle presentation mode.
+//        navigationSplitCoordinator.setFullScreenCoverCoordinator(coordinator)
+        if inFullScreenMode {
+            navigationSplitCoordinator.setFullScreenCoverCoordinator(coordinator)
+        } else {
+            navigationSplitCoordinator.setSheetCoordinator(coordinator)
+        }
     }
 
-    private func dismissRoomDirectorySearch() {
-        navigationSplitCoordinator.setFullScreenCoverCoordinator(nil)
+    // Tchap: add a flag to dismiss the view in correct presentation mode: fullscreen or in sheet.
+//    private func dismissRoomDirectorySearch() {
+//        navigationSplitCoordinator.setFullScreenCoverCoordinator(nil)
+//    }
+//
+    private func dismissRoomDirectorySearch(isPresentedInFullScreenMode: Bool = true) {
+        if isPresentedInFullScreenMode {
+            navigationSplitCoordinator.setFullScreenCoverCoordinator(nil)
+        } else {
+            navigationSplitCoordinator.setSheetCoordinator(nil)
+        }
     }
-    
+
     // MARK: User Profile
 
     private func presentUserProfileScreen(userID: String, animated: Bool) {

ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinatorStateMachine.swift

@@ -112,8 +112,10 @@ class UserSessionFlowCoordinatorStateMachine {
         /// Request presentation of the room directory search screen.
         case showRoomDirectorySearchScreen
         /// The room directory search screen has been dismissed.
-        case dismissedRoomDirectorySearchScreen
-
+        // Tchap: add a flag to present the view fullscreen or in sheet.
+//        case dismissedRoomDirectorySearchScreen
+        case dismissedRoomDirectorySearchScreen(isPresentedInFullScreenMode: Bool)
+
         /// Request presentation of the user profile screen.
         case showUserProfileScreen(userID: String)
         /// The user profile screen has been dismissed.
@@ -189,9 +191,15 @@ class UserSessionFlowCoordinatorStateMachine {
             case (.roomList(let selectedRoomID), .showRoomDirectorySearchScreen):
                 return .roomDirectorySearchScreen(selectedRoomID: selectedRoomID)
 
+            // Tchap: handle presentation mode for dismissedRoomDirectorySearchScreen.
+//            case (.roomDirectorySearchScreen(let selectedRoomID), .dismissedRoomDirectorySearchScreen):
             case (.roomDirectorySearchScreen(let selectedRoomID), .dismissedRoomDirectorySearchScreen):
                 return .roomList(selectedRoomID: selectedRoomID)
 
+            // Tchap: handle presentation mode for dismissedRoomDirectorySearchScreen.
+            case (.roomList(let selectedRoomID), .dismissedRoomDirectorySearchScreen):
+                return .roomList(selectedRoomID: selectedRoomID)
+
             case (_, .showUserProfileScreen):
                 return .userProfileScreen
 

ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectorySearchScreen.swift

@@ -47,7 +47,7 @@ struct RoomDirectorySearchScreen: View {
             .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
             .isSearching($context.isSearching)
             .searchable(text: $context.searchString, placement: .navigationBarDrawer(displayMode: .always))
-            .navigationTitle(L10n.screenRoomDirectorySearchTitle)
+            .navigationTitle(TchapL10n.screenRoomDirectorySearchTitle) // Tchap: use Tchap title
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) {

ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift

@@ -20,6 +20,7 @@ struct StartChatScreenCoordinatorParameters {
 enum StartChatScreenCoordinatorAction {
     case close
     case openRoom(withIdentifier: String)
+    case joinForum // Tchap: add `join Forum` action to `StartChat` screen
 }
 
 final class StartChatScreenCoordinator: CoordinatorProtocol {
@@ -62,6 +63,8 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
                 presentInviteUsersScreen()
             case .openRoom(let identifier):
                 actionsSubject.send(.openRoom(withIdentifier: identifier))
+            case .joinForum: // Tchap: add `join Forum` action to `StartChat` screen
+                actionsSubject.send(.joinForum)
             }
         }
         .store(in: &cancellables)
@@ -104,7 +107,7 @@ final class StartChatScreenCoordinator: CoordinatorProtocol {
             self?.selectedUsers.send([])
         }
     }
-    
+
     private func openCreateRoomScreen() {
         let createParameters = CreateRoomCoordinatorParameters(userSession: parameters.userSession,
                                                                userIndicatorController: parameters.userIndicatorController,

ElementX/Sources/Screens/StartChatScreen/StartChatScreenModels.swift

@@ -16,6 +16,7 @@ enum StartChatScreenViewModelAction {
     case close
     case createRoom
     case openRoom(withIdentifier: String)
+    case joinForum // Tchap: add `join Forum` action to `StartChat` screen
 }
 
 struct StartChatScreenViewState: BindableState {
@@ -43,4 +44,5 @@ enum StartChatScreenViewAction {
     case close
     case createRoom
     case selectUser(UserProfileProxy)
+    case joinForum // Tchap: add `join Forum` action to `StartChat` screen
 }

ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift

@@ -68,6 +68,8 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
                     self.displayError()
                 }
             }
+        case .joinForum: // Tchap: handle `joinForum` action
+            actionsSubject.send(.joinForum)
         }
     }
 

ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift

@@ -39,6 +39,7 @@ struct StartChatScreen: View {
     @ViewBuilder
     private var mainContent: some View {
         createRoomSection
+        joinForumSection // Tchap: Join a forum
         inviteFriendsSection
         usersSection
     }
@@ -74,6 +75,16 @@ struct StartChatScreen: View {
         }
     }
 
+    // Tchap: Join a forum (add section without chevron)
+    private var joinForumSection: some View {
+        Section {
+            ListRow(label: .default(title: TchapL10n.startChatActionJoinForum,
+                                    icon: \.listBulleted),
+                    kind: .button { context.send(viewAction: .joinForum) })
+                .accessibilityIdentifier(TchapA11yIdentifiers.startChatScreen.joinForum)
+        }
+    }
+
     @ViewBuilder
     private var usersSection: some View {
         if !context.viewState.usersSection.users.isEmpty {