Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename UniversalLinkPresentationParameters to ScreenPresentationParameters.

Browse source
This commit is contained in:
SBiOSoftWhare 2021-10-21 10:00:37 +02:00
parent e8a8862291
commit 0d1f8305e9
15 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1240,7 +1240,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
- (BOOL)handleUniversalLinkFragment:(NSString*)fragment fromURL:(NSURL*)universalLinkURL
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
UniversalLinkParameters *parameters = [[UniversalLinkParameters alloc] initWithFragment:fragment universalLinkURL:universalLinkURL presentationParameters:presentationParameters];
@ -1251,7 +1251,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
NSString *fragment = universalLinkParameters.fragment;
NSURL *universalLinkURL = universalLinkParameters.universalLinkURL;
UniversalLinkPresentationParameters *universalLinkPresentationParameters = universalLinkParameters.presentationParameters;
ScreenPresentationParameters *universalLinkPresentationParameters = universalLinkParameters.presentationParameters;
BOOL restoreInitialDisplay = universalLinkPresentationParameters.restoreInitialDisplay;
BOOL continueUserActivity = NO;
@ -2880,7 +2880,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
- (void)showRoom:(NSString*)roomId andEventId:(NSString*)eventId withMatrixSession:(MXSession*)mxSession
{
// Ask to restore initial display
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:YES];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES];
RoomPresentationParameters *parameters = [[RoomPresentationParameters alloc] initWithRoomId:roomId
eventId:eventId mxSession:mxSession presentationParameters:presentationParameters];
@ -2914,7 +2914,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
- (void)showRoomPreview:(RoomPreviewData*)roomPreviewData
{
// Ask to restore initial display
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:YES];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES];
RoomPreviewPresentationParameters *parameters = [[RoomPreviewPresentationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:presentationParameters];
@ -3109,7 +3109,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
#pragma mark - Contacts handling
- (void)showContact:(MXKContact*)contact presentationParameters:(UniversalLinkPresentationParameters*)presentationParameters
- (void)showContact:(MXKContact*)contact presentationParameters:(ScreenPresentationParameters*)presentationParameters
{
void(^showContact)(void) = ^{
[self.masterTabBarController selectContact:contact withPresentationParameters:presentationParameters];
@ -3129,7 +3129,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
#pragma mark - Matrix Groups handling
- (void)showGroup:(MXGroup*)group withMatrixSession:(MXSession*)mxSession presentationParamters:(UniversalLinkPresentationParameters*)presentationParameters
- (void)showGroup:(MXGroup*)group withMatrixSession:(MXSession*)mxSession presentationParamters:(ScreenPresentationParameters*)presentationParameters
{
void(^showGroup)(void) = ^{
// Select group to display its details (dispatch this action in order to let TabBarController end its refresh)

4
Riot/Modules/Application/ScreenPresentation/RoomPresentationParameters.swift
View file

@ -32,14 +32,14 @@ class RoomPresentationParameters: NSObject {
let mxSession: MXSession
/// Universal link presentation parameters.
let presentationParameters: UniversalLinkPresentationParameters
let presentationParameters: ScreenPresentationParameters
// MARK: - Setup
init(roomId: String,
eventId: String?,
mxSession: MXSession,
presentationParameters: UniversalLinkPresentationParameters) {
presentationParameters: ScreenPresentationParameters) {
self.roomId = roomId
self.eventId = eventId
self.mxSession = mxSession

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

@ -28,7 +28,7 @@ class RoomPreviewPresentationParameters: RoomPresentationParameters {
// MARK: - Setup
init(previewData: RoomPreviewData, presentationParameters: UniversalLinkPresentationParameters) {
init(previewData: RoomPreviewData, presentationParameters: ScreenPresentationParameters) {
self.previewData = previewData
super.init(roomId: previewData.roomId,

2
Riot/Modules/DeepLink/UniversalLinkPresentationParameters.swift → Riot/Modules/Application/ScreenPresentation/ScreenPresentationParameters.swift
View file

@ -18,7 +18,7 @@ import Foundation
/// Presentation parameters used when a universal link is triggered
@objcMembers
class UniversalLinkPresentationParameters: NSObject {
class ScreenPresentationParameters: NSObject {
// MARK: - Properties

4
Riot/Modules/Application/ScreenPresentation/SpacePresentationParameters.swift
View file

@ -29,13 +29,13 @@ class SpacePresentationParameters: NSObject {
let mxSession: MXSession
/// Universal link presentation parameters.
let presentationParameters: UniversalLinkPresentationParameters
let presentationParameters: ScreenPresentationParameters
// MARK: - Setup
init(roomId: String,
mxSession: MXSession,
presentationParameters: UniversalLinkPresentationParameters) {
presentationParameters: ScreenPresentationParameters) {
self.roomId = roomId
self.mxSession = mxSession
self.presentationParameters = presentationParameters

2
Riot/Modules/Application/ScreenPresentation/SpacePreviewPresentationParameters.swift
View file

@ -29,7 +29,7 @@ class SpacePreviewPresentationParameters: SpacePresentationParameters {
init(publicRoom: MXPublicRoom,
mxSession: MXSession,
presentationParameters: UniversalLinkPresentationParameters) {
presentationParameters: ScreenPresentationParameters) {
self.publicRoom = publicRoom
super.init(roomId: publicRoom.roomId, mxSession: mxSession, presentationParameters: presentationParameters)

4
Riot/Modules/Common/Recents/RecentsViewController.m
View file

@ -862,7 +862,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
self.userInteractionEnabled = NO;
// Do not stack views when showing room
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
RoomPresentationParameters *parameters = [[RoomPresentationParameters alloc] initWithRoomId:roomId eventId:nil
mxSession:matrixSession presentationParameters:presentationParameters];
@ -875,7 +875,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
- (void)showRoomPreviewWithData:(RoomPreviewData*)roomPreviewData
{
// Do not stack views when showing room
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO sender:nil sourceView:nil];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO sender:nil sourceView:nil];
RoomPreviewPresentationParameters *parameters = [[RoomPreviewPresentationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:presentationParameters];

6
Riot/Modules/DeepLink/UniversalLinkParameters.swift
View file

@ -29,13 +29,13 @@ class UniversalLinkParameters: NSObject {
let fragment: String
/// Presentation parameters
let presentationParameters: UniversalLinkPresentationParameters
let presentationParameters: ScreenPresentationParameters
// MARK: - Setup
init(fragment: String,
universalLinkURL: URL,
presentationParameters: UniversalLinkPresentationParameters) {
presentationParameters: ScreenPresentationParameters) {
self.fragment = fragment
self.universalLinkURL = universalLinkURL
self.presentationParameters = presentationParameters
@ -44,7 +44,7 @@ class UniversalLinkParameters: NSObject {
}
convenience init?(universalLinkURL: URL,
presentationParameters: UniversalLinkPresentationParameters) {
presentationParameters: ScreenPresentationParameters) {
guard let fixedURL = Tools.fixURL(withSeveralHashKeys: universalLinkURL), let fragment = fixedURL.fragment else {
return nil

2
Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
View file

@ -143,7 +143,7 @@
andEventId:(NSString*)eventId
inMatrixSession:(MXSession*)session
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
RoomPresentationParameters *parameters = [[RoomPresentationParameters alloc] initWithRoomId:roomId
eventId:eventId

2
Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
View file

@ -150,7 +150,7 @@
andEventId:(NSString*)eventId
inMatrixSession:(MXSession*)session
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
RoomPresentationParameters *parameters = [[RoomPresentationParameters alloc] initWithRoomId:roomId
eventId:eventId

4
Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
View file

@ -234,7 +234,7 @@
- (void)showRoomWithId:(NSString*)roomId inMatrixSession:(MXSession*)mxSession
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
RoomPresentationParameters *parameters = [[RoomPresentationParameters alloc] initWithRoomId:roomId eventId:nil mxSession:mxSession
presentationParameters:presentationParameters];
@ -243,7 +243,7 @@
- (void)showRoomPreviewWithData:(RoomPreviewData*)roomPreviewData
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
RoomPreviewPresentationParameters *parameters = [[RoomPreviewPresentationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:presentationParameters];
[[AppDelegate theDelegate] showRoomPreviewWithParameters:parameters];

4
Riot/Modules/Room/RoomViewController.m
View file

@ -2202,9 +2202,9 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
return [[AppDelegate theDelegate] showAlertWithTitle:title message:message];
}
- (UniversalLinkPresentationParameters*)buildUniversalLinkPresentationParameters
- (ScreenPresentationParameters*)buildUniversalLinkPresentationParameters
{
return [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:BuildSettings.allowSplitViewDetailsScreenStacking sender:self sourceView:nil];
return [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:BuildSettings.allowSplitViewDetailsScreenStacking sender:self sourceView:nil];
}
- (BOOL)handleUniversalLinkURL:(NSURL*)universalLinkURL

10
Riot/Modules/TabBar/MasterTabBarController.h
View file

@ -44,7 +44,7 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
@protocol MasterTabBarControllerDelegate;
@class RoomPresentationParameters;
@class RoomPreviewPresentationParameters;
@class UniversalLinkPresentationParameters;
@class ScreenPresentationParameters;
@interface MasterTabBarController : UITabBarController
@ -97,7 +97,7 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
*/
- (void)selectContact:(MXKContact*)contact;
- (void)selectContact:(MXKContact*)contact withPresentationParameters:(UniversalLinkPresentationParameters*)presentationParameters;
- (void)selectContact:(MXKContact*)contact withPresentationParameters:(ScreenPresentationParameters*)presentationParameters;
/**
Open a GroupDetailsViewController to display the information of the provided group.
@ -107,7 +107,7 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
*/
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession;
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(UniversalLinkPresentationParameters*)presentationParameters;
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(ScreenPresentationParameters*)presentationParameters;
/**
Release the current selected item (if any).
@ -194,7 +194,7 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectRoomWithParameters:(RoomPresentationParameters*)roomPresentationParameters completion:(void (^)(void))completion;
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectRoomPreviewWithParameters:(RoomPreviewPresentationParameters*)roomPreviewPresentationParameters completion:(void (^)(void))completion;
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectContact:(MXKContact*)contact withPresentationParameters:(UniversalLinkPresentationParameters*)presentationParameters;
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(UniversalLinkPresentationParameters*)presentationParameters;
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectContact:(MXKContact*)contact withPresentationParameters:(ScreenPresentationParameters*)presentationParameters;
- (void)masterTabBarController:(MasterTabBarController *)masterTabBarController didSelectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(ScreenPresentationParameters*)presentationParameters;
@end

8
Riot/Modules/TabBar/MasterTabBarController.m
View file

@ -616,12 +616,12 @@
- (void)selectContact:(MXKContact*)contact
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
[self selectContact:contact withPresentationParameters:presentationParameters];
}
- (void)selectContact:(MXKContact*)contact withPresentationParameters:(UniversalLinkPresentationParameters*)presentationParameters
- (void)selectContact:(MXKContact*)contact withPresentationParameters:(ScreenPresentationParameters*)presentationParameters
{
[self releaseSelectedItem];
@ -634,12 +634,12 @@
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession
{
UniversalLinkPresentationParameters *presentationParameters = [[UniversalLinkPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES stackAboveVisibleViews:NO];
[self selectGroup:group inMatrixSession:matrixSession presentationParameters:presentationParameters];
}
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(UniversalLinkPresentationParameters*)presentationParameters
- (void)selectGroup:(MXGroup*)group inMatrixSession:(MXSession*)matrixSession presentationParameters:(ScreenPresentationParameters*)presentationParameters
{
[self releaseSelectedItem];

8
Riot/Modules/TabBar/TabBarCoordinator.swift
View file

@ -340,7 +340,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
}
// FIXME: Should be displayed from a tab.
private func showContactDetails(with contact: MXKContact, presentationParameters: UniversalLinkPresentationParameters) {
private func showContactDetails(with contact: MXKContact, presentationParameters: ScreenPresentationParameters) {
let coordinatorParameters = ContactDetailsCoordinatorParameters(contact: contact)
let coordinator = ContactDetailsCoordinator(parameters: coordinatorParameters)
@ -353,7 +353,7 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
}
// FIXME: Should be displayed from a tab.
private func showGroupDetails(with group: MXGroup, for matrixSession: MXSession, presentationParameters: UniversalLinkPresentationParameters) {
private func showGroupDetails(with group: MXGroup, for matrixSession: MXSession, presentationParameters: ScreenPresentationParameters) {
let coordinatorParameters = GroupDetailsCoordinatorParameters(session: matrixSession, group: group)
let coordinator = GroupDetailsCoordinator(parameters: coordinatorParameters)
coordinator.start()
@ -536,7 +536,7 @@ extension TabBarCoordinator: MasterTabBarControllerDelegate {
self.showRoomPreview(withPresentationParameters: roomPreviewPresentationParameters, completion: completion)
}
func masterTabBarController(_ masterTabBarController: MasterTabBarController!, didSelect contact: MXKContact!, with presentationParameters: UniversalLinkPresentationParameters!) {
func masterTabBarController(_ masterTabBarController: MasterTabBarController!, didSelect contact: MXKContact!, with presentationParameters: ScreenPresentationParameters!) {
self.showContactDetails(with: contact, presentationParameters: presentationParameters)
}
@ -548,7 +548,7 @@ extension TabBarCoordinator: MasterTabBarControllerDelegate {
self.showRoom(with: roomId, eventId: eventId, matrixSession: matrixSession, completion: completion)
}
func masterTabBarController(_ masterTabBarController: MasterTabBarController!, didSelect group: MXGroup!, inMatrixSession matrixSession: MXSession!, presentationParameters: UniversalLinkPresentationParameters!) {
func masterTabBarController(_ masterTabBarController: MasterTabBarController!, didSelect group: MXGroup!, inMatrixSession matrixSession: MXSession!, presentationParameters: ScreenPresentationParameters!) {
self.showGroupDetails(with: group, for: matrixSession, presentationParameters: presentationParameters)
}