Make code compatible with !use_frameworks in Podfile

2024-09-28 15:22:39 +00:00 · 2017-11-23 16:09:19 +01:00 · 2017-11-23 16:09:19 +01:00 · 45f07ab466
commit 45f07ab466
parent 20cd1f96fb
33 changed files with 38 additions and 46 deletions
--- a/Riot/API/RageShakeManager.m
+++ b/Riot/API/RageShakeManager.m
@ -22,7 +22,7 @@
 #import "AppDelegate.h"
 #import "BugReportViewController.h"

-#import "NSBundle+MatrixKit.h"
+#import <MatrixKit/MatrixKit.h>

 static RageShakeManager* sharedInstance = nil;

--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@ -34,8 +34,7 @@
 #import "BugReportViewController.h"
 #import "RoomKeyRequestViewController.h"

-#import "NSBundle+MatrixKit.h"
-#import "MatrixSDK/MatrixSDK.h"
+#import <MatrixKit/MatrixKit.h>

 #import "Tools.h"
 #import "WidgetManager.h"
@ -49,9 +48,6 @@
 // Calls
 #import "CallViewController.h"

-#import <MatrixSDK/MXCallKitAdapter.h>
-#import <MatrixSDK/MXCallKitConfiguration.h>
-
 #import "MXSession+Riot.h"
 #import "MXRoom+Riot.h"

--- a/Riot/Model/Room/RoomBubbleCellData.h
+++ b/Riot/Model/Room/RoomBubbleCellData.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomBubbleCellDataWithAppendingMode.h"
+#import <MatrixKit/MatrixKit.h>

 // Custom tags for MXKRoomBubbleCellDataStoring.tag
 typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
--- a/Riot/Model/Room/RoomPreviewData.h
+++ b/Riot/Model/Room/RoomPreviewData.h
@ -16,8 +16,8 @@

 #import <Foundation/Foundation.h>

+#import <MatrixKit/MatrixKit.h>
 #import "RoomEmailInvitation.h"
-#import "MXSession.h"
 #import "RoomDataSource.h"

 /**
--- a/Riot/Model/RoomList/HomeMessagesSearchDataSource.m
+++ b/Riot/Model/RoomList/HomeMessagesSearchDataSource.m
@ -15,6 +15,8 @@
 limitations under the License.
 */

+#import <MatrixKit/MatrixKit.h>
+
 #import "HomeMessagesSearchDataSource.h"

 #import "RoomBubbleCellData.h"
--- a/Riot/Model/RoomList/RecentCellData.h
+++ b/Riot/Model/RoomList/RecentCellData.h
@ -17,7 +17,8 @@
 #import <Foundation/Foundation.h>
 #import <MatrixSDK/MatrixSDK.h>

-#import "MXKRecentCellData.h"
+#import <MatrixKit/MatrixKit.h>
+
 /**
 `RecentCellData` is Vector cuustomized MXKRecentCellData` cell.
 */
--- a/Riot/Utils/Widgets/WidgetManager.m
+++ b/Riot/Utils/Widgets/WidgetManager.m
@ -16,7 +16,7 @@

 #import "WidgetManager.h"

-#import "MXKAppSettings.h"
+#import <MatrixKit/MatrixKit.h>

 #pragma mark - Contants

--- a/Riot/ViewController/MediaPickerViewController.m
+++ b/Riot/ViewController/MediaPickerViewController.m
@ -29,7 +29,7 @@

 #import "MediaAlbumTableCell.h"

-#import "MXKPieChartView.h"
+#import <MatrixKit/MatrixKit.h>

 static void *CapturingStillImageContext = &CapturingStillImageContext;
 static void *RecordingContext = &RecordingContext;
--- a/Riot/ViewController/RecentsViewController.m
+++ b/Riot/ViewController/RecentsViewController.m
@ -23,7 +23,7 @@

 #import "MXRoom+Riot.h"

-#import "NSBundle+MatrixKit.h"
+#import <MatrixKit/MatrixKit.h>

 #import "RoomViewController.h"

--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@ -17,7 +17,8 @@

 #import "SettingsViewController.h"

-#import <MatrixSDK/MXCallKitAdapter.h>
+#import <MatrixKit/MatrixKit.h>
+
 #import <MediaPlayer/MediaPlayer.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <OLMKit/OLMKit.h>
@ -26,7 +27,6 @@
 #import "AppDelegate.h"
 #import "AvatarGenerator.h"

-#import "MXKEncryptionKeysExportView.h"
 #import "BugReportViewController.h"

 #import "WebViewViewController.h"
--- a/Riot/Views/Contact/ContactTableViewCell.m
+++ b/Riot/Views/Contact/ContactTableViewCell.m
@ -17,7 +17,7 @@

 #import "ContactTableViewCell.h"

-#import "MXKContactManager.h"
+#import <MatrixKit/MatrixKit.h>

 #import "RiotDesignValues.h"

