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

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

Browse Source
This commit is contained in:
Arnfried Griesert
2023-03-16 12:19:26 +01:00
parent a3c2375aa8 e9c58d1573
commit e5d97ed154
168 changed files with 2451 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
+4
View File
@@ -32,6 +32,7 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
private let parentSpaceId: String?
private let initialSection: RoomInfoSection
private let dismissOnCancel: Bool
private let canAddParticipants: Bool
private weak var roomSettingsViewController: RoomSettingsViewController?
private lazy var segmentedViewController: SegmentedViewController = {
@@ -44,6 +45,8 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
participants.parentSpaceId = self.parentSpaceId
participants.delegate = self
participants.screenTracker = AnalyticsScreenTracker(screen: .roomMembers)
participants.showInviteUserFab = self.canAddParticipants
let files = RoomFilesViewController()
files.finalizeInit()
@@ -106,6 +109,7 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType {
self.room = parameters.room
self.parentSpaceId = parameters.parentSpaceId
self.initialSection = parameters.initialSection
self.canAddParticipants = parameters.canAddParticipants
self.dismissOnCancel = parameters.dismissOnCancel
}
Riot/Modules/Room/RoomInfo/RoomInfoCoordinatorParameters.swift
+7 -1
View File
@@ -33,12 +33,14 @@ class RoomInfoCoordinatorParameters: NSObject {
let parentSpaceId: String?
let initialSection: RoomInfoSection
let dismissOnCancel: Bool
let canAddParticipants: Bool
init(session: MXSession, room: MXRoom, parentSpaceId: String?, initialSection: RoomInfoSection, dismissOnCancel: Bool) {
init(session: MXSession, room: MXRoom, parentSpaceId: String?, initialSection: RoomInfoSection, canAddParticipants: Bool = true, dismissOnCancel: Bool) {
self.session = session
self.room = room
self.parentSpaceId = parentSpaceId
self.initialSection = initialSection
self.canAddParticipants = canAddParticipants
self.dismissOnCancel = dismissOnCancel
super.init()
}
@@ -50,4 +52,8 @@ class RoomInfoCoordinatorParameters: NSObject {
convenience init(session: MXSession, room: MXRoom, parentSpaceId: String?, initialSection: RoomInfoSection) {
self.init(session: session, room: room, parentSpaceId: parentSpaceId, initialSection: initialSection, dismissOnCancel: false)
}
convenience init(session: MXSession, room: MXRoom, parentSpaceId: String?, initialSection: RoomInfoSection, canAddParticipants: Bool) {
self.init(session: session, room: room, parentSpaceId: parentSpaceId, initialSection: initialSection, canAddParticipants: canAddParticipants, dismissOnCancel: false)
}
}
Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift
+1 -1
View File
@@ -40,7 +40,7 @@ final class RoomInfoListViewModel: NSObject, RoomInfoListViewModelType {
let basicInfoViewData = RoomInfoBasicViewData(avatarUrl: room.summary.avatar,
mediaManager: session.mediaManager,
roomId: room.roomId,
roomDisplayName: room.summary.displayname,
roomDisplayName: room.summary.displayName,
mainRoomAlias: room.summary.aliases?.first,
roomTopic: room.summary.topic,
encryptionImage: encryptionImage,