Improve the Obj-C Generated Interface Header Name definition

2024-09-28 15:22:39 +00:00 · 2021-10-26 17:42:33 +02:00 · 2021-10-26 17:42:33 +02:00 · c6c3eaaec1
commit c6c3eaaec1
parent 8768eb2e76
149 changed files with 157 additions and 193 deletions
--- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
+++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
@ -20,7 +20,7 @@
 #import "RoomBubbleCellData.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import <objc/runtime.h>

--- a/Riot/Categories/MXRoomSummary+Riot.m
+++ b/Riot/Categories/MXRoomSummary+Riot.m
@ -19,11 +19,7 @@

 #import "AvatarGenerator.h"

-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"

@implementation MXRoomSummary (Riot)

--- a/Riot/Categories/MXSession+Riot.m
+++ b/Riot/Categories/MXSession+Riot.m
@ -17,7 +17,7 @@
 #import "MXSession+Riot.h"

 #import "MXRoom+Riot.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation MXSession (Riot)

--- a/Riot/Categories/UIViewController+RiotSearch.m
+++ b/Riot/Categories/UIViewController+RiotSearch.m
@ -20,7 +20,7 @@
 #import <objc/runtime.h>

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 /**
 `UIViewControllerRiotSearchInternals` is the internal single point storage for the search feature.
--- a/Riot/Common.xcconfig
+++ b/Riot/Common.xcconfig
@ -30,3 +30,5 @@ CODE_SIGN_ENTITLEMENTS = Riot/SupportingFiles/Riot.entitlements

 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
+
+SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@ -16,7 +16,7 @@

 #import "Analytics.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"


 NSString *const AnalyticsNoficationsCategory = @"notifications";
--- a/Riot/Managers/AppInfo/BuildInfo.m
+++ b/Riot/Managers/AppInfo/BuildInfo.m
@ -16,11 +16,7 @@

 #import "BuildInfo.h"

-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"

 #define MAKE_STRING(x) #x
 #define MAKE_NS_STRING(x) @MAKE_STRING(x)
--- a/Riot/Managers/BugReport/RageShakeManager.m
+++ b/Riot/Managers/BugReport/RageShakeManager.m
@ -23,7 +23,7 @@

 #import <MatrixKit/MatrixKit.h>

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 static RageShakeManager* sharedInstance = nil;

--- a/Riot/Managers/PushNotification/PushNotificationService.m
+++ b/Riot/Managers/PushNotification/PushNotificationService.m
@ -20,7 +20,7 @@
 #import <MatrixKit/MatrixKit.h>

 #import <PushKit/PushKit.h>
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface PushNotificationService()<PKPushRegistryDelegate>

--- a/Riot/Managers/Theme/ThemeService.m
+++ b/Riot/Managers/Theme/ThemeService.m
@ -18,11 +18,7 @@

 #import "ThemeService.h"

-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"

 NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChangeThemeNotification";

--- a/Riot/Managers/Widgets/WidgetManager.m
+++ b/Riot/Managers/Widgets/WidgetManager.m
@ -17,7 +17,7 @@

 #import "WidgetManager.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "JitsiWidgetData.h"
 #import "MXSession+Riot.h"

--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@ -55,7 +55,7 @@
 #import "MXSession+Riot.h"
 #import "MXRoom+Riot.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "PushNotificationService.h"

 //#define MX_CALL_STACK_OPENWEBRTC
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@ -18,15 +18,13 @@

 #import "AuthenticationViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXSession+Riot.h"

 #import "AuthInputsView.h"
 #import "ForgotPasswordInputsView.h"
 #import "AuthFallBackViewController.h"

-#import "Riot-Swift.h"
-
 static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;

@interface AuthenticationViewController () <AuthFallBackViewControllerDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, SetPinCoordinatorBridgePresenterDelegate,
--- a/Riot/Modules/Authentication/Views/AuthInputsView.h
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.h
@ -17,7 +17,7 @@

 #import <MatrixKit/MatrixKit.h>

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface AuthInputsView : MXKAuthInputsView <MXKCountryPickerViewControllerDelegate>

--- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
+++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
@ -19,7 +19,7 @@

 #import "MXHTTPOperation.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface ForgotPasswordInputsView ()

--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@ -16,7 +16,7 @@

 #import "BugReportViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "GBDeviceInfo_iOS.h"

--- a/Riot/Modules/Call/CallViewController.m
+++ b/Riot/Modules/Call/CallViewController.m
@ -18,7 +18,7 @@

 #import "CallViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "AvatarGenerator.h"

--- a/Riot/Modules/Call/Views/IncomingCallView.m
+++ b/Riot/Modules/Call/Views/IncomingCallView.m
@ -22,7 +22,7 @@

 #import "CircleButton.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 static const CGFloat kAvatarSize = 100.0;
 static const CGFloat kButtonSize = 80.0;
--- a/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
+++ b/Riot/Modules/CallTransfer/SelectContact/MatrixContactsDataSource.m
@ -16,7 +16,7 @@

 #import "MatrixContactsDataSource.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation MatrixContactsDataSource

--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@ -26,7 +26,7 @@
 #import "MXSession+Riot.h"
 #import "NSArray+Element.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #define RECENTSDATASOURCE_SECTION_DIRECTORY     0x01
 #define RECENTSDATASOURCE_SECTION_INVITES       0x02
--- a/Riot/Modules/Common/Recents/Model/RecentCellData.m
+++ b/Riot/Modules/Common/Recents/Model/RecentCellData.m
@ -20,11 +20,7 @@
 #import "MXRoom+Riot.h"
 #import "MatrixSDK-Swift.h"

-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"

@implementation RecentCellData

--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@ -32,7 +32,7 @@
 #import "DirectoryRecentTableViewCell.h"
 #import "RoomIdOrAliasTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewControllerDataReadyNotification";

--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@ -23,7 +23,7 @@
 #import "MXRoom+Riot.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXRoomSummary+Riot.h"

--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@ -19,11 +19,7 @@

 #import "ThemeService.h"

-#ifdef IS_SHARE_EXTENSION
-#import "RiotShareExtension-Swift.h"
-#else
-#import "Riot-Swift.h"
-#endif
+#import "GeneratedInterface-Swift.h"

@interface SegmentedViewController ()
 {
--- a/Riot/Modules/Common/WebViewController/WebViewViewController.m
+++ b/Riot/Modules/Common/WebViewController/WebViewViewController.m
@ -15,7 +15,7 @@
 */

 #import "WebViewViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface WebViewViewController ()
 {
--- a/Riot/Modules/Communities/DataSources/GroupsDataSource.m
+++ b/Riot/Modules/Communities/DataSources/GroupsDataSource.m
@ -15,7 +15,7 @@
 */

 #import "GroupsDataSource.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface GroupsDataSource() <BetaAnnounceCellDelegate>

--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@ -19,7 +19,7 @@
 #import "GroupTableViewCell.h"
 #import "GroupInviteTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface GroupsViewController ()
 {
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@ -17,7 +17,7 @@

 #import "GroupHomeViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "ThemeService.h"
 #import "Tools.h"
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@ -16,7 +16,7 @@

 #import "GroupParticipantsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "Contact.h"
 #import "ContactTableViewCell.h"
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@ -16,7 +16,7 @@

 #import "GroupRoomsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "GroupRoomTableViewCell.h"

--- a/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m
+++ b/Riot/Modules/Communities/Rooms/Views/GroupRoomTableViewCell.m
@ -20,7 +20,7 @@
 #import "AvatarGenerator.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation GroupRoomTableViewCell

--- a/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
+++ b/Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m
@ -20,7 +20,7 @@
 #import "GroupParticipantsViewController.h"
 #import "GroupRoomsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface GroupDetailsViewController ()
 {
--- a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
@ -17,7 +17,7 @@
 #import "GroupInviteTableViewCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #pragma mark - Constant definitions

--- a/Riot/Modules/Communities/Views/GroupTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupTableViewCell.m
@ -17,7 +17,7 @@
 #import "GroupTableViewCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXGroup+Riot.h"

--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@ -20,7 +20,7 @@

 #import "UIViewController+RiotSearch.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #define CONTACTS_TABLEVC_LOCALCONTACTS_BITWISE 0x01
 #define CONTACTS_TABLEVC_USERDIRECTORY_BITWISE 0x02
--- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
+++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
@ -21,7 +21,7 @@
 #import "LocalContactsSectionHeaderContainerView.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #define CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE 0x01
 #define CONTACTSDATASOURCE_USERDIRECTORY_BITWISE 0x02
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@ -18,7 +18,7 @@

 #import "ContactDetailsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXSession+Riot.h"

 #import "RoomMemberTitleView.h"
--- a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
+++ b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
@ -18,7 +18,7 @@
 #import "RoomTableViewCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXRoomSummary+Riot.h"

--- a/Riot/Modules/Contacts/Views/ContactTableViewCell.m
+++ b/Riot/Modules/Contacts/Views/ContactTableViewCell.m
@ -20,7 +20,7 @@
 #import <MatrixKit/MatrixKit.h>

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "AvatarGenerator.h"
 #import "Tools.h"
--- a/Riot/Modules/EncryptionInfo/EncryptionInfoView.m
+++ b/Riot/Modules/EncryptionInfo/EncryptionInfoView.m
@ -18,7 +18,7 @@
 #import "EncryptionInfoView.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface EncryptionInfoView() <KeyVerificationCoordinatorBridgePresenterDelegate>
 {
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@ -17,7 +17,7 @@
 #import "FavouritesViewController.h"

 #import "RecentsDataSource.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface FavouritesViewController ()
 {    
--- a/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m
+++ b/Riot/Modules/GlobalSearch/DataSources/UnifiedSearchRecentsDataSource.m
@ -22,7 +22,7 @@
 #import "DirectoryRecentTableViewCell.h"

 #import "MXRoom+Riot.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface UnifiedSearchRecentsDataSource()
 {
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@ -17,7 +17,7 @@

 #import "HomeFilesSearchViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "HomeViewController.h"

--- a/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Files/Views/FilesSearchTableViewCell.m
@ -19,7 +19,7 @@
 #import "FilesSearchTableViewCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation FilesSearchTableViewCell
@synthesize delegate, mxkCellData;
--- a/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
+++ b/Riot/Modules/GlobalSearch/Messages/DataSources/HomeMessagesSearchDataSource.m
@ -23,7 +23,7 @@
 #import "RoomBubbleCellData.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXKRoomBubbleTableViewCell+Riot.h"

--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@ -17,7 +17,7 @@

 #import "HomeMessagesSearchViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "HomeViewController.h"

--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultAttachmentBubbleCell.m
@ -18,7 +18,7 @@
 #import "MessagesSearchResultAttachmentBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation MessagesSearchResultAttachmentBubbleCell
--- a/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m
+++ b/Riot/Modules/GlobalSearch/Messages/Views/MessagesSearchResultTextMsgBubbleCell.m
@ -18,7 +18,7 @@
 #import "MessagesSearchResultTextMsgBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation MessagesSearchResultTextMsgBubbleCell
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@ -19,7 +19,7 @@

 #import "PublicRoomsDirectoryDataSource.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface DirectoryViewController ()
 {
--- a/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
@ -31,7 +31,7 @@
 #import "HomeFilesSearchViewController.h"
 #import "FilesSearchCellData.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "GBDeviceInfo_iOS.h"

--- a/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Views/DirectoryRecentTableViewCell.m
@ -20,7 +20,7 @@
 #import "PublicRoomsDirectoryDataSource.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation DirectoryRecentTableViewCell

--- a/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m
+++ b/Riot/Modules/GlobalSearch/Views/RoomIdOrAliasTableViewCell.m
@ -19,7 +19,7 @@

 #import "AvatarGenerator.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation RoomIdOrAliasTableViewCell

--- a/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
+++ b/Riot/Modules/Home/Fallback/AuthFallBackViewController.m
@ -15,7 +15,7 @@
 */

 #import "AuthFallBackViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 // Generic method to make a bridge between JS and the WKWebView
 NSString *FallBackViewControllerJavascriptSendObjectMessage = @"window.sendObjectMessage = function(parameters) {   \
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@ -17,7 +17,7 @@

 #import "HomeViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RecentsDataSource.h"

--- a/Riot/Modules/Home/Views/RoomCollectionViewCell.m
+++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
@ -19,7 +19,7 @@
 #import "AvatarGenerator.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXRoomSummary+Riot.h"
 #import "MXRoom+Riot.h"
--- a/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m
+++ b/Riot/Modules/Home/Views/TableViewCellWithCollectionView.m
@ -16,7 +16,7 @@

 #import "TableViewCellWithCollectionView.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 static CGFloat const kEditionViewCornerRadius = 10.0;

--- a/Riot/Modules/Integrations/IntegrationManagerViewController.m
+++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m
@ -19,7 +19,7 @@

 #import "WidgetManager.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 NSString *const kIntegrationManagerMainScreen = nil;
 NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
--- a/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
+++ b/Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
@ -19,7 +19,7 @@
 #import "WidgetManager.h"
 #import "WidgetViewController.h"
 #import "IntegrationManagerViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface WidgetPickerViewController () <ServiceTermsModalCoordinatorBridgePresenterDelegate>
 {
--- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
+++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
@ -16,7 +16,7 @@

 #import "JitsiViewController.h"
 #import "JitsiWidgetData.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #if __has_include(<MatrixSDK/MXJingleCallStack.h>)
@import JitsiMeetSDK;
--- a/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
+++ b/Riot/Modules/Integrations/Widgets/StickerPicker/StickerPickerViewController.m
@ -18,7 +18,7 @@

 #import "IntegrationManagerViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface StickerPickerViewController ()

--- a/Riot/Modules/Integrations/Widgets/WidgetViewController.m
+++ b/Riot/Modules/Integrations/Widgets/WidgetViewController.m
@ -18,7 +18,7 @@
 #import "WidgetViewController.h"

 #import "IntegrationManagerViewController.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse('%@', %@);";

--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@ -19,7 +19,7 @@

 #import <MobileCoreServices/MobileCoreServices.h>

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface MediaAlbumContentViewController ()
 {
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@ -17,7 +17,7 @@

 #import "MediaPickerViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import <Photos/Photos.h>

--- a/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m
+++ b/Riot/Modules/MediaPicker/Views/MediaAlbumTableCell.m
@ -18,7 +18,7 @@
 #import "MediaAlbumTableCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation MediaAlbumTableCell

--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@ -24,7 +24,7 @@
 #import "RecentTableViewCell.h"
 #import "InviteRecentTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface PeopleViewController () <SpaceMembersCoordinatorBridgePresenterDelegate>
 {
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.m
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
@ -22,7 +22,7 @@
 #import "MXEvent.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #pragma mark - Constant definitions

--- a/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
+++ b/Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m
@ -19,7 +19,7 @@

 #import "PublicRoomTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #pragma mark - Constants definitions

--- a/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m
+++ b/Riot/Modules/PublicRoomList/Views/PublicRoomTableViewCell.m
@ -21,7 +21,7 @@
 #import "AvatarGenerator.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation PublicRoomTableViewCell

--- a/Riot/Modules/Room/Attachements/AttachmentsViewController.m
+++ b/Riot/Modules/Room/Attachements/AttachmentsViewController.m
@ -17,7 +17,7 @@

 #import "AttachmentsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface AttachmentsViewController ()
 {
--- a/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m
+++ b/Riot/Modules/Room/BubbleReactions/BubbleReactionsViewSizer.m
@ -17,7 +17,7 @@ limitations under the License.
 #import "BubbleReactionsViewSizer.h"
 #import <MatrixSDK/MatrixSDK.h>

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation BubbleReactionsViewSizer

--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@ -23,7 +23,7 @@
 #import "Tools.h"
 #import "BubbleReactionsViewSizer.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import <MatrixKit/MXKSwiftHeader.h>

 static NSAttributedString *timestampVerticalWhitespace = nil;
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@ -23,7 +23,7 @@
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 #import "AvatarGenerator.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXRoom+Riot.h"

--- a/Riot/Modules/Room/Files/RoomFilesViewController.m
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.m
@ -19,7 +19,7 @@

 #import "FilesSearchTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "AttachmentsViewController.h"

--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@ -18,7 +18,7 @@

 #import "RoomMemberDetailsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomMemberTitleView.h"

--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@ -19,7 +19,7 @@

 #import "RoomMemberDetailsViewController.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "Contact.h"

--- a/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
+++ b/Riot/Modules/Room/ReadReceiptsDetail/ReadReceiptsViewController.m
@ -20,7 +20,7 @@

 #import "RageShakeManager.h"
 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface ReadReceiptsViewController () <UITableViewDataSource, UITableViewDelegate>
 {
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@ -131,7 +131,7 @@

 #import "MXSDKOptions.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
 NSNotificationName const RoomGroupCallTileTappedNotification = @"RoomGroupCallTileTappedNotification";
--- a/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m
+++ b/Riot/Modules/Room/Search/DataSources/RoomSearchDataSource.m
@ -20,7 +20,7 @@
 #import "RoomBubbleCellData.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "MXKRoomBubbleTableViewCell+Riot.h"

--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
@ -24,7 +24,7 @@
 #import "FilesSearchCellData.h"
 #import "FilesSearchTableViewCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface RoomFilesSearchViewController ()
 {
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
@ -26,7 +26,7 @@
 #import "RoomIncomingAttachmentBubbleCell.h"
 #import "RoomIncomingTextMsgBubbleCell.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface RoomMessagesSearchViewController ()
 {
--- a/Riot/Modules/Room/Search/RoomSearchViewController.m
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.m
@ -22,7 +22,7 @@
 #import "RoomFilesSearchViewController.h"
 #import "FilesSearchCellData.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@interface RoomSearchViewController ()
 {
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@ -28,7 +28,7 @@
 #import "MXRoom+Riot.h"
 #import "MXRoomSummary+Riot.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomMemberDetailsViewController.h"

--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
@ -18,7 +18,7 @@
 #import "TableViewCellWithCheckBoxAndLabel.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation TableViewCellWithCheckBoxAndLabel

--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
@ -17,7 +17,7 @@

 #import "TableViewCellWithCheckBoxes.h"

-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 // The space between 2 check boxes
 #define TABLEVIEWCELLWITHCHECKBOXES_MARGIN 8
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithLabelAndLargeTextView.m
@ -18,7 +18,7 @@
 #import "TableViewCellWithLabelAndLargeTextView.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation TableViewCellWithLabelAndLargeTextView

--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
@ -19,7 +19,7 @@
 #import "RoomActivitiesView.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import <objc/runtime.h>

--- a/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomCreationCollapsedBubbleCell.m
@ -17,7 +17,7 @@
 #import "RoomCreationCollapsedBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomCreationWithPaginationCollapsedBubbleCell.m
@ -17,7 +17,7 @@
 #import "RoomCreationWithPaginationCollapsedBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingAttachmentBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation RoomIncomingAttachmentBubbleCell
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithPaginationTitleBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingAttachmentWithPaginationTitleBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation RoomIncomingAttachmentWithPaginationTitleBubbleCell
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m
@ -19,7 +19,7 @@
 #import "MXKRoomBubbleTableViewCell+Riot.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation RoomIncomingAttachmentWithoutSenderInfoBubbleCell

--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation RoomIncomingTextMsgBubbleCell
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithPaginationTitleBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"

@implementation RoomIncomingTextMsgWithPaginationTitleBubbleCell
--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell

--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation RoomIncomingTextMsgWithoutSenderInfoBubbleCell

--- a/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomIncomingTextMsgWithoutSenderNameBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomIncomingTextMsgWithoutSenderNameBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

@implementation RoomIncomingTextMsgWithoutSenderNameBubbleCell

--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipBubbleCell.m
@ -17,7 +17,7 @@
 #import "RoomMembershipBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
@ -18,7 +18,7 @@
 #import "RoomMembershipCollapsedBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedWithPaginationTitleBubbleCell.m
@ -17,7 +17,7 @@
 #import "RoomMembershipCollapsedWithPaginationTitleBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
@ -17,7 +17,7 @@
 #import "RoomMembershipExpandedBubbleCell.h"

 #import "ThemeService.h"
-#import "Riot-Swift.h"
+#import "GeneratedInterface-Swift.h"

 #import "RoomBubbleCellData.h"

--- a/Show more
+++ b/Show more