Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge

Merge MatrixKit repository into Element

Riot/Modules/Room/Views/Activities/RoomActivitiesView.h

@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 
 /**

Riot/Modules/Room/Views/BubbleCells/BaseBubbleCell/BaseBubbleCell.swift

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import UIKit
-import MatrixKit
 
 @objc protocol BaseBubbleCellType: Themable {
     var bubbleCellContentView: BubbleCellContentView? { get }

Riot/Modules/Room/Views/BubbleCells/Encryption/RoomEncryptedDataBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  Action identifier used when the user tapped on the marker displayed in front of an encrypted event.

Riot/Modules/Room/Views/BubbleCells/RoomEmptyBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomEmptyBubbleCell` displays empty bubbles.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentBubbleCell` displays incoming attachment bubbles with sender's information.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentWithPaginationTitleBubbleCell` displays incoming attachment bubbles with sender's information and a pagination title.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingAttachmentWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgBubbleCell` displays incoming message bubbles with sender's information.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgWithPaginationTitleBubbleCell` displays incoming message bubbles with sender's information.

Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomIncomingTextMsgWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.

Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingAttachmentBubbleCell` displays outgoing attachment bubbles.

Riot/Modules/Room/Views/BubbleCells/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 #import "RoomOutgoingAttachmentBubbleCell.h"
 
 /**

Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingTextMsgBubbleCell` displays outgoing message bubbles with user's picture and name.

Riot/Modules/Room/Views/BubbleCells/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `RoomOutgoingTextMsgWithoutSenderInfoBubbleCell` displays outgoing message bubbles without user's name.

Riot/Modules/Room/Views/BubbleCells/RoomPredecessorBubbleCell.h

@@ -16,7 +16,8 @@
 
 
 @import UIKit;
-@import MatrixKit;
+
+#import "MatrixKit.h"
 
 @interface RoomPredecessorBubbleCell : MXKRoomBubbleTableViewCell
 

Riot/Modules/Room/Views/Event/EventDetailsView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface EventDetailsView : MXKEventDetailsView
 

Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  `DisabledRoomInputToolbarView` instance is an input toolbar to show to the end user

Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "MediaPickerViewController.h"
 

Riot/Modules/Room/Views/Title/Avatar/RoomAvatarTitleView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 @interface RoomAvatarTitleView : MXKRoomTitleView
 

Riot/Modules/Room/Views/Title/RoomTitleView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 #import "RoomPreviewData.h"
 

Riot/Modules/Room/Views/Title/Simple/SimpleRoomTitleView.h

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-#import <MatrixKit/MatrixKit.h>
+#import "MatrixKit.h"
 
 /**
  This title view display the room display name only.
@@ -24,4 +24,4 @@
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *displayNameCenterXConstraint;
 
-@end
+@end