mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-20 16:42:44 +02:00
Fix conflict.
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user