Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions

Riot/Modules/Room/RoomViewController.m

@@ -1514,6 +1514,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;
+}
+
 - (void)setupRemoveJitsiWidgetRemoveView
 {
     if (!self.displayConfiguration.jitsiWidgetRemoverEnabled)
@@ -1745,6 +1756,15 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         }
         
         [self refreshMissedDiscussionsCount:YES];
+        
+        if (RiotSettings.shared.enableThreads)
+        {
+            if (self.roomDataSource.threadId)
+            {
+                UIBarButtonItem *itemThreadMore = [self threadMoreBarButtonItem];
+                [rightBarButtonItems insertObject:itemThreadMore atIndex:0];
+            }
+        }
     }
     
     self.navigationItem.rightBarButtonItems = rightBarButtonItems;
@@ -4327,6 +4347,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     [self placeCallWithVideo:YES];
 }
 
+- (IBAction)onThreadMoreTapped:(id)sender
+{
+    //  TODO: Implement when design ready
+}
+
 - (IBAction)onIntegrationsPressed:(id)sender
 {
     WidgetPickerViewController *widgetPicker = [[WidgetPickerViewController alloc] initForMXSession:self.roomDataSource.mxSession