Skip to content

Commit 9432c3d

Browse files
marinofaggianamarinofaggiana
committed
rebase fix
Signed-off-by: Marino Faggiana <[email protected]>
1 parent 4838581 commit 9432c3d

File tree

2 files changed

+172
-110
lines changed

2 files changed

+172
-110
lines changed

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,12 @@
199199
F704B5E52430AA8000632F5F /* NCCreateFormUploadConflict.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */; };
200200
F704B5E72430C06700632F5F /* NCCreateFormUploadConflictCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F704B5E62430C06700632F5F /* NCCreateFormUploadConflictCell.xib */; };
201201
F704B5E92430C0B800632F5F /* NCCreateFormUploadConflictCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */; };
202+
F70557B72ED44E2700135623 /* LucidBanner in Frameworks */ = {isa = PBXBuildFile; productRef = F70557B62ED44E2700135623 /* LucidBanner */; };
203+
F70557B92ED44E4700135623 /* LucidBanner in Frameworks */ = {isa = PBXBuildFile; productRef = F70557B82ED44E4700135623 /* LucidBanner */; };
204+
F70557BD2ED44F1800135623 /* ToastBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70557BB2ED44F1800135623 /* ToastBannerView.swift */; };
205+
F70557BE2ED44F1800135623 /* ErrorBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70557BA2ED44F1800135623 /* ErrorBannerView.swift */; };
206+
F70557BF2ED44F1800135623 /* ToastBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70557BB2ED44F1800135623 /* ToastBannerView.swift */; };
207+
F70557C02ED44F1800135623 /* ErrorBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70557BA2ED44F1800135623 /* ErrorBannerView.swift */; };
202208
F70716E62987F81500E72C1D /* DocumentActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70716E52987F81500E72C1D /* DocumentActionViewController.swift */; };
203209
F70716ED2987F81500E72C1D /* File Provider Extension UI.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F70716E32987F81500E72C1D /* File Provider Extension UI.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
204210
F70753EB2542A99800972D44 /* NCViewerMediaPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753EA2542A99800972D44 /* NCViewerMediaPage.swift */; };
@@ -871,7 +877,6 @@
871877
F7EF2AEC2E43157B0081B2C9 /* NCNotification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7EF2AE82E43157B0081B2C9 /* NCNotification.storyboard */; };
872878
F7EFA47825ADBA500083159A /* NCViewerProviderContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7EFA47725ADBA500083159A /* NCViewerProviderContextMenu.swift */; };
873879
F7EFC0CD256BF8DD00461AAD /* NCUserStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7EFC0CC256BF8DD00461AAD /* NCUserStatus.swift */; };
874-
F7F0691D2EAB9DA300B3B13B /* NotificationPresenterUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0691C2EAB9DA200B3B13B /* NotificationPresenterUI.swift */; };
875880
F7F1FB9D2E27CE7200C79E20 /* NCNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75A9EE523796C6F0044CFCE /* NCNetworking.swift */; };
876881
F7F1FB9E2E27CE7200C79E20 /* NCNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75A9EE523796C6F0044CFCE /* NCNetworking.swift */; };
877882
F7F1FBA82E27D13700C79E20 /* Queuer in Frameworks */ = {isa = PBXBuildFile; productRef = F7F1FBA72E27D13700C79E20 /* Queuer */; };
@@ -1277,6 +1282,8 @@
12771282
F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadConflict.swift; sourceTree = "<group>"; };
12781283
F704B5E62430C06700632F5F /* NCCreateFormUploadConflictCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCCreateFormUploadConflictCell.xib; sourceTree = "<group>"; };
12791284
F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadConflictCell.swift; sourceTree = "<group>"; };
1285+
F70557BA2ED44F1800135623 /* ErrorBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorBannerView.swift; sourceTree = "<group>"; };
1286+
F70557BB2ED44F1800135623 /* ToastBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastBannerView.swift; sourceTree = "<group>"; };
12801287
F70716E32987F81500E72C1D /* File Provider Extension UI.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "File Provider Extension UI.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
12811288
F70716E52987F81500E72C1D /* DocumentActionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentActionViewController.swift; sourceTree = "<group>"; };
12821289
F70753EA2542A99800972D44 /* NCViewerMediaPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerMediaPage.swift; sourceTree = "<group>"; };
@@ -1761,7 +1768,6 @@
17611768
F7EF2AE92E43157B0081B2C9 /* NCNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCNotification.swift; sourceTree = "<group>"; };
17621769
F7EFA47725ADBA500083159A /* NCViewerProviderContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerProviderContextMenu.swift; sourceTree = "<group>"; };
17631770
F7EFC0CC256BF8DD00461AAD /* NCUserStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUserStatus.swift; sourceTree = "<group>"; };
1764-
F7F0691C2EAB9DA200B3B13B /* NotificationPresenterUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationPresenterUI.swift; sourceTree = "<group>"; };
17651771
F7F3E58A2D3BB65000A32B14 /* NCNetworking+Recommendations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCNetworking+Recommendations.swift"; sourceTree = "<group>"; };
17661772
F7F4F0FD27ECDBDB008676F9 /* Inconsolata-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inconsolata-SemiBold.ttf"; sourceTree = "<group>"; };
17671773
F7F4F0FE27ECDBDB008676F9 /* Inconsolata-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inconsolata-Medium.ttf"; sourceTree = "<group>"; };
@@ -1873,6 +1879,7 @@
18731879
F711A4EF2AF932B900095DD8 /* SVGKitSwift in Frameworks */,
18741880
F710FC80277B7D2700AA9FBF /* RealmSwift in Frameworks */,
18751881
F74C863D2AEFBFD9009A1D4A /* LRUCache in Frameworks */,
1882+
F70557B92ED44E4700135623 /* LucidBanner in Frameworks */,
18761883
F7B8F6182EAB7516006A70D6 /* JDStatusBarNotification in Frameworks */,
18771884
F72AD70F28C24BA1006CB92D /* NextcloudKit in Frameworks */,
18781885
F33EE6E72BF4C02600CA1A51 /* NIOSSL in Frameworks */,
@@ -1937,6 +1944,7 @@
19371944
F758A01227A7F03E0069468B /* JGProgressHUD in Frameworks */,
19381945
F77333882927A72100466E35 /* OpenSSL in Frameworks */,
19391946
F753BA93281FD8020015BFB6 /* EasyTipView in Frameworks */,
1947+
F70557B72ED44E2700135623 /* LucidBanner in Frameworks */,
19401948
F3374AF42D78B01B002A38F9 /* DequeModule in Frameworks */,
19411949
F7160A822BE933390034DCB3 /* RealmSwift in Frameworks */,
19421950
F76DA963277B760E0082465B /* Queuer in Frameworks */,
@@ -2203,6 +2211,15 @@
22032211
path = languages;
22042212
sourceTree = "<group>";
22052213
};
2214+
F70557BC2ED44F1800135623 /* Lucid Banner */ = {
2215+
isa = PBXGroup;
2216+
children = (
2217+
F70557BA2ED44F1800135623 /* ErrorBannerView.swift */,
2218+
F70557BB2ED44F1800135623 /* ToastBannerView.swift */,
2219+
);
2220+
path = "Lucid Banner";
2221+
sourceTree = "<group>";
2222+
};
22062223
F70716E42987F81500E72C1D /* File Provider Extension UI */ = {
22072224
isa = PBXGroup;
22082225
children = (
@@ -2590,9 +2607,9 @@
25902607
F769CA1B2966EF4F00039397 /* GUI */ = {
25912608
isa = PBXGroup;
25922609
children = (
2610+
F70557BC2ED44F1800135623 /* Lucid Banner */,
25932611
F769CA182966EA3C00039397 /* ComponentView.swift */,
25942612
F768823D2C0DD304001CF441 /* LazyView.swift */,
2595-
F7F0691C2EAB9DA200B3B13B /* NotificationPresenterUI.swift */,
25962613
F768823F2C0DD30B001CF441 /* ViewOnAppear.swift */,
25972614
F7BFFD272C8846020029A201 /* NCHud.swift */,
25982615
F75CA1462962F13700B01130 /* NCHUDView.swift */,
@@ -3487,6 +3504,7 @@
34873504
F711A4EE2AF932B900095DD8 /* SVGKitSwift */,
34883505
F33EE6E62BF4C02600CA1A51 /* NIOSSL */,
34893506
F7B8F6172EAB7516006A70D6 /* JDStatusBarNotification */,
3507+
F70557B82ED44E4700135623 /* LucidBanner */,
34903508
);
34913509
productName = "Share Ext";
34923510
productReference = F7CE8AFB1DC1F8D8009CAE48 /* Share.appex */;
@@ -3600,6 +3618,7 @@
36003618
F3374AF52D78B01B002A38F9 /* HashTreeCollections */,
36013619
F3374AF72D78B01B002A38F9 /* HeapModule */,
36023620
F7B8F6132EAB64AD006A70D6 /* JDStatusBarNotification */,
3621+
F70557B62ED44E2700135623 /* LucidBanner */,
36033622
);
36043623
productName = "Crypto Cloud";
36053624
productReference = F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */;
@@ -3784,6 +3803,7 @@
37843803
F7D4BF4E2CA2ECCB00A5E746 /* XCRemoteSwiftPackageReference "vlckit-spm" */,
37853804
F3374AEE2D78B01B002A38F9 /* XCRemoteSwiftPackageReference "swift-collections" */,
37863805
F7B8F6122EAB64AD006A70D6 /* XCRemoteSwiftPackageReference "JDStatusBarNotification" */,
3806+
F70557B52ED44E2700135623 /* XCRemoteSwiftPackageReference "LucidBanner" */,
37873807
);
37883808
productRefGroup = F7F67B9F1A24D27800EE80DA;
37893809
projectDirPath = "";
@@ -4146,6 +4166,8 @@
41464166
F79EC78926316AC4004E59D6 /* NCPopupViewController.swift in Sources */,
41474167
F7C30DFB291BCF790017149B /* NCNetworkingE2EECreateFolder.swift in Sources */,
41484168
F73EF7DA2B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */,
4169+
F70557BF2ED44F1800135623 /* ToastBannerView.swift in Sources */,
4170+
F70557C02ED44F1800135623 /* ErrorBannerView.swift in Sources */,
41494171
F7817CFB29801A3500FFBC65 /* Data+Extension.swift in Sources */,
41504172
F72429362AFE39860040AEF3 /* NCLivePhoto.swift in Sources */,
41514173
AF4BF61F27562B3F0081CEEF /* NCManageDatabase+Activity.swift in Sources */,
@@ -4509,6 +4531,8 @@
45094531
F7F3E58E2D3BB65600A32B14 /* NCNetworking+Recommendations.swift in Sources */,
45104532
F7A0D1352591FBC5008F8A13 /* String+Extension.swift in Sources */,
45114533
F7CEE6012BA9A5C9003EFD89 /* NCTrashGridCell.swift in Sources */,
4534+
F70557BD2ED44F1800135623 /* ToastBannerView.swift in Sources */,
4535+
F70557BE2ED44F1800135623 /* ErrorBannerView.swift in Sources */,
45124536
F7F9D1BB25397CE000D9BFF5 /* NCViewer.swift in Sources */,
45134537
F7E7AEA52BA32C6500512E52 /* NCCollectionViewDownloadThumbnail.swift in Sources */,
45144538
AF730AF827834B1400B7520E /* NCShare+NCCellDelegate.swift in Sources */,
@@ -4629,7 +4653,6 @@
46294653
F7CF06802E0FF3990063AD04 /* NCAppStateManager.swift in Sources */,
46304654
F7BAADCB1ED5A87C00B7EAD4 /* NCManageDatabase.swift in Sources */,
46314655
F768822A2C0DD1E7001CF441 /* NCSettingsModel.swift in Sources */,
4632-
F7F0691D2EAB9DA300B3B13B /* NotificationPresenterUI.swift in Sources */,
46334656
F737DA9D2B7B893C0063BAFC /* NCPasscode.swift in Sources */,
46344657
F77C97392953131000FDDD09 /* NCCameraRoll.swift in Sources */,
46354658
F7CADEFD2EA159210057849E /* NCMetadataTranfersSuccess.swift in Sources */,
@@ -5944,6 +5967,14 @@
59445967
minimumVersion = 2.9.1;
59455968
};
59465969
};
5970+
F70557B52ED44E2700135623 /* XCRemoteSwiftPackageReference "LucidBanner" */ = {
5971+
isa = XCRemoteSwiftPackageReference;
5972+
repositoryURL = "https://github.com/marinofaggiana/LucidBanner";
5973+
requirement = {
5974+
branch = main;
5975+
kind = branch;
5976+
};
5977+
};
59475978
F70B86732642CE3B00ED5349 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
59485979
isa = XCRemoteSwiftPackageReference;
59495980
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
@@ -6076,8 +6107,8 @@
60766107
isa = XCRemoteSwiftPackageReference;
60776108
repositoryURL = "https://github.com/nextcloud/NextcloudKit";
60786109
requirement = {
6079-
kind = exactVersion;
6080-
version = 7.2.3;
6110+
branch = "chunck-cancel";
6111+
kind = branch;
60816112
};
60826113
};
60836114
F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
@@ -6347,6 +6378,16 @@
63476378
package = F710FC78277B7CFF00AA9FBF /* XCRemoteSwiftPackageReference "realm-swift" */;
63486379
productName = RealmSwift;
63496380
};
6381+
F70557B62ED44E2700135623 /* LucidBanner */ = {
6382+
isa = XCSwiftPackageProductDependency;
6383+
package = F70557B52ED44E2700135623 /* XCRemoteSwiftPackageReference "LucidBanner" */;
6384+
productName = LucidBanner;
6385+
};
6386+
F70557B82ED44E4700135623 /* LucidBanner */ = {
6387+
isa = XCSwiftPackageProductDependency;
6388+
package = F70557B52ED44E2700135623 /* XCRemoteSwiftPackageReference "LucidBanner" */;
6389+
productName = LucidBanner;
6390+
};
63506391
F70821D729E59E6D001CA2D7 /* TagListView */ = {
63516392
isa = XCSwiftPackageProductDependency;
63526393
package = F7A1050C29E587AF00FFD92B /* XCRemoteSwiftPackageReference "TagListView" */;

0 commit comments

Comments
 (0)