From af8642c37d027758040f34e9b7d87737dbf1fb38 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 1 Sep 2020 11:33:13 +0200 Subject: [PATCH] Move generated loading animation files in a folder and exclude them from SwiftLint linting. --- .swiftlint.yml | 3 +- Riot.xcodeproj/project.pbxproj | 40 +++++++++---------- .../{ => LoadingAnimation}/ElementView.swift | 0 .../ElementViewController.swift | 0 .../{ => LoadingAnimation}/Timeline_1.swift | 0 5 files changed, 22 insertions(+), 21 deletions(-) rename Riot/Modules/LaunchLoading/{ => LoadingAnimation}/ElementView.swift (100%) rename Riot/Modules/LaunchLoading/{ => LoadingAnimation}/ElementViewController.swift (100%) rename Riot/Modules/LaunchLoading/{ => LoadingAnimation}/Timeline_1.swift (100%) diff --git a/.swiftlint.yml b/.swiftlint.yml index 2fce9c8de..45694f160 100755 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -28,7 +28,8 @@ included: excluded: - Carthage - Pods - - Riot/Generated/ + - Riot/Generated/ + - Riot/Modules/LaunchLoading/LoadingAnimation/ line_length: warning: 250 diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index 7c50acd52..5371bb0ea 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -145,9 +145,6 @@ 32FD757924D2C9BA00BA7B37 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FD757524D2C9BA00BA7B37 /* Bundle.swift */; }; 32FD757A24D2C9BA00BA7B37 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FD757524D2C9BA00BA7B37 /* Bundle.swift */; }; 32FDC1CD2386CD390084717A /* RiotSettingIntegrationProvisioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FDC1CC2386CD390084717A /* RiotSettingIntegrationProvisioning.swift */; }; - 39D49C6524B8D40500FEDBC8 /* ElementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */; }; - 39D49C6624B8D40500FEDBC8 /* Timeline_1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */; }; - 39D49C6724B8D40500FEDBC8 /* ElementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D49C6424B8D40500FEDBC8 /* ElementView.swift */; }; 3AF393339D2D566CE14AC200 /* Pods_RiotTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 129EB7E27E7E4AC3F5F098F5 /* Pods_RiotTests.framework */; }; 405FD41D306133A48D9B5AA1 /* Pods_RiotPods_Riot.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACF09217ADF1D7E7A35BC02 /* Pods_RiotPods_Riot.framework */; }; 670966FEFE120D865FD8A5B6 /* Pods_RiotPods_SiriIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51187E952D5CECF6D6F5A28E /* Pods_RiotPods_SiriIntents.framework */; }; @@ -186,6 +183,9 @@ B1098C1021ED07E4000DDA48 /* Presentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1098C0B21ED07E4000DDA48 /* Presentable.swift */; }; B1098C1121ED07E4000DDA48 /* NavigationRouterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1098C0C21ED07E4000DDA48 /* NavigationRouterType.swift */; }; B109D6F1222D8C400061B6D9 /* UIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = B109D6F0222D8C400061B6D9 /* UIApplication.swift */; }; + B10A3E8E24FE4368007C380F /* ElementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10A3E8B24FE4367007C380F /* ElementView.swift */; }; + B10A3E8F24FE4368007C380F /* Timeline_1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10A3E8C24FE4367007C380F /* Timeline_1.swift */; }; + B10A3E9024FE4368007C380F /* ElementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10A3E8D24FE4367007C380F /* ElementViewController.swift */; }; B10CFBC32268D99D00A5842E /* JitsiService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10CFBC22268D99D00A5842E /* JitsiService.swift */; }; B1107EC82200B0720038014B /* KeyBackupRecoverSuccessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1107EC72200B0720038014B /* KeyBackupRecoverSuccessViewController.swift */; }; B1107ECA2200B09F0038014B /* KeyBackupRecoverSuccessViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1107EC92200B09F0038014B /* KeyBackupRecoverSuccessViewController.storyboard */; }; @@ -1060,9 +1060,6 @@ 32FD757524D2C9BA00BA7B37 /* Bundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = ""; }; 32FDC1CC2386CD390084717A /* RiotSettingIntegrationProvisioning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RiotSettingIntegrationProvisioning.swift; sourceTree = ""; }; 3942DD65EBEB7AE647C6392A /* Pods-RiotPods-SiriIntents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-SiriIntents.debug.xcconfig"; path = "Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.debug.xcconfig"; sourceTree = ""; }; - 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementViewController.swift; sourceTree = ""; }; - 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timeline_1.swift; sourceTree = ""; }; - 39D49C6424B8D40500FEDBC8 /* ElementView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementView.swift; sourceTree = ""; }; 3D78489021AC9E6400B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = ""; }; 3D78489121AC9E6500B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; 3D78489221AC9E6500B98A7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Vector.strings; sourceTree = ""; }; @@ -1114,6 +1111,9 @@ B1098C0B21ED07E4000DDA48 /* Presentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Presentable.swift; sourceTree = ""; }; B1098C0C21ED07E4000DDA48 /* NavigationRouterType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationRouterType.swift; sourceTree = ""; }; B109D6F0222D8C400061B6D9 /* UIApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplication.swift; sourceTree = ""; }; + B10A3E8B24FE4367007C380F /* ElementView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementView.swift; sourceTree = ""; }; + B10A3E8C24FE4367007C380F /* Timeline_1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timeline_1.swift; sourceTree = ""; }; + B10A3E8D24FE4367007C380F /* ElementViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementViewController.swift; sourceTree = ""; }; B10CFBC22268D99D00A5842E /* JitsiService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiService.swift; sourceTree = ""; }; B1107EC72200B0720038014B /* KeyBackupRecoverSuccessViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyBackupRecoverSuccessViewController.swift; sourceTree = ""; }; B1107EC92200B09F0038014B /* KeyBackupRecoverSuccessViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = KeyBackupRecoverSuccessViewController.storyboard; sourceTree = ""; }; @@ -2398,16 +2398,6 @@ path = Config; sourceTree = ""; }; - 39D49C6124B8D3B000FEDBC8 /* LaunchLoadingAnimation */ = { - isa = PBXGroup; - children = ( - 39D49C6424B8D40500FEDBC8 /* ElementView.swift */, - 39D49C6224B8D40500FEDBC8 /* ElementViewController.swift */, - 39D49C6324B8D40500FEDBC8 /* Timeline_1.swift */, - ); - name = LaunchLoadingAnimation; - sourceTree = ""; - }; 4220F60B660591FD80AF3428 /* Pods */ = { isa = PBXGroup; children = ( @@ -2554,6 +2544,16 @@ path = Routers; sourceTree = ""; }; + B10A3E8A24FE4367007C380F /* LoadingAnimation */ = { + isa = PBXGroup; + children = ( + B10A3E8B24FE4367007C380F /* ElementView.swift */, + B10A3E8C24FE4367007C380F /* Timeline_1.swift */, + B10A3E8D24FE4367007C380F /* ElementViewController.swift */, + ); + path = LoadingAnimation; + sourceTree = ""; + }; B1107EC62200B0190038014B /* Success */ = { isa = PBXGroup; children = ( @@ -2699,7 +2699,7 @@ B1560DA024B65A9500490F50 /* LaunchLoading */ = { isa = PBXGroup; children = ( - 39D49C6124B8D3B000FEDBC8 /* LaunchLoadingAnimation */, + B10A3E8A24FE4367007C380F /* LoadingAnimation */, B1560DA124B65AFA00490F50 /* LaunchLoadingView.swift */, B1560DA324B65B3700490F50 /* LaunchLoadingView.xib */, ); @@ -5962,6 +5962,7 @@ B1B558C920EF768F00210D55 /* RoomIncomingEncryptedAttachmentWithoutSenderInfoBubbleCell.m in Sources */, B1B5571B20EE6C4D00210D55 /* DeactivateAccountViewController.m in Sources */, B1DCC63922E85E9A00625807 /* EmojiMartStore.swift in Sources */, + B10A3E9024FE4368007C380F /* ElementViewController.swift in Sources */, B1B5590620EF768F00210D55 /* RoomMembershipCollapsedWithPaginationTitleBubbleCell.m in Sources */, B139C21D21FE5BF500BB68EC /* KeyBackupRecoverFromPassphraseViewModelType.swift in Sources */, B157FA9F23264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinator.swift in Sources */, @@ -6135,7 +6136,6 @@ B1B557D820EF5EA900210D55 /* RoomActivitiesView.m in Sources */, B1B9DEE922EB34EF0065E677 /* ReactionHistoryViewController.swift in Sources */, B1B5596620EF9E9B00210D55 /* RoomTableViewCell.m in Sources */, - 39D49C6624B8D40500FEDBC8 /* Timeline_1.swift in Sources */, EC711B7D24A63B37008F830C /* SecretsSetupRecoveryPassphraseViewModel.swift in Sources */, EC711B8024A63B37008F830C /* SecretsSetupRecoveryPassphraseViewState.swift in Sources */, B1C45A89232A8C2600165425 /* SettingsIdentityServerViewController.swift in Sources */, @@ -6198,12 +6198,11 @@ B1B5574720EE6C4D00210D55 /* UsersDevicesViewController.m in Sources */, B1098BFF21ECFE65000DDA48 /* PasswordStrengthView.swift in Sources */, B1B558D220EF768F00210D55 /* RoomEncryptedDataBubbleCell.m in Sources */, + B10A3E8F24FE4368007C380F /* Timeline_1.swift in Sources */, EC711BB024A63B58008F830C /* SecureBackupBannerCell.swift in Sources */, B1B558FA20EF768F00210D55 /* RoomMembershipBubbleCell.m in Sources */, - 39D49C6724B8D40500FEDBC8 /* ElementView.swift in Sources */, B157FAA223264AE900EBFBD4 /* SettingsDiscoveryThreePidDetailsViewAction.swift in Sources */, EC85D6AE2477DC89002C44C9 /* RoundedButton.swift in Sources */, - 39D49C6524B8D40500FEDBC8 /* ElementViewController.swift in Sources */, B1CE83D72422817200D07506 /* KeyVerificationVerifyByScanningViewModelType.swift in Sources */, 3232ABA1225730E100AD6A5C /* KeyVerificationCoordinatorType.swift in Sources */, B1C562D9228C0B760037F12A /* RoomContextualMenuItem.swift in Sources */, @@ -6321,6 +6320,7 @@ B1B9DEEE22EB34EF0065E677 /* ReactionHistoryViewAction.swift in Sources */, EC711BB624A63C11008F830C /* AuthenticatedSessionViewControllerFactory.swift in Sources */, B1C543A4239E98E400DCA1FA /* KeyVerificationCellInnerContentView.swift in Sources */, + B10A3E8E24FE4368007C380F /* ElementView.swift in Sources */, B1CE83B62422812100D07506 /* KeyVerificationCoordinatorBridgePresenter.swift in Sources */, 32B94DFA228EC26400716A26 /* ReactionsMenuButton.swift in Sources */, B1B9DEEC22EB34EF0065E677 /* ReactionHistoryViewModelType.swift in Sources */, diff --git a/Riot/Modules/LaunchLoading/ElementView.swift b/Riot/Modules/LaunchLoading/LoadingAnimation/ElementView.swift similarity index 100% rename from Riot/Modules/LaunchLoading/ElementView.swift rename to Riot/Modules/LaunchLoading/LoadingAnimation/ElementView.swift diff --git a/Riot/Modules/LaunchLoading/ElementViewController.swift b/Riot/Modules/LaunchLoading/LoadingAnimation/ElementViewController.swift similarity index 100% rename from Riot/Modules/LaunchLoading/ElementViewController.swift rename to Riot/Modules/LaunchLoading/LoadingAnimation/ElementViewController.swift diff --git a/Riot/Modules/LaunchLoading/Timeline_1.swift b/Riot/Modules/LaunchLoading/LoadingAnimation/Timeline_1.swift similarity index 100% rename from Riot/Modules/LaunchLoading/Timeline_1.swift rename to Riot/Modules/LaunchLoading/LoadingAnimation/Timeline_1.swift