--- a/Riot/Views/Directory/DirectoryServerTableViewCell.h
+++ b/Riot/Views/Directory/DirectoryServerTableViewCell.h
@ -16,8 +16,6 @@

 #import <MatrixKit/MatrixKit.h>

-#import "MXKDirectoryServerCellDataStoring.h"
-
 /**
 The `DirectoryServerTableViewCell` cell displays a server .
 */
--- a/Riot/Views/MediaAlbum/MediaAlbumTableCell.h
+++ b/Riot/Views/MediaAlbum/MediaAlbumTableCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 'MediaAlbumTableCell' is a base class for displaying a user album.
--- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingAttachmentBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingAttachmentBubbleCell` displays incoming attachment bubbles with sender's information.
--- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingAttachmentBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingAttachmentWithPaginationTitleBubbleCell` displays incoming attachment bubbles with sender's information and a pagination title.
--- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingAttachmentWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
--- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingTextMsgBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingTextMsgBubbleCell` displays incoming message bubbles with sender's information.
--- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingTextMsgBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingTextMsgWithPaginationTitleBubbleCell` displays incoming message bubbles with sender's information.
--- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomIncomingTextMsgWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information.
--- a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomOutgoingAttachmentBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomOutgoingAttachmentBubbleCell` displays outgoing attachment bubbles.
--- a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>
 #import "RoomOutgoingAttachmentBubbleCell.h"

 /**
--- a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomOutgoingTextMsgBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomOutgoingTextMsgBubbleCell` displays outgoing message bubbles with user's picture and name.
--- a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `RoomOutgoingTextMsgWithoutSenderInfoBubbleCell` displays outgoing message bubbles without user's name.
--- a/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m
+++ b/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m
@ -16,7 +16,7 @@
 */

 #import <Foundation/Foundation.h>
-#import <HPGrowingTextView.h>
+#import <HPGrowingTextView/HPGrowingTextView.h>
 #import "RoomInputToolbarView.h"

@interface KeyboardGrowingTextView: HPGrowingTextView
--- a/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h
+++ b/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomBubbleTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `MessagesSearchResultAttachmentBubbleCell` displays an attachment with the information of the room and the sender.
--- a/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h
+++ b/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKRoomBubbleTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

 /**
 `MessagesSearchResultTextMsgBubbleCell` displays a message text with the information of the room and the sender.
--- a/Riot/Views/TableViewCell/TableViewCellWithButton.h
+++ b/Riot/Views/TableViewCell/TableViewCellWithButton.h
@ -14,8 +14,8 @@
 limitations under the License.
 */

-#import "MXKTableViewCellWithButton.h"
+#import <MatrixKit/MatrixKit.h>

@interface TableViewCellWithButton : MXKTableViewCellWithButton

-@end
+@end
--- a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h
+++ b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

@interface TableViewCellWithCheckBoxAndLabel : MXKTableViewCell

--- a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h
+++ b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

@class TableViewCellWithCheckBoxes;

@ -88,4 +88,4 @@
 */
 - (BOOL)checkBoxValueAtIndex:(NSUInteger)index;

-@end
+@end
--- a/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h
+++ b/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h
@ -14,7 +14,7 @@
 limitations under the License.
 */

-#import "MXKTableViewCell.h"
+#import <MatrixKit/MatrixKit.h>

@interface TableViewCellWithLabelAndLargeTextView : MXKTableViewCell <UITextViewDelegate>

@ -27,4 +27,4 @@
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *textViewWidthConstraint;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *textViewTrailingConstraint;

-@end
+@end
--- a/RiotShareExtension/Model/ShareExtensionManager.m
+++ b/RiotShareExtension/Model/ShareExtensionManager.m
@ -16,7 +16,7 @@

 #import "ShareExtensionManager.h"
 #import "SharePresentingViewController.h"
-#import "MXKPieChartHUD.h"
+#import <MatrixKit/MatrixKit.h>
@import MobileCoreServices;
 #import "objc/runtime.h"

--- a/RiotShareExtension/ViewController/RoomsListViewController.m
+++ b/RiotShareExtension/ViewController/RoomsListViewController.m
@ -20,8 +20,7 @@
 #import "ShareExtensionManager.h"
 #import "RecentCellData.h"
 #import "RiotDesignValues.h"
-#import "MXKPieChartView.h"
-#import "MXKPieChartHUD.h"
+#import <MatrixKit/MatrixKit.h>

@interface RoomsListViewController () <ShareExtensionManagerDelegate>

--- a/SiriIntents/IntentHandler.m
+++ b/SiriIntents/IntentHandler.m
@ -16,11 +16,7 @@

 #import "IntentHandler.h"

-#import "MXKAccount.h"
-#import "MXKAccountManager.h"
-#import "MXFileStore.h"
-#import "MXRestClient.h"
-#import "MXSession.h"
+#import <MatrixKit/MatrixKit.h>

@interface IntentHandler () <INStartAudioCallIntentHandling, INStartVideoCallIntentHandling, INSendMessageIntentHandling>