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

Refactor SpacePresentationParameters to SpaceNavigationParameters.

Browse source
This commit is contained in:
SBiOSoftWhare 2021-10-21 15:22:38 +02:00
parent 0c8b7135ec
commit 1b5540c064
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Riot/Modules/Application/LegacyAppDelegate.m
View file

@ -1354,9 +1354,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
if (room.summary.roomType == MXRoomTypeSpace)
{
SpacePresentationParameters *spacePresentationParameters = [[SpacePresentationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:universalLinkPresentationParameters];
SpaceNavigationParameters *spaceNavigationParameters = [[SpaceNavigationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:universalLinkPresentationParameters];
[self showSpaceWithParameters:spacePresentationParameters];
[self showSpaceWithParameters:spaceNavigationParameters];
}
else
{
@ -1477,9 +1477,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
[homeViewController stopActivityIndicator];
SpacePreviewPresentationParameters *spacePreviewPresentationParameters = [[SpacePreviewPresentationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:universalLinkPresentationParameters];
SpacePreviewNavigationParameters *spacePreviewNavigationParameters = [[SpacePreviewNavigationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:universalLinkPresentationParameters];
[self showSpacePreviewWithParameters:spacePreviewPresentationParameters];
[self showSpacePreviewWithParameters:spacePreviewNavigationParameters];
}
else
{
@ -2921,7 +2921,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[self showRoomPreviewWithParameters:parameters];
}
- (void)showSpacePreviewWithParameters:(SpacePreviewPresentationParameters*)parameters
- (void)showSpacePreviewWithParameters:(SpacePreviewNavigationParameters*)parameters
{
UIViewController *presentingViewController;
UIView *sourceView;
@ -2959,7 +2959,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
}
}
- (void)showSpaceWithParameters:(SpacePresentationParameters*)parameters
- (void)showSpaceWithParameters:(SpaceNavigationParameters*)parameters
{
UIViewController *presentingViewController;
UIView *sourceView;

5
Riot/Modules/Application/ScreenPresentation/RoomPreviewPresentationParameters.swift
View file

@ -19,7 +19,7 @@ import Foundation
/// Presentation parameters to display a preview of a room that is unknown for the user.
/// This room can come from an email invitation link or a simple link to a room.
@objcMembers
class RoomPreviewScreenParameters: RoomScreenParameters {
class RoomPreviewScreenParameters: RoomNavigationParameters {
// MARK: - Properties
@ -33,6 +33,7 @@ class RoomPreviewScreenParameters: RoomScreenParameters {
super.init(roomId: previewData.roomId,
eventId: previewData.eventId,
mxSession: previewData.mxSession, presentationParameters: presentationParameters)
mxSession: previewData.mxSession,
presentationParameters: presentationParameters)
}
}

6
Riot/Modules/Application/ScreenPresentation/SpacePresentationParameters.swift → Riot/Modules/Application/ScreenPresentation/SpaceNavigationParameters.swift
View file

@ -16,9 +16,9 @@
import Foundation
/// Presentation parameters to display a space with a provided identifier in a specific matrix session.
/// Navigation parameters to display a space with a provided identifier in a specific matrix session.
@objcMembers
class SpacePresentationParameters: NSObject {
class SpaceNavigationParameters: NSObject {
// MARK: - Properties
@ -28,7 +28,7 @@ class SpacePresentationParameters: NSObject {
/// The Matrix session in which the room should be available.
let mxSession: MXSession
/// Universal link presentation parameters.
/// Screen presentation parameters.
let presentationParameters: ScreenPresentationParameters
// MARK: - Setup

8
Riot/Modules/Application/ScreenPresentation/SpacePreviewPresentationParameters.swift → Riot/Modules/Application/ScreenPresentation/SpacePreviewNavigationParameters.swift
View file

@ -16,9 +16,9 @@
import Foundation
/// Presentation parameters to display a preview of a space that is unknown for the user.
/// Navigation parameters to display a preview of a space that is unknown for the user.
@objcMembers
class SpacePreviewPresentationParameters: SpacePresentationParameters {
class SpacePreviewNavigationParameters: SpaceNavigationParameters {
// MARK: - Properties
@ -32,6 +32,8 @@ class SpacePreviewPresentationParameters: SpacePresentationParameters {
presentationParameters: ScreenPresentationParameters) {
self.publicRoom = publicRoom
super.init(roomId: publicRoom.roomId, mxSession: mxSession, presentationParameters: presentationParameters)
super.init(roomId: publicRoom.roomId,
mxSession: mxSession,
presentationParameters: presentationParameters)
}
}