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

Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space

Browse Source 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
This commit is contained in:
Gil Eluard
2021-09-13 10:23:21 +02:00
parent 7dd4af28b6 e1118b1f57
commit eaeed470a9
4 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/SideMenu/SideMenuCoordinator.swift
+3 -15
View File
@@ -243,14 +243,6 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType {
self.spaceMenuPresenter.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)
}
@@ -343,14 +335,10 @@ extension SideMenuCoordinator: SpaceMenuPresenterDelegate {
// 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)
}
}