Fix conflict.

This commit is contained in:
SBiOSoftWhare
2020-11-13 09:47:39 +01:00
parent e7d622fe40
commit 07b6acf338
5 changed files with 115 additions and 20 deletions
@@ -25,6 +25,13 @@
*/
extern NSString *const kInviteRecentTableViewCellPreviewButtonPressed;
/**
Action identifier used when the user pressed 'accept' button displayed on room invitation.
The `userInfo` dictionary contains an `MXRoom` object under the `kInviteRecentTableViewCellRoomKey` key, representing the room of the invitation.
*/
extern NSString *const kInviteRecentTableViewCellAcceptButtonPressed;
/**
Action identifier used when the user pressed 'decline' button displayed on room invitation.
@@ -45,6 +52,9 @@ extern NSString *const kInviteRecentTableViewCellRoomKey;
@property (weak, nonatomic) IBOutlet UIButton *leftButton;
@property (weak, nonatomic) IBOutlet UIButton *rightButton;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *leftButtonActivityIndicator;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *rightButtonActivityIndicator;
@property (weak, nonatomic) IBOutlet UIView *noticeBadgeView;