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

Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list

Browse Source
This commit is contained in:
ismailgulek
2021-11-22 14:59:07 +03:00
parent 3e88563915 84cfd33700
commit 2f34603f1c
6 changed files with 79 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+29 -4
View File
@@ -1515,6 +1515,17 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
return item;
}
- (UIBarButtonItem *)threadMoreBarButtonItem
{
UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"room_context_menu_more"]
style:UIBarButtonItemStylePlain
target:self
action:@selector(onThreadMoreTapped:)];
item.accessibilityLabel = [VectorL10n roomAccessibilityThreadMore];
return item;
}
- (UIBarButtonItem *)threadListBarButtonItem
{
UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"room_context_menu_reply_in_thread"]
@@ -1522,7 +1533,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
target:self
action:@selector(onThreadListTapped:)];
item.accessibilityLabel = [VectorL10n roomAccessibilityThreads];
return item;
}
@@ -1758,10 +1768,20 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
[self refreshMissedDiscussionsCount:YES];
if (RiotSettings.shared.enableThreads && !self.roomDataSource.threadId)
if (RiotSettings.shared.enableThreads)
{
UIBarButtonItem *itemThreadList = [self threadListBarButtonItem];
[rightBarButtonItems insertObject:itemThreadList atIndex:0];
if (self.roomDataSource.threadId)
{
// in a thread
UIBarButtonItem *itemThreadMore = [self threadMoreBarButtonItem];
[rightBarButtonItems insertObject:itemThreadMore atIndex:0];
}
else
{
// in a regular timeline
UIBarButtonItem *itemThreadList = [self threadListBarButtonItem];
[rightBarButtonItems insertObject:itemThreadList atIndex:0];
}
}
}
@@ -4345,6 +4365,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
[self placeCallWithVideo:YES];
}
- (IBAction)onThreadMoreTapped:(id)sender
{
// TODO: Implement when design ready
}
- (IBAction)onThreadListTapped:(id)sender
{
self.threadsCoordinatorBridgePresenter = [[ThreadsCoordinatorBridgePresenter alloc] initWithSession:self.mainSession