Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
This commit is contained in:
Gil Eluard
2022-01-13 16:30:55 +01:00
294 changed files with 5987 additions and 914 deletions
+18
View File
@@ -202,6 +202,24 @@ handleUniversalLinkWithParameters:(UniversalLinkParameters*)parameters;
*/
- (void)roomViewControllerDidRequestPollCreationFormPresentation:(RoomViewController *)roomViewController;
/**
Ask the coordinator to invoke the location sharing form coordinator.
@param roomViewController the `RoomViewController` instance.
*/
- (void)roomViewControllerDidRequestLocationSharingFormPresentation:(RoomViewController *)roomViewController;
/**
Ask the coordinator to invoke the location sharing form coordinator.
@param roomViewController the `RoomViewController` instance.
@param event the event containing location information
@param bubbleData the bubble data containing sender details
*/
- (void)roomViewController:(RoomViewController *)roomViewController
didRequestLocationPresentationForEvent:(MXEvent *)event
bubbleData:(id<MXKRoomBubbleCellDataStoring>)bubbleData;
- (BOOL)roomViewController:(RoomViewController *)roomViewController
canEndPollWithEventIdentifier:(NSString *)eventIdentifier;