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

[Spaces] Space menu #4494

Browse Source 
- Implemented Leave feature
- UI & code tweaks
This commit is contained in:
Gil Eluard
2021-07-23 11:00:16 +02:00
parent 24ffc03544
commit 33118db481
10 changed files with 193 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Spaces/SpaceMenu/SpaceMenuPresenter.swift
+26 -15
View File
@@ -26,11 +26,12 @@ class SpaceMenuPresenter: NSObject {
// MARK: Private
private weak var presentingViewController: UIViewController?
private let viewModel = SpaceMenuViewModel()
private var viewModel: SpaceMenuViewModel!
private weak var sourceView: UIView?
private lazy var slidingModalPresenter: SlidingModalPresenter = {
return SlidingModalPresenter()
}()
private weak var selectedSpace: MXSpace?
// MARK: - Public
@@ -39,10 +40,11 @@ class SpaceMenuPresenter: NSObject {
sourceView: UIView?,
session: MXSession,
animated: Bool) {
self.viewModel = SpaceMenuViewModel(session: session, spaceId: spaceId)
self.viewModel.coordinatorDelegate = self
self.presentingViewController = viewController
self.sourceView = sourceView
self.selectedSpace = session.spaceService.getSpace(withId: spaceId)
self.showMenu(for: spaceId, session: session)
}
@@ -60,34 +62,43 @@ class SpaceMenuPresenter: NSObject {
private func present(_ viewController: SpaceMenuViewController, animated: Bool) {
// if UIDevice.current.isPhone {
if UIDevice.current.isPhone {
guard let rootViewController = self.presentingViewController else {
MXLog.error("[SpaceMenuPresenter] present no rootViewController found")
return
}
slidingModalPresenter.present(viewController, from: rootViewController.presentedViewController ?? rootViewController, animated: true, completion: nil)
// } else {
} else {
// Configure source view when view controller is presented with a popover
// viewController.modalPresentationStyle = .popover
// if let sourceView = self.sourceView, let popoverPresentationController = viewController.popoverPresentationController {
// popoverPresentationController.sourceView = sourceView
// popoverPresentationController.sourceRect = sourceView.bounds
// }
//
// self.presentingViewController?.present(viewController, animated: animated, completion: nil)
// }
viewController.modalPresentationStyle = .popover
if let sourceView = self.sourceView, let popoverPresentationController = viewController.popoverPresentationController {
popoverPresentationController.sourceView = sourceView
popoverPresentationController.sourceRect = sourceView.bounds
}
self.presentingViewController?.present(viewController, animated: animated, completion: nil)
}
}
}
// MARK: - SpaceMenuModelViewModelCoordinatorDelegate
extension SpaceMenuPresenter: SpaceMenuModelViewModelCoordinatorDelegate {
func spaceListViewModelDidDismiss(_ viewModel: SpaceMenuViewModelType) {
func spaceMenuViewModelDidDismiss(_ viewModel: SpaceMenuViewModelType) {
self.dismiss(animated: true, completion: nil)
}
func spaceListViewModel(_ viewModel: SpaceMenuViewModelType, didSelectItemWithId itemId: String) {
self.dismiss(animated: true, completion: nil)
func spaceMenuViewModel(_ viewModel: SpaceMenuViewModelType, didSelectItemWithId itemId: String) {
let actionId = SpaceMenuViewModel.ActionId(rawValue: itemId)
switch actionId {
case .leave: break
case .members:
self.dismiss(animated: true, completion: nil)
case .rooms:
self.dismiss(animated: true, completion: nil)
default:
MXLog.error("[SpaceMenuPresenter] spaceListViewModel didSelectItemWithId: invalid itemId \(itemId)")
}
}
}