Rename RoomExtraInfosView into RoomActivitiesView

Vector/ViewController/RoomViewController.m

@@ -21,7 +21,7 @@
 
 #import "RoomInputToolbarView.h"
 
-#import "RoomExtraInfosInfoView.h"
+#import "RoomActivitiesView.h"
 
 #import "RoomParticipantsViewController.h"
 
@@ -58,7 +58,7 @@
     [self roomInputToolbarView:self.inputToolbarView heightDidChanged:((RoomInputToolbarView*)self.inputToolbarView).mainToolbarHeightConstraint.constant completion:nil];
     
     // set extra area
-    [self setRoomExtraInfoViewClass:RoomExtraInfosInfoView.class];
+    [self setRoomActivitiesViewClass:RoomActivitiesView.class];
     
     // Set rageShake handler
     self.rageShakeManager = [RageShakeManager sharedManager];
@@ -497,7 +497,10 @@
         text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_many_users_are_typing", @"Vector", nil), [names objectAtIndex:0], [names objectAtIndex:1]];
     }
     
-    [((RoomExtraInfosInfoView*) self.extraInfoView) updateTypingMessage:text];
+    if (self.activitiesView)
+    {
+        [((RoomActivitiesView*) self.activitiesView) updateTypingMessage:text];
+    }
 }
 
 @end

Vector/Views/RoomActivitiesView/RoomActivitiesView.h

@@ -20,7 +20,7 @@
 /**
  `RoomExtraInfosInfoView` instance is a view used to display extra information
  */
-@interface RoomExtraInfosInfoView : MXKRoomExtraInfoView
+@interface RoomActivitiesView : MXKRoomActivitiesView
 
 @property (weak, nonatomic) IBOutlet UIImageView *typingImageView;
 @property (weak, nonatomic) IBOutlet UILabel *messageLabel;

Vector/Views/RoomActivitiesView/RoomActivitiesView.m

@@ -14,26 +14,14 @@
  limitations under the License.
  */
 
-#import "RoomExtraInfosInfoView.h"
+#import "RoomActivitiesView.h"
 
-@implementation RoomExtraInfosInfoView
+@implementation RoomActivitiesView
 
 + (UINib *)nib
 {
-    return [UINib nibWithNibName:NSStringFromClass([RoomExtraInfosInfoView class])
-                          bundle:[NSBundle bundleForClass:[RoomExtraInfosInfoView class]]];
-}
-
-+ (instancetype)roomExtraInfoView
-{
-    if ([[self class] nib])
-    {
-        return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
-    }
-    else
-    {
-        return [[self alloc] init];
-    }
+    return [UINib nibWithNibName:NSStringFromClass([RoomActivitiesView class])
+                          bundle:[NSBundle bundleForClass:[RoomActivitiesView class]]];
 }
 
 - (CGFloat)height

Vector/Views/RoomActivitiesView/RoomActivitiesView.xib

@@ -7,7 +7,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" userLabel="Room Extras Infos View" customClass="RoomExtraInfosInfoView">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" userLabel="Room Extras Infos View" customClass="RoomActivitiesView">
             <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>