mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-26 19:34:25 +02:00
[Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
This commit is contained in:
@@ -0,0 +1,96 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
|
||||
final class ShowSpaceMemberDetailCoordinator: NSObject, ShowSpaceMemberDetailCoordinatorType {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
// MARK: Private
|
||||
|
||||
private let session: MXSession
|
||||
private let member: MXRoomMember
|
||||
private let spaceId: String
|
||||
|
||||
private var showSpaceMemberDetailViewModel: ShowSpaceMemberDetailViewModelType
|
||||
private let showSpaceMemberDetailViewController: ShowSpaceMemberDetailViewController
|
||||
|
||||
// MARK: Public
|
||||
|
||||
// Must be used only internally
|
||||
var childCoordinators: [Coordinator] = []
|
||||
|
||||
weak var delegate: ShowSpaceMemberDetailCoordinatorDelegate?
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
init(session: MXSession, member: MXRoomMember, spaceId: String) {
|
||||
self.session = session
|
||||
self.member = member
|
||||
self.spaceId = spaceId
|
||||
|
||||
let showSpaceMemberDetailViewModel = ShowSpaceMemberDetailViewModel(session: self.session, member: self.member)
|
||||
let showSpaceMemberDetailViewController = ShowSpaceMemberDetailViewController.instantiate(with: showSpaceMemberDetailViewModel)
|
||||
showSpaceMemberDetailViewController.enableMention = true
|
||||
showSpaceMemberDetailViewController.enableVoipCall = false
|
||||
showSpaceMemberDetailViewController.enableLeave = false
|
||||
|
||||
self.showSpaceMemberDetailViewModel = showSpaceMemberDetailViewModel
|
||||
self.showSpaceMemberDetailViewController = showSpaceMemberDetailViewController
|
||||
}
|
||||
|
||||
// MARK: - Public methods
|
||||
|
||||
func start() {
|
||||
self.showSpaceMemberDetailViewModel.coordinatorDelegate = self
|
||||
if let space = self.session.spaceService.getSpace(withId: spaceId) {
|
||||
// Set delegate to handle action on member (start chat, mention)
|
||||
self.showSpaceMemberDetailViewController.delegate = self
|
||||
self.showSpaceMemberDetailViewController.display(self.member, withMatrixRoom: space.room)
|
||||
}
|
||||
}
|
||||
|
||||
func toPresentable() -> UIViewController {
|
||||
return self.showSpaceMemberDetailViewController
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - ShowSpaceMemberDetailViewModelCoordinatorDelegate
|
||||
extension ShowSpaceMemberDetailCoordinator: ShowSpaceMemberDetailViewModelCoordinatorDelegate {
|
||||
|
||||
func showSpaceMemberDetailViewModel(_ viewModel: ShowSpaceMemberDetailViewModelType, showRoomWithId roomId: String) {
|
||||
self.delegate?.showSpaceMemberDetailCoordinator(self, showRoomWithId: roomId)
|
||||
}
|
||||
|
||||
func showSpaceMemberDetailViewModelDidCancel(_ viewModel: ShowSpaceMemberDetailViewModelType) {
|
||||
self.delegate?.showSpaceMemberDetailCoordinatorDidCancel(self)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - MXKRoomMemberDetailsViewControllerDelegate
|
||||
extension ShowSpaceMemberDetailCoordinator: MXKRoomMemberDetailsViewControllerDelegate {
|
||||
|
||||
func roomMemberDetailsViewController(_ roomMemberDetailsViewController: MXKRoomMemberDetailsViewController!, startChatWithMemberId memberId: String!, completion: (() -> Void)!) {
|
||||
completion()
|
||||
self.showSpaceMemberDetailViewModel.process(viewAction: .createRoom(memberId))
|
||||
}
|
||||
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
|
||||
protocol ShowSpaceMemberDetailCoordinatorDelegate: AnyObject {
|
||||
func showSpaceMemberDetailCoordinator(_ coordinator: ShowSpaceMemberDetailCoordinatorType, showRoomWithId roomId: String)
|
||||
func showSpaceMemberDetailCoordinatorDidCancel(_ coordinator: ShowSpaceMemberDetailCoordinatorType)
|
||||
}
|
||||
|
||||
/// `ShowSpaceMemberDetailCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.
|
||||
protocol ShowSpaceMemberDetailCoordinatorType: Coordinator, Presentable {
|
||||
var delegate: ShowSpaceMemberDetailCoordinatorDelegate? { get }
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
|
||||
/// ShowSpaceMemberDetailViewController view actions exposed to view model
|
||||
enum ShowSpaceMemberDetailViewAction {
|
||||
case openRoom(_ roomId: String)
|
||||
case createRoom(_ memberId: String)
|
||||
case cancel
|
||||
}
|
||||
+161
@@ -0,0 +1,161 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import UIKit
|
||||
|
||||
final class ShowSpaceMemberDetailViewController: RoomMemberDetailsViewController {
|
||||
|
||||
// MARK: - Constants
|
||||
|
||||
override class func nib() -> UINib! {
|
||||
return UINib(nibName: "RoomMemberDetailsViewController", bundle: Bundle(for: RoomMemberDetailsViewController.self))
|
||||
}
|
||||
|
||||
private enum Constants {
|
||||
static let aConstant: Int = 666
|
||||
}
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
// MARK: Outlets
|
||||
|
||||
// MARK: Private
|
||||
|
||||
private var viewModel: ShowSpaceMemberDetailViewModelType!
|
||||
private var theme: Theme!
|
||||
private var keyboardAvoider: KeyboardAvoider?
|
||||
private var errorPresenter: MXKErrorPresentation!
|
||||
private var activityPresenter: ActivityIndicatorPresenter!
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
class func instantiate(with viewModel: ShowSpaceMemberDetailViewModelType) -> ShowSpaceMemberDetailViewController {
|
||||
let viewController = ShowSpaceMemberDetailViewController()
|
||||
viewController.viewModel = viewModel
|
||||
viewController.theme = ThemeService.shared().theme
|
||||
return viewController
|
||||
}
|
||||
|
||||
// MARK: - Life cycle
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
// Do any additional setup after loading the view.
|
||||
|
||||
self.setupViews()
|
||||
self.keyboardAvoider = KeyboardAvoider(scrollViewContainerView: self.view, scrollView: self.tableView)
|
||||
self.activityPresenter = ActivityIndicatorPresenter()
|
||||
self.errorPresenter = MXKErrorAlertPresentation()
|
||||
|
||||
self.registerThemeServiceDidChangeThemeNotification()
|
||||
self.update(theme: self.theme)
|
||||
|
||||
self.viewModel.viewDelegate = self
|
||||
}
|
||||
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
|
||||
self.keyboardAvoider?.startAvoiding()
|
||||
}
|
||||
|
||||
override func viewDidDisappear(_ animated: Bool) {
|
||||
super.viewDidDisappear(animated)
|
||||
|
||||
self.keyboardAvoider?.stopAvoiding()
|
||||
}
|
||||
|
||||
override var preferredStatusBarStyle: UIStatusBarStyle {
|
||||
return self.theme.statusBarStyle
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func update(theme: Theme) {
|
||||
self.theme = theme
|
||||
|
||||
self.view.backgroundColor = theme.headerBackgroundColor
|
||||
|
||||
if let navigationBar = self.navigationController?.navigationBar {
|
||||
theme.applyStyle(onNavigationBar: navigationBar)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private func registerThemeServiceDidChangeThemeNotification() {
|
||||
NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
|
||||
}
|
||||
|
||||
@objc private func themeDidChange() {
|
||||
self.update(theme: ThemeService.shared().theme)
|
||||
}
|
||||
|
||||
private func setupViews() {
|
||||
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
|
||||
self?.cancelButtonAction()
|
||||
}
|
||||
|
||||
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
|
||||
}
|
||||
|
||||
private func render(viewState: ShowSpaceMemberDetailViewState) {
|
||||
switch viewState {
|
||||
case .loading:
|
||||
self.renderLoading()
|
||||
case .loaded:
|
||||
self.renderLoaded()
|
||||
case .error(let error):
|
||||
self.render(error: error)
|
||||
}
|
||||
}
|
||||
|
||||
private func renderLoading() {
|
||||
self.activityPresenter.presentActivityIndicator(on: self.view, animated: true)
|
||||
}
|
||||
|
||||
private func renderLoaded() {
|
||||
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
|
||||
}
|
||||
|
||||
private func render(error: Error) {
|
||||
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
|
||||
self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
|
||||
}
|
||||
|
||||
// MARK: - RoomMemberDetailsViewController private
|
||||
|
||||
@objc private func showRoom(withId roomId: String!) {
|
||||
self.viewModel.process(viewAction: .openRoom(roomId))
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
private func cancelButtonAction() {
|
||||
self.viewModel.process(viewAction: .cancel)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MARK: - ShowSpaceMemberDetailViewModelViewDelegate
|
||||
extension ShowSpaceMemberDetailViewController: ShowSpaceMemberDetailViewModelViewDelegate {
|
||||
|
||||
func showSpaceMemberDetailViewModel(_ viewModel: ShowSpaceMemberDetailViewModelType, didUpdateViewState viewSate: ShowSpaceMemberDetailViewState) {
|
||||
self.render(viewState: viewSate)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
|
||||
final class ShowSpaceMemberDetailViewModel: ShowSpaceMemberDetailViewModelType {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
// MARK: Private
|
||||
|
||||
private let session: MXSession
|
||||
private let member: MXRoomMember
|
||||
|
||||
private var currentOperation: MXHTTPOperation?
|
||||
|
||||
// MARK: Public
|
||||
|
||||
weak var viewDelegate: ShowSpaceMemberDetailViewModelViewDelegate?
|
||||
weak var coordinatorDelegate: ShowSpaceMemberDetailViewModelCoordinatorDelegate?
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
init(session: MXSession, member: MXRoomMember) {
|
||||
self.session = session
|
||||
self.member = member
|
||||
}
|
||||
|
||||
deinit {
|
||||
self.cancelOperations()
|
||||
}
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
func process(viewAction: ShowSpaceMemberDetailViewAction) {
|
||||
switch viewAction {
|
||||
case .openRoom(let roomId):
|
||||
self.coordinatorDelegate?.showSpaceMemberDetailViewModel(self, showRoomWithId: roomId)
|
||||
case .createRoom(let memberId):
|
||||
self.createDirectRoom(forMemberWithId: memberId)
|
||||
case .cancel:
|
||||
self.cancelOperations()
|
||||
self.coordinatorDelegate?.showSpaceMemberDetailViewModelDidCancel(self)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func update(viewState: ShowSpaceMemberDetailViewState) {
|
||||
self.viewDelegate?.showSpaceMemberDetailViewModel(self, didUpdateViewState: viewState)
|
||||
}
|
||||
|
||||
private func createDirectRoom(forMemberWithId memberId: String) {
|
||||
self.update(viewState: .loading)
|
||||
AppDelegate.theDelegate().selectMatrixAccount { account in
|
||||
guard let account = account, let session = account.mxSession else {
|
||||
self.update(viewState: .loaded)
|
||||
return
|
||||
}
|
||||
|
||||
let invite: [String]? = (session.myUserId != memberId) ? [memberId] : nil
|
||||
self.currentOperation = session.vc_canEnableE2EByDefaultInNewRoom(withUsers: invite) { canEnableE2E in
|
||||
self.currentOperation = nil
|
||||
let roomCreationParameters = MXRoomCreationParameters()
|
||||
roomCreationParameters.visibility = kMXRoomDirectoryVisibilityPrivate
|
||||
roomCreationParameters.inviteArray = invite
|
||||
roomCreationParameters.isDirect = !(invite?.isEmpty ?? true)
|
||||
roomCreationParameters.preset = kMXRoomPresetTrustedPrivateChat
|
||||
|
||||
if canEnableE2E {
|
||||
roomCreationParameters.initialStateEvents = [MXRoomCreationParameters.initialStateEventForEncryption(withAlgorithm: kMXCryptoMegolmAlgorithm)]
|
||||
}
|
||||
|
||||
self.currentOperation = session.createRoom(parameters: roomCreationParameters) { response in
|
||||
self.currentOperation = nil
|
||||
self.update(viewState: .loaded)
|
||||
guard response.isSuccess, let room = response.value else {
|
||||
if let error = response.error {
|
||||
self.update(viewState: .error(error))
|
||||
}
|
||||
return
|
||||
}
|
||||
self.coordinatorDelegate?.showSpaceMemberDetailViewModel(self, showRoomWithId: room.roomId)
|
||||
}
|
||||
} failure: { error in
|
||||
self.update(viewState: .loaded)
|
||||
if let error = error {
|
||||
self.update(viewState: .error(error))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func cancelOperations() {
|
||||
self.currentOperation?.cancel()
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
|
||||
protocol ShowSpaceMemberDetailViewModelViewDelegate: AnyObject {
|
||||
func showSpaceMemberDetailViewModel(_ viewModel: ShowSpaceMemberDetailViewModelType, didUpdateViewState viewSate: ShowSpaceMemberDetailViewState)
|
||||
}
|
||||
|
||||
protocol ShowSpaceMemberDetailViewModelCoordinatorDelegate: AnyObject {
|
||||
func showSpaceMemberDetailViewModel(_ viewModel: ShowSpaceMemberDetailViewModelType, showRoomWithId roomId: String)
|
||||
func showSpaceMemberDetailViewModelDidCancel(_ viewModel: ShowSpaceMemberDetailViewModelType)
|
||||
}
|
||||
|
||||
/// Protocol describing the view model used by `ShowSpaceMemberDetailViewController`
|
||||
protocol ShowSpaceMemberDetailViewModelType {
|
||||
|
||||
var viewDelegate: ShowSpaceMemberDetailViewModelViewDelegate? { get set }
|
||||
var coordinatorDelegate: ShowSpaceMemberDetailViewModelCoordinatorDelegate? { get set }
|
||||
|
||||
func process(viewAction: ShowSpaceMemberDetailViewAction)
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
// File created from ScreenTemplate
|
||||
// $ createScreen.sh Spaces/SpaceMembers/MemberDetail ShowSpaceMemberDetail
|
||||
/*
|
||||
Copyright 2021 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import Foundation
|
||||
|
||||
/// ShowSpaceMemberDetailViewController view state
|
||||
enum ShowSpaceMemberDetailViewState {
|
||||
case loading
|
||||
case loaded
|
||||
case error(Error)
|
||||
}
|
||||
Reference in New Issue
Block a user