-> MXKRoomDetailsViewController becomes MXKSettingsDetailsViewController

-> The room details is now properly launched.

Vector/Assets/en.lproj/Vector.strings

@@ -86,6 +86,8 @@
 // Room Details
 "room_details_room_name" = "Room Name";
 "room_details_topic" = "Topic";
+"room_details_people" = "People";
+"room_details_settings" = "Settings";
 
 "notification_settings_global_notification_settings" = "Global Notification Settings";
 

Vector/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <scenes>
         <!--RecentsNav-->
@@ -44,10 +44,10 @@
             </objects>
             <point key="canvasLocation" x="1364" y="-1063"/>
         </scene>
-        <!--Room Details View Controller-->
+        <!--Segmented View Controller-->
         <scene sceneID="NZu-Q0-P0z">
             <objects>
-                <tableViewController id="e7G-NU-7ck" customClass="RoomDetailsViewController" sceneMemberID="viewController"/>
+                <tableViewController id="e7G-NU-7ck" customClass="SegmentedViewController" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fXh-hO-Zgf" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2326" y="-1063"/>

Vector/ViewController/RoomSettingsViewController.h

@@ -16,7 +16,7 @@
 
 #import <MatrixKit/MatrixKit.h>
 
-@interface RoomDetailsViewController : MXKRoomDetailsViewController<UITextViewDelegate>
+@interface RoomSettingsViewController : MXKRoomSettingsViewController<UITextViewDelegate>
 
 @end
 

Vector/ViewController/RoomSettingsViewController.m

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import "RoomDetailsViewController.h"
+#import "RoomSettingsViewController.h"
 
 #import "TableViewCellWithLabelAndTextField.h"
 #import "TableViewCellWithLabelAndLargeTextView.h"
@@ -30,7 +30,7 @@
 
 #define ROOM_TOPIC_CELL_HEIGHT 99
 
-@interface RoomDetailsViewController ()
+@interface RoomSettingsViewController ()
 {
     // updated user data
     NSMutableDictionary<NSString*, id> *updatedItems;
@@ -44,7 +44,7 @@
 }
 @end
 
-@implementation RoomDetailsViewController
+@implementation RoomSettingsViewController
 
 - (void)viewDidLoad
 {
@@ -57,7 +57,7 @@
     self.tableView.backgroundColor = [UIColor colorWithRed:item green:item blue:item alpha:item];
     self.tableView.separatorColor = [UIColor clearColor];
     
-    // Setup `RoomDetailsViewController` properties
+    // Setup `RoomSettingsViewController` properties
     self.rageShakeManager = [RageShakeManager sharedManager];
 }
 

Vector/ViewController/RoomViewController.m

@@ -25,7 +25,8 @@
 
 #import "RoomParticipantsViewController.h"
 
-#import "RoomDetailsViewController.h"
+#import "SegmentedViewController.h"
+#import "RoomSettingsViewController.h"
 
 @interface RoomViewController ()
 {
@@ -234,18 +235,37 @@
     
     if ([[segue identifier] isEqualToString:@"showRoomDetails"])
     {
-        if ([pushedViewController isKindOfClass:[RoomDetailsViewController class]])
+        if ([pushedViewController isKindOfClass:[SegmentedViewController class]])
         {
             // Dismiss keyboard
             [self dismissKeyboard];
             
-            RoomDetailsViewController* detailsViewController = (RoomDetailsViewController*)pushedViewController;
-            [detailsViewController initWithSession:self.roomDataSource.mxSession andRoomId:self.roomDataSource.roomId];
+            SegmentedViewController* segmentedViewController = (SegmentedViewController*)pushedViewController;
+            
+            MXSession* session = self.roomDataSource.mxSession;
+            NSString* roomid = self.roomDataSource.roomId;
+            
+            NSMutableArray* viewControllers = [[NSMutableArray alloc] init];
+            NSMutableArray* titles = [[NSMutableArray alloc] init];
+            
+            // members screens
+            [titles addObject: NSLocalizedStringFromTable(@"room_details_people", @"Vector", nil)];
+            
+            RoomParticipantsViewController* participantsViewController = [[RoomParticipantsViewController alloc] init];
+            participantsViewController.mxRoom = [session roomWithRoomId:roomid];
+            [viewControllers addObject:participantsViewController];
+            
+            [titles addObject: NSLocalizedStringFromTable(@"room_details_settings", @"Vector", nil)];
+            RoomSettingsViewController *settingsViewController = [RoomSettingsViewController roomSettingsViewController];
+            [settingsViewController initWithSession:session andRoomId:roomid];
+            [viewControllers addObject:settingsViewController];
+            
+            [segmentedViewController initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
         }
     }
     
     // Hide back button title
-    self.navigationItem.backBarButtonItem =[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
+    self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
 }
 
 #pragma mark - MXKRoomInputToolbarViewDelegate

Vector/ViewController/SegmentedViewController.m

@@ -80,25 +80,33 @@
 
 - (void)addConstraint:(UIView*)view constraint:(NSLayoutConstraint*)aConstraint
 {
-    if ([NSLayoutConstraint respondsToSelector:@selector(activateConstraints:)])
+    // sanity check
+    if (view && aConstraint)
     {
-        [NSLayoutConstraint activateConstraints:@[aConstraint]];
-    }
-    else
-    {
-        [view addConstraint:aConstraint];
+        if ([NSLayoutConstraint respondsToSelector:@selector(activateConstraints:)])
+        {
+            [NSLayoutConstraint activateConstraints:@[aConstraint]];
+        }
+        else
+        {
+            [view addConstraint:aConstraint];
+        }
     }
 }
 
 - (void)removeConstraint:(UIView*)view constraint:(NSLayoutConstraint*)aConstraint
 {
-    if ([NSLayoutConstraint respondsToSelector:@selector(deactivateConstraints:)])
+    // sanity check
+    if (view && aConstraint)
     {
-        [NSLayoutConstraint deactivateConstraints:@[aConstraint]];
-    }
-    else
-    {
-        [view removeConstraint:aConstraint];
+        if ([NSLayoutConstraint respondsToSelector:@selector(deactivateConstraints:)])
+        {
+            [NSLayoutConstraint deactivateConstraints:@[aConstraint]];
+        }
+        else
+        {
+            [view removeConstraint:aConstraint];
+        }
     }
 }