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

Merge branch 'element_4087' into element_4134

Browse Source
This commit is contained in:
Gil Eluard
2021-04-07 11:15:22 +02:00
parent 0a244a15e4 327af6d35e
commit da9455730a
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+16 -4
View File
@@ -1721,6 +1721,10 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
}
- (void)setupActions {
if (![self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
return;
}
RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
__weak typeof(self) weakSelf = self;
roomInputView.actionsBar.actionItems = @[
@@ -1728,7 +1732,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
if (weakSelf)
{
typeof(self) self = weakSelf;
roomInputView.actionMenuOpened = NO;
if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
}
[self showCameraControllerAnimated:YES];
}
}],
@@ -1736,7 +1742,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
if (weakSelf)
{
typeof(self) self = weakSelf;
roomInputView.actionMenuOpened = NO;
if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
}
[self showMediaPickerAnimated:YES];
}
}],
@@ -1744,7 +1752,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
if (weakSelf)
{
typeof(self) self = weakSelf;
roomInputView.actionMenuOpened = NO;
if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
}
[self roomInputToolbarViewPresentStickerPicker];
}
}],
@@ -1752,7 +1762,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
if (weakSelf)
{
typeof(self) self = weakSelf;
roomInputView.actionMenuOpened = NO;
if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
}
[self roomInputToolbarViewDidTapFileUpload];
}
}],