Merge branch 'develop' into gil/SP1_space_creation

# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
This commit is contained in:
Gil Eluard
2022-03-04 13:38:18 +01:00
285 changed files with 18032 additions and 18206 deletions
+24
View File
@@ -253,6 +253,30 @@ 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
Note: Only called if the controller can delegate user indicators rather than managing
loading indicators internally
*/
- (void)roomViewControllerDidStartLoading:(RoomViewController *)roomViewController;
/**
Indicate to the delegate that loading should stop
Note: Only called if the controller can delegate user indicators rather than managing
loading indicators internally
*/
- (void)roomViewControllerDidStopLoading:(RoomViewController *)roomViewController;
@end
NS_ASSUME_NONNULL_END