mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-29 04:36:58 +02:00
Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits) finish version++ version++ Translated using Weblate (Hungarian) Translated using Weblate (Italian) Translated using Weblate (Ukrainian) Translated using Weblate (Hungarian) Translated using Weblate (Slovak) Translated using Weblate (Swedish) Translated using Weblate (Indonesian) Translated using Weblate (Albanian) Translated using Weblate (Estonian) Translated using Weblate (Estonian) updated the submodule updated SDK Update the SDK. (#7819) Prepare for new sprint finish version++ version++ fix Changelog. ... # Conflicts: # Config/AppVersion.xcconfig # Podfile # Podfile.lock # Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved # Riot/Managers/Settings/RiotSettings.swift # Riot/Modules/Analytics/Analytics.swift # Riot/Modules/Analytics/DecryptionFailure.swift # Riot/Modules/Analytics/PHGPostHogConfiguration.swift # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift # Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Utils/EventFormatter.m # Riot/Utils/Tools.m # RiotNSE/target.yml # fastlane/Fastfile # project.yml
This commit is contained in:
@@ -237,6 +237,9 @@ extension RoomInfoCoordinator: RoomInfoListCoordinatorDelegate {
|
||||
self.delegate?.roomInfoCoordinatorDidLeaveRoom(self)
|
||||
}
|
||||
|
||||
func roomInfoListCoordinatorDidRequestReportRoom(_ coordinator: RoomInfoListCoordinatorType) {
|
||||
self.delegate?.roomInfoCoordinatorDidRequestReportRoom(self)
|
||||
}
|
||||
}
|
||||
|
||||
extension RoomInfoCoordinator: RoomParticipantsViewControllerDelegate {
|
||||
|
||||
@@ -25,6 +25,7 @@ import MatrixSDK
|
||||
func roomInfoCoordinatorBridgePresenterDelegateDidLeaveRoom(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter)
|
||||
func roomInfoCoordinatorBridgePresenter(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter, didReplaceRoomWithReplacementId roomId: String)
|
||||
func roomInfoCoordinatorBridgePresenter(_ coordinator: RoomInfoCoordinatorBridgePresenter, viewEventInTimeline event: MXEvent)
|
||||
func roomInfoCoordinatorBridgePresenterDidRequestReportRoom(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter)
|
||||
}
|
||||
|
||||
/// RoomInfoCoordinatorBridgePresenter enables to start RoomInfoCoordinator from a view controller.
|
||||
@@ -131,9 +132,14 @@ extension RoomInfoCoordinatorBridgePresenter: RoomInfoCoordinatorDelegate {
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, didReplaceRoomWithReplacementId roomId: String) {
|
||||
self.delegate?.roomInfoCoordinatorBridgePresenter(self, didReplaceRoomWithReplacementId: roomId)
|
||||
}
|
||||
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, viewEventInTimeline event: MXEvent) {
|
||||
self.delegate?.roomInfoCoordinatorBridgePresenter(self, viewEventInTimeline: event)
|
||||
}
|
||||
|
||||
func roomInfoCoordinatorDidRequestReportRoom(_ coordinator: RoomInfoCoordinatorType) {
|
||||
self.delegate?.roomInfoCoordinatorBridgePresenterDidRequestReportRoom(self)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UIAdaptivePresentationControllerDelegate
|
||||
|
||||
@@ -25,6 +25,7 @@ protocol RoomInfoCoordinatorDelegate: AnyObject {
|
||||
func roomInfoCoordinatorDidLeaveRoom(_ coordinator: RoomInfoCoordinatorType)
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, didReplaceRoomWithReplacementId roomId: String)
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, viewEventInTimeline event: MXEvent)
|
||||
func roomInfoCoordinatorDidRequestReportRoom(_ coordinator: RoomInfoCoordinatorType)
|
||||
}
|
||||
|
||||
/// `RoomInfoCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow.
|
||||
|
||||
@@ -75,4 +75,7 @@ extension RoomInfoListCoordinator: RoomInfoListViewModelCoordinatorDelegate {
|
||||
self.delegate?.roomInfoListCoordinatorDidLeaveRoom(self)
|
||||
}
|
||||
|
||||
func roomInfoListViewModelDidRequestReportRoom(_ viewModel: RoomInfoListViewModelType) {
|
||||
self.delegate?.roomInfoListCoordinatorDidRequestReportRoom(self)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ protocol RoomInfoListCoordinatorDelegate: AnyObject {
|
||||
func roomInfoListCoordinator(_ coordinator: RoomInfoListCoordinatorType, wantsToNavigateTo target: RoomInfoListTarget)
|
||||
func roomInfoListCoordinatorDidCancel(_ coordinator: RoomInfoListCoordinatorType)
|
||||
func roomInfoListCoordinatorDidLeaveRoom(_ coordinator: RoomInfoListCoordinatorType)
|
||||
func roomInfoListCoordinatorDidRequestReportRoom(_ coordinator: RoomInfoListCoordinatorType)
|
||||
}
|
||||
|
||||
/// `RoomInfoListCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.
|
||||
|
||||
@@ -52,4 +52,5 @@ enum RoomInfoListViewAction {
|
||||
case leave
|
||||
case cancel
|
||||
case permalink
|
||||
case report
|
||||
}
|
||||
|
||||
@@ -271,8 +271,16 @@ final class RoomInfoListViewController: UIViewController {
|
||||
rows: [rowLeave],
|
||||
footer: nil)
|
||||
|
||||
let rowReport = Row(type: .destructive, icon: Asset.Images.error.image, text: VectorL10n.roomEventActionReport, accessoryType: .disclosureIndicator) {
|
||||
self.viewModel.process(viewAction: .report)
|
||||
}
|
||||
let sectionReport = Section(header: nil,
|
||||
rows: [rowReport],
|
||||
footer: nil)
|
||||
|
||||
tmpSections.append(sectionSettings)
|
||||
tmpSections.append(sectionLeave)
|
||||
tmpSections.append(sectionReport)
|
||||
|
||||
sections = tmpSections
|
||||
}
|
||||
|
||||
@@ -118,6 +118,8 @@ final class RoomInfoListViewModel: NSObject, RoomInfoListViewModelType {
|
||||
self.coordinatorDelegate?.roomInfoListViewModelDidCancel(self)
|
||||
case .permalink:
|
||||
self.createPermalink()
|
||||
case .report:
|
||||
self.coordinatorDelegate?.roomInfoListViewModelDidRequestReportRoom(self)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ protocol RoomInfoListViewModelCoordinatorDelegate: AnyObject {
|
||||
func roomInfoListViewModelDidCancel(_ viewModel: RoomInfoListViewModelType)
|
||||
func roomInfoListViewModelDidLeaveRoom(_ viewModel: RoomInfoListViewModelType)
|
||||
func roomInfoListViewModel(_ viewModel: RoomInfoListViewModelType, wantsToNavigateTo target: RoomInfoListTarget)
|
||||
func roomInfoListViewModelDidRequestReportRoom(_ viewModel: RoomInfoListViewModelType)
|
||||
}
|
||||
|
||||
/// Protocol describing the view model used by `RoomInfoListViewController`
|
||||
|
||||
Reference in New Issue
Block a user