Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

SP3.2: Long press on rooms in space room lists #5232

Browse source 
- Small tweaks
This commit is contained in:
Gil Eluard 2022-02-06 21:29:25 +01:00
parent f462a6e3d0
commit e984e8a44a
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomCoordinator.swift
View file

@ -64,14 +64,14 @@ final class SpaceExploreRoomCoordinator: SpaceExploreRoomCoordinatorType {
// MARK: - SpaceExploreRoomViewModelCoordinatorDelegate // MARK: - SpaceExploreRoomViewModelCoordinatorDelegate
extension SpaceExploreRoomCoordinator: SpaceExploreRoomViewModelCoordinatorDelegate { extension SpaceExploreRoomCoordinator: SpaceExploreRoomViewModelCoordinatorDelegate {
func spaceExploreRoomViewModel(_ viewModel: SpaceExploreRoomViewModelType, openSettingsOf item: SpaceExploreRoomListItemViewData) { func spaceExploreRoomViewModel(_ viewModel: SpaceExploreRoomViewModelType, openSettingsOf item: SpaceExploreRoomListItemViewData) {
self.delegate?.spaceExploreRoomCoordinatorDidAddRoom(self, openSettingsOf: item) self.delegate?.spaceExploreRoomCoordinator(self, openSettingsOf: item)
} }
func spaceExploreRoomViewModel(_ viewModel: SpaceExploreRoomViewModelType, inviteTo item: SpaceExploreRoomListItemViewData) { func spaceExploreRoomViewModel(_ coordinator: SpaceExploreRoomViewModelType, inviteTo item: SpaceExploreRoomListItemViewData) {
self.delegate?.spaceExploreRoomCoordinatorDidAddRoom(self, inviteTo: item) self.delegate?.spaceExploreRoomCoordinator(self, inviteTo: item)
} }
func spaceExploreRoomViewModel(_ viewModel: SpaceExploreRoomViewModelType, didSelect item: SpaceExploreRoomListItemViewData, from sourceView: UIView?) { func spaceExploreRoomViewModel(_ coordinator: SpaceExploreRoomViewModelType, didSelect item: SpaceExploreRoomListItemViewData, from sourceView: UIView?) {
self.delegate?.spaceExploreRoomCoordinator(self, didSelect: item, from: sourceView) self.delegate?.spaceExploreRoomCoordinator(self, didSelect: item, from: sourceView)
} }

4
Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomCoordinatorType.swift
View file

@ -22,8 +22,8 @@ protocol SpaceExploreRoomCoordinatorDelegate: AnyObject {
func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, didSelect item: SpaceExploreRoomListItemViewData, from sourceView: UIView?) func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, didSelect item: SpaceExploreRoomListItemViewData, from sourceView: UIView?)
func spaceExploreRoomCoordinatorDidCancel(_ coordinator: SpaceExploreRoomCoordinatorType) func spaceExploreRoomCoordinatorDidCancel(_ coordinator: SpaceExploreRoomCoordinatorType)
func spaceExploreRoomCoordinatorDidAddRoom(_ coordinator: SpaceExploreRoomCoordinatorType) func spaceExploreRoomCoordinatorDidAddRoom(_ coordinator: SpaceExploreRoomCoordinatorType)
func spaceExploreRoomCoordinatorDidAddRoom(_ viewModel: SpaceExploreRoomCoordinatorType, openSettingsOf item: SpaceExploreRoomListItemViewData) func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, openSettingsOf item: SpaceExploreRoomListItemViewData)
func spaceExploreRoomCoordinatorDidAddRoom(_ viewModel: SpaceExploreRoomCoordinatorType, inviteTo item: SpaceExploreRoomListItemViewData) func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, inviteTo item: SpaceExploreRoomListItemViewData)
} }
/// `SpaceExploreRoomCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow. /// `SpaceExploreRoomCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.

2
Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
View file

@ -365,7 +365,7 @@ final class SpaceExploreRoomViewModel: SpaceExploreRoomViewModelType {
let action = UIAction(title: VectorL10n.join) { action in let action = UIAction(title: VectorL10n.join) { action in
self.process(viewAction: .join(itemData)) self.process(viewAction: .join(itemData))
} }
if !isJoined { if isJoined {
action.attributes = .disabled action.attributes = .disabled
} }
return action return action

4
Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
View file

@ -229,11 +229,11 @@ extension ExploreRoomCoordinator: SpaceExploreRoomCoordinatorDelegate {
self.presentRoomCreation() self.presentRoomCreation()
} }
func spaceExploreRoomCoordinatorDidAddRoom(_ viewModel: SpaceExploreRoomCoordinatorType, openSettingsOf item: SpaceExploreRoomListItemViewData) { func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, openSettingsOf item: SpaceExploreRoomListItemViewData) {
self.navigateTo(roomWith: item.childInfo.childRoomId, showSettingsInitially: true, animated: true) self.navigateTo(roomWith: item.childInfo.childRoomId, showSettingsInitially: true, animated: true)
} }
func spaceExploreRoomCoordinatorDidAddRoom(_ viewModel: SpaceExploreRoomCoordinatorType, inviteTo item: SpaceExploreRoomListItemViewData) { func spaceExploreRoomCoordinator(_ coordinator: SpaceExploreRoomCoordinatorType, inviteTo item: SpaceExploreRoomListItemViewData) {
self.pushInviteScreen(forRoomWithId: item.childInfo.childRoomId) self.pushInviteScreen(forRoomWithId: item.childInfo.childRoomId)
} }
} }