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

Merge branch 'develop' into steve/5903_lls_start

Browse Source 
# Conflicts:
#	Riot/Modules/Room/RoomViewController.h
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
This commit is contained in:
SBiOSoftWhare
2022-04-08 11:09:06 +02:00
parent ad0bf639a8 1f6fb2b2bf
commit 92a721c8b9
221 changed files with 8846 additions and 1792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.h
+5 -17
View File
@@ -31,6 +31,7 @@
@class UniversalLinkParameters;
@protocol RoomViewControllerDelegate;
@class RoomDisplayConfiguration;
@class ThreadsCoordinatorBridgePresenter;
@class LiveLocationSharingBannerView;
NS_ASSUME_NONNULL_BEGIN
@@ -90,15 +91,7 @@ extern NSNotificationName const RoomGroupCallTileTappedNotification;
*/
@property (nonatomic, nullable) NSString *parentSpaceId;
/// Handles all banners that should be displayed at the top of the timeline but that should not scroll with the timeline
@property (weak, nonatomic, nullable) IBOutlet UIStackView *topBannersStackView;
/// Indicate YES to show live location sharing banner
@property (nonatomic, readonly) BOOL shouldShowLiveLocationSharingBannerView;
/// Displayed live location sharing banner if any
@property (nonatomic, weak) LiveLocationSharingBannerView *liveLocationSharingBannerView;
@property (nonatomic, getter=isContextPreview) BOOL contextPeview;
/**
Display the preview of a room that is unknown for the user.
@@ -264,14 +257,6 @@ canEditPollWithEventIdentifier:(NSString *)eventIdentifier;
- (void)roomViewController:(RoomViewController *)roomViewController
didRequestEditForPollWithStartEvent:(MXEvent *)startEvent;
/**
Checks whether the delegate supports handling of activity indicators
Note: This is a transition API whilst `RoomViewController` contains legacy activity indicators
as well as using a newer user interaction presenters.
*/
- (BOOL)roomViewControllerCanDelegateUserIndicators:(RoomViewController *)roomViewController;
/**
Indicate to the delegate that loading should start
@@ -294,6 +279,9 @@ didRequestEditForPollWithStartEvent:(MXEvent *)startEvent;
/// User tap live location sharing banner
- (void)roomViewControllerDidTapLiveLocationSharingBanner:(RoomViewController *)roomViewController;
/// Request a threads coordinator for a given threadId, used to open a thread from within a room.
- (nullable ThreadsCoordinatorBridgePresenter *)threadsCoordinatorForRoomViewController:(RoomViewController *)roomViewController threadId:(nullable NSString *)threadId;
@end
NS_ASSUME_NONNULL_END