felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-24 02:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet

Browse Source 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
This commit is contained in:
Gil Eluard
2021-09-14 17:53:46 +02:00
parent 204cccb286 aa1f5d8aab
commit 158a968bcc
17 changed files with 195 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/SideMenu/SideMenuCoordinator.swift
+5 -24
View File
@@ -219,7 +219,8 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
}
private func showMembers(spaceId: String, session: MXSession) {
let spaceMembersCoordinator = SpaceMembersCoordinator(session: session, spaceId: spaceId)
let parameters = SpaceMembersCoordinatorParameters(userSessionsService: self.parameters.userSessionsService, session: session, spaceId: spaceId)
let spaceMembersCoordinator = SpaceMembersCoordinator(parameters: parameters)
spaceMembersCoordinator.delegate = self
let presentable = spaceMembersCoordinator.toPresentable()
presentable.presentationController?.delegate = self
@@ -252,18 +253,6 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
self.spaceDetailPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true)
}
func navigate(to item: SpaceExploreRoomListItemViewData, from sourceView: UIView?) {
if item.childInfo.roomType == .space {
self.exploreRoomCoordinator?.pushSpace(with: item)
} else if item.childInfo.roomType == .room {
self.exploreRoomCoordinator?.presentRoom(with: item, from: sourceView)
}
}
func navigate(to member: MXRoomMember, from sourceView: UIView?) {
self.membersCoordinator?.presentMemberDetail(with: member, from: sourceView)
}
// MARK: UserSessions management
private func registerUserSessionsServiceNotifications() {
@@ -362,14 +351,10 @@ extension SideMenuCoordinator: SpaceDetailPresenterDelegate {
// MARK: - ExploreRoomCoordinatorDelegate
extension SideMenuCoordinator: ExploreRoomCoordinatorDelegate {
func exploreRoomCoordinatorDidComplete(_ coordinator: ExploreRoomCoordinatorType, withSelectedIem item: SpaceExploreRoomListItemViewData?, from sourceView: UIView?) {
guard let item = item else {
self.exploreRoomCoordinator?.toPresentable().dismiss(animated: true) {
self.exploreRoomCoordinator = nil
}
return
func exploreRoomCoordinatorDidComplete(_ coordinator: ExploreRoomCoordinatorType) {
self.exploreRoomCoordinator?.toPresentable().dismiss(animated: true) {
self.exploreRoomCoordinator = nil
}
self.navigate(to: item, from: sourceView)
}
}
@@ -380,10 +365,6 @@ extension SideMenuCoordinator: SpaceMembersCoordinatorDelegate {
self.membersCoordinator = nil
}
}
func spaceMembersCoordinator(_ coordinator: SpaceMembersCoordinatorType, didSelect member: MXRoomMember, from sourceView: UIView?) {
self.navigate(to: member, from: sourceView)
}
}
// MARK: - UIAdaptivePresentationControllerDelegate