From 848c96bfc85b30e2cc8af35c21e0ee30246d2c39 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Tue, 24 Sep 2024 08:23:16 +0200 Subject: [PATCH 01/68] fix(PreviewViewController): Correctly display error Signed-off-by: Philippe Weidmann --- .../Controller/Files/Preview/PreviewViewController.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift b/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift index 713451f64..492f07fb7 100644 --- a/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift +++ b/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift @@ -505,7 +505,12 @@ final class PreviewViewController: UIViewController, PreviewContentCellDelegate, } } previewErrors[fileId] = previewError - collectionView.reloadItems(at: [IndexPath(item: index, section: 0)]) + + // We have to delay reload because errorWhilePreviewing can be called when the collectionView requests a new cell in + // cellForItemAt and iOS 18 seems unhappy about this. + Task { @MainActor [weak self] in + self?.collectionView.reloadItems(at: [IndexPath(item: index, section: 0)]) + } } func openWith(from: UIView) { From 69ebdac6abd6904072783a205f12e2df0f0fec44 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Tue, 24 Sep 2024 08:25:54 +0200 Subject: [PATCH 02/68] fix(CodePreviewCollectionViewCell): Correctly configure textView Signed-off-by: Philippe Weidmann --- kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift index 21edb04b7..6206ff317 100644 --- a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift @@ -34,6 +34,7 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { override func awakeFromNib() { super.awakeFromNib() + textView.text = "" textView.textContainerInset = UIEdgeInsets(top: 8, left: 3, bottom: 8, right: 3) markdownParser.code.font = UIFont.monospacedSystemFont( ofSize: UIFontMetrics.default.scaledValue(for: MarkdownParser.defaultFont.pointSize), From 5fe4081bc53e831a8d036b87eda687fec6789af6 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Tue, 24 Sep 2024 09:14:43 +0200 Subject: [PATCH 03/68] fix(CodePreviewCollectionViewCell): Correctly decode some legacy text encodings Signed-off-by: Philippe Weidmann --- .../Files/Preview/CodePreviewCollectionViewCell.swift | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift index 6206ff317..1adaf97f4 100644 --- a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift @@ -67,7 +67,16 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { func configure(with file: File) { do { // Read file - let content = try String(contentsOf: file.localUrl) + let data = try Data(contentsOf: file.localUrl, options: .alwaysMapped) + var maybeString: NSString? + + NSString.stringEncoding(for: data, convertedString: &maybeString, usedLossyConversion: nil) + guard let maybeString else { + throw DriveError.unknownError + } + + let content = maybeString as String + // Display content if file.extension == "md" || file.extension == "markdown" { displayMarkdown(for: content) From 7328a062bf1148813e908d4ccd982ef7a0aeaa3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Coye=20de=20Brune=CC=81lis?= Date: Tue, 24 Sep 2024 15:15:05 +0200 Subject: [PATCH 04/68] fix(PreviewViewController): Read files outside of the main actor --- .../Files/Preview/PreviewViewController.swift | 5 +- .../CodePreviewCollectionViewCell.swift | 63 +++++++++++++------ 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift b/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift index 492f07fb7..19c0c6477 100644 --- a/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift +++ b/kDrive/UI/Controller/Files/Preview/PreviewViewController.swift @@ -26,7 +26,7 @@ import SafariServices import Sentry import UIKit -protocol PreviewContentCellDelegate: AnyObject { +@MainActor protocol PreviewContentCellDelegate: AnyObject { func updateNavigationBar() func setFullscreen(_ fullscreen: Bool?) func errorWhilePreviewing(fileId: Int, error: Error) @@ -609,7 +609,8 @@ final class PreviewViewController: UIViewController, PreviewContentCellDelegate, previewPageViewController.driveFileManager = driveFileManager previewPageViewController.normalFolderHierarchy = normalFolderHierarchy previewPageViewController.presentationOrigin = presentationOrigin - // currentIndex should be set at the end of the function as the it takes time and the viewDidLoad() is called before the function returns + // currentIndex should be set at the end of the function as the it takes time and the viewDidLoad() is called before the + // function returns // this should be fixed in the future with the refactor of the init previewPageViewController.currentIndex = IndexPath(row: index, section: 0) return previewPageViewController diff --git a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift index 1adaf97f4..19ac2cd01 100644 --- a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift @@ -23,7 +23,24 @@ import kDriveResources import MarkdownKit import UIKit +/// Something to read a file outside of the main actor +struct CodePreviewWorker { + func readDataToStringInferEncoding(localUrl: URL) async throws -> String { + let data = try Data(contentsOf: localUrl, options: .alwaysMapped) + var maybeString: NSString? + + NSString.stringEncoding(for: data, convertedString: &maybeString, usedLossyConversion: nil) + guard let maybeString else { + throw DriveError.unknownError + } + + return maybeString as String + } +} + class CodePreviewCollectionViewCell: PreviewCollectionViewCell { + private let codePreviewWorker = CodePreviewWorker() + @IBOutlet var textView: UITextView! private let highlightr = Highlightr() @@ -65,32 +82,38 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } func configure(with file: File) { - do { - // Read file - let data = try Data(contentsOf: file.localUrl, options: .alwaysMapped) - var maybeString: NSString? - - NSString.stringEncoding(for: data, convertedString: &maybeString, usedLossyConversion: nil) - guard let maybeString else { - throw DriveError.unknownError - } + let localUrl = file.localUrl + let fileId = file.id - let content = maybeString as String + displayLoading() - // Display content - if file.extension == "md" || file.extension == "markdown" { - displayMarkdown(for: content) - isCode = false - } else { - displayCode(for: content) - isCode = true + Task { + do { + let contentString = try await codePreviewWorker.readDataToStringInferEncoding(localUrl: localUrl) + displayContent(with: file, content: contentString) + } catch { + DDLogError("Failed to read file content: \(error)") + previewDelegate?.errorWhilePreviewing(fileId: fileId, error: error) } - } catch { - DDLogError("Failed to read file content: \(error)") - previewDelegate?.errorWhilePreviewing(fileId: file.id, error: error) } } + private func displayContent(with file: File, content: String) { + if file.extension == "md" || file.extension == "markdown" { + displayMarkdown(for: content) + isCode = false + } else { + displayCode(for: content) + isCode = true + } + } + + private func displayLoading() { + textView + .attributedText = + NSAttributedString(string: "\n\t\t\(KDriveResourcesStrings.Localizable.previewDownloadIndication)") + } + private func displayMarkdown(for content: String) { textView.attributedText = markdownParser.parse(content) } From 84826c9b957e1283f1a3a6f01578b8981393e774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Coye=20de=20Brune=CC=81lis?= Date: Tue, 24 Sep 2024 15:58:15 +0200 Subject: [PATCH 05/68] feat: Activity indicator displayed while the app loads a file in background --- .../CodePreviewCollectionViewCell.swift | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift index 19ac2cd01..8d318b700 100644 --- a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift @@ -40,8 +40,11 @@ struct CodePreviewWorker { class CodePreviewCollectionViewCell: PreviewCollectionViewCell { private let codePreviewWorker = CodePreviewWorker() - - @IBOutlet var textView: UITextView! + private let activityView: UIActivityIndicatorView = { + let indicator = UIActivityIndicatorView(style: .large) + indicator.hidesWhenStopped = true + return indicator + }() private let highlightr = Highlightr() private let markdownParser = MarkdownParser(font: UIFontMetrics.default.scaledFont(for: MarkdownParser.defaultFont), @@ -49,6 +52,8 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { enabledElements: .disabledAutomaticLink) private var isCode = true + @IBOutlet var textView: UITextView! + override func awakeFromNib() { super.awakeFromNib() textView.text = "" @@ -58,6 +63,7 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { weight: .regular ) markdownParser.code.textBackgroundColor = KDriveResourcesAsset.backgroundColor.color + setupActivityView() } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { @@ -68,6 +74,19 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } } + private func setupActivityView() { + contentView.addSubview(activityView) + contentView.bringSubviewToFront(activityView) + + activityView.translatesAutoresizingMaskIntoConstraints = false + activityView.isHidden = true + + NSLayoutConstraint.activate([ + activityView.centerXAnchor.constraint(equalTo: contentView.centerXAnchor), + activityView.centerYAnchor.constraint(equalTo: contentView.centerYAnchor) + ]) + } + private func setTheme() { let theme: String switch UITraitCollection.current.userInterfaceStyle { @@ -99,6 +118,7 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } private func displayContent(with file: File, content: String) { + activityView.stopAnimating() if file.extension == "md" || file.extension == "markdown" { displayMarkdown(for: content) isCode = false @@ -109,9 +129,7 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } private func displayLoading() { - textView - .attributedText = - NSAttributedString(string: "\n\t\t\(KDriveResourcesStrings.Localizable.previewDownloadIndication)") + activityView.startAnimating() } private func displayMarkdown(for content: String) { From 59a26200d2c9bde34726d5c57d4f0f7c85d62a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Coye=20de=20Brune=CC=81lis?= Date: Tue, 24 Sep 2024 16:13:54 +0200 Subject: [PATCH 06/68] chore: PR Feedback --- .../Files/Preview/CodePreviewCollectionViewCell.swift | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift index 8d318b700..5d9920a6d 100644 --- a/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Preview/CodePreviewCollectionViewCell.swift @@ -79,7 +79,6 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { contentView.bringSubviewToFront(activityView) activityView.translatesAutoresizingMaskIntoConstraints = false - activityView.isHidden = true NSLayoutConstraint.activate([ activityView.centerXAnchor.constraint(equalTo: contentView.centerXAnchor), @@ -101,11 +100,12 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } func configure(with file: File) { + textView.text = "" + activityView.startAnimating() + let localUrl = file.localUrl let fileId = file.id - displayLoading() - Task { do { let contentString = try await codePreviewWorker.readDataToStringInferEncoding(localUrl: localUrl) @@ -128,10 +128,6 @@ class CodePreviewCollectionViewCell: PreviewCollectionViewCell { } } - private func displayLoading() { - activityView.startAnimating() - } - private func displayMarkdown(for content: String) { textView.attributedText = markdownParser.parse(content) } From 9b2b9200cbe95e40806a75620a08447298e7285a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Coye=20de=20Brune=CC=81lis?= Date: Wed, 25 Sep 2024 12:43:30 +0200 Subject: [PATCH 07/68] fix: Changed call to open app from share extension --- .../SaveFileViewController+FooterButtonDelegate.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift index b0992a25c..34da8c9db 100644 --- a/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift +++ b/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift @@ -71,25 +71,25 @@ extension SaveFileViewController: FooterButtonDelegate { let addToQueue = !appContextService.isExtension try await fileImportHelper.saveForUpload(files, in: directory, drive: drive, addToQueue: addToQueue) #if ISEXTENSION - showOpenAppToContinueNotification() + await showOpenAppToContinueNotification() #endif } #if ISEXTENSION // Dynamic hook to open an URL within an extension - @objc func openURL(_ url: URL) -> Bool { + func openURL(_ url: URL) async -> Bool { var responder: UIResponder? = self while responder != nil { if let application = responder as? UIApplication { - return application.perform(#selector(openURL(_:)), with: url) != nil + return await application.open(url) } responder = responder?.next } return false } - func showOpenAppToContinueNotification() { - guard openURL(URLConstants.kDriveRedirection.url) else { + func showOpenAppToContinueNotification() async { + guard await openURL(URLConstants.kDriveRedirection.url) else { // Fallback on a local notification if failure to open URL @InjectService var notificationHelper: NotificationsHelpable notificationHelper.sendPausedUploadQueueNotification() From 3a221eb337eadb539fe2f13108a6793f52f9ce43 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Thu, 26 Sep 2024 15:41:39 +0200 Subject: [PATCH 08/68] fix: Correctly update files header title on order change Signed-off-by: Philippe Weidmann --- .../Controller/Files/File List/FileListViewController.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kDrive/UI/Controller/Files/File List/FileListViewController.swift b/kDrive/UI/Controller/Files/File List/FileListViewController.swift index cf422ac2b..2625b3f87 100644 --- a/kDrive/UI/Controller/Files/File List/FileListViewController.swift +++ b/kDrive/UI/Controller/Files/File List/FileListViewController.swift @@ -259,6 +259,10 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV // We need recompute the size of the header cell right after the batch update so it reflects its state properly. // State of the header cell can be updated during a diff update of the collection view. collectionView.reloadItems(at: [IndexPath(row: 0, section: 0)]) + + if let headerView { + setUpHeaderView(headerView, isEmptyViewHidden: viewModel.isShowingEmptyView) + } } private func bindUploadCardViewModel() { From 5aaac67773b365673c902437ce0a01054adc4b59 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Thu, 26 Sep 2024 16:00:57 +0200 Subject: [PATCH 09/68] fix: Prevent listOrGridButton image bug Signed-off-by: Philippe Weidmann --- .../Controller/Files/File List/FileListViewController.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kDrive/UI/Controller/Files/File List/FileListViewController.swift b/kDrive/UI/Controller/Files/File List/FileListViewController.swift index 2625b3f87..5ca4e7167 100644 --- a/kDrive/UI/Controller/Files/File List/FileListViewController.swift +++ b/kDrive/UI/Controller/Files/File List/FileListViewController.swift @@ -320,10 +320,8 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV private func updateListStyle(_ listStyle: ListStyle) { headerView?.listOrGridButton.setImage(listStyle.icon, for: .normal) - UIView.transition(with: collectionView, duration: 0.25, options: .transitionCrossDissolve) { - self.collectionView.reloadData() - self.setSelectedCells() - } + collectionView.reloadItems(at: collectionView.indexPathsForVisibleItems) + setSelectedCells() } private func present(_ viewController: UIViewController, presentationType: ControllerPresentationType, animated: Bool) { From ebab057f6b6d86da3f133040f81881e4e219ed92 Mon Sep 17 00:00:00 2001 From: Elena Willen Date: Thu, 3 Oct 2024 12:29:49 +0200 Subject: [PATCH 10/68] fix: Missing english translation Signed-off-by: Elena Willen --- kDrive/Resources/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kDrive/Resources/en.lproj/Localizable.strings b/kDrive/Resources/en.lproj/Localizable.strings index f7d83aab8..6e822d2bb 100644 --- a/kDrive/Resources/en.lproj/Localizable.strings +++ b/kDrive/Resources/en.lproj/Localizable.strings @@ -335,7 +335,7 @@ "buttonLater" = "Later"; /* loco:605b09e6a6279864ac4ba6f2 */ -"buttonLeaveShare" = "Stop sharing"; +"buttonLeaveShare" = "Leave share"; /* loco:6059f35332f59035fd6e2b62 */ "buttonLike" = "Like"; From da33b5139d954572d33f6b19bf710a8cd9998c73 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Wed, 9 Oct 2024 10:21:27 +0200 Subject: [PATCH 11/68] refactor: Remove inherited Signed-off-by: Philippe Weidmann --- .../Files/FileDetail/FileDetailActivityTableViewCell.swift | 4 ++-- .../Cache/DriveFileManager/DriveFileManager+Listing.swift | 4 ++-- kDriveCore/Data/Models/File.swift | 3 +-- kDriveCore/Data/Models/FileActivity.swift | 4 ---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift index 359b6a7ca..3d2ae45e1 100644 --- a/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift @@ -68,9 +68,9 @@ class FileDetailActivityTableViewCell: InsetTableViewCell { localizedKey = file.isDirectory ? "fileDetailsActivityFolderCreate" : "fileDetailsActivityFileCreate" case .fileRename: localizedKey = file.isDirectory ? "fileDetailsActivityFolderRename" : "fileDetailsActivityFileRename" - case .fileTrash, .fileTrashInherited: + case .fileTrash: localizedKey = file.isDirectory ? "fileDetailsActivityFolderTrash" : "fileDetailsActivityFileTrash" - case .fileRestore, .fileRestoreInherited: + case .fileRestore: localizedKey = file.isDirectory ? "fileDetailsActivityFolderRestore" : "fileDetailsActivityFileRestore" case .fileDelete: localizedKey = file.isDirectory ? "fileDetailsActivityFolderDelete" : "fileDetailsActivityFileDelete" diff --git a/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift b/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift index a09ee3ad9..b8eaf7ced 100644 --- a/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift +++ b/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift @@ -94,7 +94,7 @@ public extension DriveFileManager { let fileUid = File.uid(driveId: directory.driveId, fileId: fileAction.fileId) switch fileAction.action { - case .fileDelete, .fileTrash, .fileTrashInherited: + case .fileDelete, .fileTrash: removeFileInDatabase(fileUid: fileUid, cascade: true, writableRealm: writableRealm) case .fileMoveOut: @@ -103,7 +103,7 @@ public extension DriveFileManager { oldParent.children.remove(movedOutFile) - case .fileMoveIn, .fileRestore, .fileCreate, .fileRestoreInherited: + case .fileMoveIn, .fileRestore, .fileCreate: keepCacheAttributesForFile( newFile: actionFile, keepProperties: [.standard, .extras], diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift index ffdc71d8c..88bb3b3d4 100644 --- a/kDriveCore/Data/Models/File.swift +++ b/kDriveCore/Data/Models/File.swift @@ -297,7 +297,6 @@ public enum FileVisibility: String { public enum FileStatus: String { case erasing case locked - case trashInherited = "trash_inherited" case trashed case uploading } @@ -501,7 +500,7 @@ public final class File: Object, Codable { } public var isTrashed: Bool { - return status == .trashed || status == .trashInherited + return status == .trashed } public var isDisabled: Bool { diff --git a/kDriveCore/Data/Models/FileActivity.swift b/kDriveCore/Data/Models/FileActivity.swift index fd1f842f9..14aff36a1 100644 --- a/kDriveCore/Data/Models/FileActivity.swift +++ b/kDriveCore/Data/Models/FileActivity.swift @@ -29,9 +29,7 @@ public enum FileActivityType: String, Codable, CaseIterable { case fileMoveIn = "file_move" case fileMoveOut = "file_move_out" case fileTrash = "file_trash" - case fileTrashInherited = "file_trash_inherited" case fileRestore = "file_restore" - case fileRestoreInherited = "file_restore_inherited" case fileDelete = "file_delete" case fileUpdate = "file_update" case fileCategorize = "file_categorize" @@ -67,9 +65,7 @@ public enum FileActivityType: String, Codable, CaseIterable { .fileMoveIn, .fileMoveOut, .fileTrash, - // .fileTrashInherited, FIXME: waiting for API fix .fileRestore, - // .fileRestoreInherited, FIXME: waiting for API fix .fileDelete, .fileUpdate, .fileCategorize, From f96c198fdbd2541393d1ebbd74749763c6623816 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Wed, 9 Oct 2024 10:26:09 +0200 Subject: [PATCH 12/68] fix: Add missing arguments Signed-off-by: Philippe Weidmann --- kDriveAPITests/kDriveCore/DriveApiTests.swift | 1 + kDriveAPITests/kDriveCore/DriveFileManagerTests.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/kDriveAPITests/kDriveCore/DriveApiTests.swift b/kDriveAPITests/kDriveCore/DriveApiTests.swift index c1011ed6f..35299af7a 100644 --- a/kDriveAPITests/kDriveCore/DriveApiTests.swift +++ b/kDriveAPITests/kDriveCore/DriveApiTests.swift @@ -645,6 +645,7 @@ final class DriveApiTests: XCTestCase { let files = try await currentApiFetcher.searchFiles( drive: proxyDrive, query: "officeFile", + fileExtensions: [], categories: [], belongToAllCategories: true, sortType: .newer diff --git a/kDriveAPITests/kDriveCore/DriveFileManagerTests.swift b/kDriveAPITests/kDriveCore/DriveFileManagerTests.swift index b51c273bd..26c3a8fbf 100644 --- a/kDriveAPITests/kDriveCore/DriveFileManagerTests.swift +++ b/kDriveAPITests/kDriveCore/DriveFileManagerTests.swift @@ -158,6 +158,7 @@ final class DriveFileManagerTests: XCTestCase { _ = try await DriveFileManagerTests.driveFileManager.searchFile( query: file.name, categories: [], + fileExtensions: [], belongToAllCategories: true, sortType: .nameAZ ) From 6f27cb62d27bc6389103a130d40bb260d2a4edfb Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Mon, 7 Oct 2024 08:24:05 +0200 Subject: [PATCH 13/68] chore: Bump dependencies Signed-off-by: Philippe Weidmann --- Project.swift | 4 +++- Tuist/Package.resolved | 32 ++++++++++++++++---------------- Tuist/Package.swift | 8 ++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Project.swift b/Project.swift index 76020a8e9..84deb07a4 100644 --- a/Project.swift +++ b/Project.swift @@ -136,7 +136,9 @@ let project = Project(name: "kDrive", .external(name: "MQTTNIO"), .external(name: "InfomaniakCore"), .external(name: "InfomaniakCoreDB"), - .external(name: "InfomaniakCoreUI"), + .external(name: "InfomaniakCoreCommonUI"), + .external(name: "InfomaniakCoreSwiftUI"), + .external(name: "InfomaniakCoreUIKit"), .external(name: "InfomaniakLogin"), .external(name: "InfomaniakDI"), .external(name: "InfomaniakConcurrency"), diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved index ca77ce3cb..fccf2bb4c 100644 --- a/Tuist/Package.resolved +++ b/Tuist/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-core", "state" : { - "revision" : "6c175294c2ff03c43eb7c9bd32ebd3a8c6448b0d", - "version" : "11.0.0" + "revision" : "3275b3dafa41d3bf8e618b715dfac17e236f86b0", + "version" : "12.2.0" } }, { @@ -95,8 +95,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-core-ui", "state" : { - "revision" : "f45301c68bd9421a8f29f676bab658933e8a6807", - "version" : "10.1.0" + "revision" : "d83b9df4d8e7880fa8a55807549cac0fc4584ce6", + "version" : "13.1.0" } }, { @@ -113,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-login", "state" : { - "revision" : "7214a97f73b9b19858d3b3139a2fe47be86e142e", - "version" : "6.0.2" + "revision" : "b12bf4fbbfe0edf10d2516503e97a9f212d1cd5b", + "version" : "7.0.1" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Infomaniak/ios-version-checker", "state" : { - "revision" : "c8fd02352bfc6bede63e41bdb21f2472f7bc1612", - "version" : "6.0.0" + "revision" : "5b68ced5b52f9c95b6cb6d671273c608ed38d2fc", + "version" : "7.0.2" } }, { @@ -212,8 +212,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-core.git", "state" : { - "revision" : "b36f2436c2746c32b1f93dcc06ea8b859671a767", - "version" : "14.12.1" + "revision" : "e474a8d2270a8b12ac63ac9504e4757e39814b99", + "version" : "14.13.0" } }, { @@ -221,8 +221,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-swift", "state" : { - "revision" : "9b9992d59a5148eb557e6c0445fec05009022c8c", - "version" : "10.53.1" + "revision" : "863498d37a9f0e72caa65963da9641d8cdfc8228", + "version" : "10.54.0" } }, { @@ -275,8 +275,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06", - "version" : "1.1.3" + "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", + "version" : "1.1.4" } }, { @@ -302,8 +302,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "9746cf80e29edfef2a39924a66731249223f42a3", - "version" : "2.72.0" + "revision" : "665206000b8307cab5ac51203d29b0f232d7e31b", + "version" : "2.74.0" } }, { diff --git a/Tuist/Package.swift b/Tuist/Package.swift index 4d42924c1..d3877874a 100644 --- a/Tuist/Package.swift +++ b/Tuist/Package.swift @@ -19,12 +19,12 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-algorithms", .upToNextMajor(from: "1.2.0")), .package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.2.2")), - .package(url: "https://github.com/Infomaniak/ios-core", .upToNextMajor(from: "11.0.0")), - .package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "10.0.0")), - .package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "6.0.1")), + .package(url: "https://github.com/Infomaniak/ios-core", .upToNextMajor(from: "12.2.0")), + .package(url: "https://github.com/Infomaniak/ios-core-ui", .upToNextMajor(from: "13.1.0")), + .package(url: "https://github.com/Infomaniak/ios-login", .upToNextMajor(from: "7.0.1")), .package(url: "https://github.com/Infomaniak/ios-dependency-injection", .upToNextMajor(from: "2.0.0")), .package(url: "https://github.com/Infomaniak/swift-concurrency", .upToNextMajor(from: "0.0.4")), - .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "7.0.0")), .package(url: "https://github.com/Infomaniak/LocalizeKit", .upToNextMajor(from: "1.0.2")), .package(url: "https://github.com/realm/realm-swift", .upToNextMajor(from: "10.52.0")), .package(url: "https://github.com/SCENEE/FloatingPanel", .upToNextMajor(from: "2.0.0")), From fdb2e10d3ebaae0dd51d6988df093f58b7860b26 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Mon, 7 Oct 2024 09:15:13 +0200 Subject: [PATCH 14/68] fix: Upgrade login Signed-off-by: Philippe Weidmann --- kDriveCore/DI/FactoryService.swift | 8 +------ kDriveCore/Data/Api/DriveApiFetcher.swift | 20 +++++++++-------- kDriveCore/Data/Cache/AccountManager.swift | 26 +++++++++------------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/kDriveCore/DI/FactoryService.swift b/kDriveCore/DI/FactoryService.swift index 3c1c5fd7d..ed72de093 100644 --- a/kDriveCore/DI/FactoryService.swift +++ b/kDriveCore/DI/FactoryService.swift @@ -19,8 +19,8 @@ import BackgroundTasks import Foundation import InfomaniakCore +import InfomaniakCoreCommonUI import InfomaniakCoreDB -import InfomaniakCoreUI import InfomaniakDI import InfomaniakLogin import os.log @@ -56,12 +56,6 @@ public enum FactoryService { Factory(type: InfomaniakLoginable.self) { _, _ in InfomaniakLogin(config: loginConfig) }, - Factory(type: InfomaniakTokenable.self) { _, resolver in - try resolver.resolve(type: InfomaniakLoginable.self, - forCustomTypeIdentifier: nil, - factoryParameters: nil, - resolver: resolver) - }, Factory(type: AccountManageable.self) { _, _ in AccountManager() }, diff --git a/kDriveCore/Data/Api/DriveApiFetcher.swift b/kDriveCore/Data/Api/DriveApiFetcher.swift index 0d75d0e84..1f2385e34 100644 --- a/kDriveCore/Data/Api/DriveApiFetcher.swift +++ b/kDriveCore/Data/Api/DriveApiFetcher.swift @@ -54,7 +54,7 @@ public class AuthenticatedImageRequestModifier: ImageDownloadRequestModifier { public class DriveApiFetcher: ApiFetcher { @LazyInjectService var accountManager: AccountManageable - @LazyInjectService var tokenable: InfomaniakTokenable + @LazyInjectService var tokenable: InfomaniakNetworkLoginable public var authenticatedKF: AuthenticatedImageRequestModifier! @@ -353,11 +353,12 @@ public class DriveApiFetcher: ApiFetcher { let group = DispatchGroup() group.enter() - self.tokenable.refreshToken(token: reloadedToken) { newToken, error in - if let newToken { + self.tokenable.refreshToken(token: reloadedToken) { result in + switch result { + case .success(let newToken): self.accountManager.didUpdateToken(newToken: newToken, oldToken: reloadedToken) request(newToken, nil) - } else { + case .failure(let error): request(nil, error) } group.leave() @@ -499,7 +500,7 @@ public class DriveApiFetcher: ApiFetcher { class SyncedAuthenticator: OAuthAuthenticator { @LazyInjectService var accountManager: AccountManageable - @LazyInjectService var tokenable: InfomaniakTokenable + @LazyInjectService var tokenable: InfomaniakNetworkLoginable @LazyInjectService var appContextService: AppContextServiceable @LazyInjectService var keychainHelper: KeychainHelper @@ -608,9 +609,10 @@ class SyncedAuthenticator: OAuthAuthenticator { // It is necessary that the app stays awake while we refresh the token let expiringActivity = ExpiringActivity() expiringActivity.start() - self.tokenable.refreshToken(token: credential) { token, error in + self.tokenable.refreshToken(token: credential) { result in // New token has been fetched correctly - if let token { + switch result { + case .success(let token): Log.tokenAuthentication( "Refreshing token - Success with remote", oldToken: credential, @@ -620,8 +622,8 @@ class SyncedAuthenticator: OAuthAuthenticator { self.refreshTokenDelegate?.didUpdateToken(newToken: token, oldToken: credential) completion(.success(token)) - } else { - completion(self.handleFailedRefreshingToken(oldToken: credential, newToken: token, error: error)) + case .failure(let error): + completion(self.handleFailedRefreshingToken(oldToken: credential, newToken: nil, error: error)) } expiringActivity.endAll() } diff --git a/kDriveCore/Data/Cache/AccountManager.swift b/kDriveCore/Data/Cache/AccountManager.swift index 5e780e683..3b2def7ad 100644 --- a/kDriveCore/Data/Cache/AccountManager.swift +++ b/kDriveCore/Data/Cache/AccountManager.swift @@ -34,16 +34,8 @@ public protocol AccountManagerDelegate: AnyObject { public extension InfomaniakLogin { static func apiToken(using code: String, codeVerifier: String) async throws -> ApiToken { - try await withCheckedThrowingContinuation { continuation in - @InjectService var tokenable: InfomaniakTokenable - tokenable.getApiTokenUsing(code: code, codeVerifier: codeVerifier) { token, error in - if let token { - continuation.resume(returning: token) - } else { - continuation.resume(throwing: error ?? DriveError.unknownError) - } - } - } + @InjectService var tokenable: InfomaniakNetworkLoginable + return try await tokenable.apiTokenUsing(code: code, codeVerifier: codeVerifier) } } @@ -87,7 +79,6 @@ public class AccountManager: RefreshTokenDelegate, AccountManageable { @LazyInjectService var driveInfosManager: DriveInfosManager @LazyInjectService var photoLibraryUploader: PhotoLibraryUploader @LazyInjectService var tokenStore: TokenStore - @LazyInjectService var tokenable: InfomaniakTokenable @LazyInjectService var notificationHelper: NotificationsHelpable @LazyInjectService var networkLogin: InfomaniakNetworkLoginable @LazyInjectService var appNavigable: AppNavigable @@ -280,9 +271,7 @@ public class AccountManager: RefreshTokenDelegate, AccountManageable { let driveResponse = try await apiFetcher.userDrives() guard !driveResponse.drives.filter(\.isDriveUser).isEmpty else { - networkLogin.deleteApiToken(token: token) { error in - DDLogError("Failed to delete api token: \(error.localizedDescription)") - } + try? await networkLogin.deleteApiToken(token: token) throw DriveError.noDrive } @@ -498,8 +487,13 @@ public class AccountManager: RefreshTokenDelegate, AccountManageable { guard let removedToken else { return } - tokenable.deleteApiToken(token: removedToken) { error in - DDLogError("Failed to delete api token: \(error.localizedDescription)") + networkLogin.deleteApiToken(token: removedToken) { result in + switch result { + case .success(let success): + break + case .failure(let error): + DDLogError("Failed to delete api token: \(error.localizedDescription)") + } } } From 38aa43a38f58ff854c9ffd6b6aae5055c964170e Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Mon, 7 Oct 2024 14:34:22 +0200 Subject: [PATCH 15/68] =?UTF-8?q?chore:=20Import=20InfomaniakCoreCommonUI?= =?UTF-8?q?=20|=C2=A0InfomaniakCoreUIKit=20where=20necessary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Weidmann --- kDrive/AppDelegate.swift | 2 +- kDrive/AppRouter.swift | 2 +- kDrive/SceneDelegate.swift | 2 +- kDrive/UI/Controller/DriveUpdateRequiredViewController.swift | 2 +- .../Categories/ManageCategoryFloatingPanelViewController.swift | 2 +- .../Files/ColorSelectionFloatingPanelViewController.swift | 2 +- .../Files/Rights and Share/InviteUserViewController.swift | 2 +- .../Files/Rights and Share/RightsSelectionViewController.swift | 2 +- kDrive/UI/Controller/Files/RootMenuViewController.swift | 2 +- .../SaveFileViewController+FooterButtonDelegate.swift | 2 +- .../UI/Controller/Files/Save File/SaveFileViewController.swift | 2 +- .../Files/Save File/SelectFolderViewController.swift | 2 +- .../Files/Search/DateRangePickerViewController.swift | 3 ++- kDrive/UI/Controller/Home/HomeViewController.swift | 2 +- kDrive/UI/Controller/LockedAppViewController.swift | 2 +- kDrive/UI/Controller/MainTabViewController.swift | 2 +- kDrive/UI/Controller/Menu/AppLockSettingsViewController.swift | 2 +- .../UI/Controller/Menu/PhotoList/PhotoListViewController.swift | 3 ++- kDrive/UI/Controller/Menu/SecurityTableViewController.swift | 2 +- kDrive/UI/Controller/Menu/StoreViewController.swift | 2 +- kDrive/UI/Controller/Menu/Trash/TrashListViewModel.swift | 2 +- .../NewFolder/NewFolderTypeTableViewController.swift | 2 +- .../Files/Categories/CategoryBadgeCollectionViewCell.swift | 2 +- .../UI/View/Files/Categories/CategoryCollectionViewCell.swift | 2 +- kDrive/UI/View/Files/Categories/CategoryTableViewCell.swift | 2 +- .../View/Files/Categories/ManageCategoriesTableViewCell.swift | 2 +- kDrive/UI/View/Files/DropBox/DropBoxDisableTableViewCell.swift | 2 +- kDrive/UI/View/Files/DropBox/DropBoxLinkTableViewCell.swift | 2 +- .../Files/FileDetail/FileDetailActivityTableViewCell.swift | 2 +- .../FileInformation/FileInformationUsersTableViewCell.swift | 2 +- .../Files/FileDetail/ShareLink/InviteUserTableViewCell.swift | 2 +- .../Files/FileDetail/ShareLink/InvitedUserTableViewCell.swift | 2 +- .../View/Files/FileDetail/ShareLink/MessageTableViewCell.swift | 2 +- .../FileDetail/ShareLink/RightsSelectionTableViewCell.swift | 2 +- .../ShareLink/ShareLinkAccessRightTableViewCell.swift | 2 +- .../FileDetail/ShareLink/ShareLinkSettingTableViewCell.swift | 2 +- .../Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift | 2 +- .../Files/FileDetail/ShareLink/UsersAccessTableViewCell.swift | 2 +- kDrive/UI/View/Files/FileListBarButton.swift | 2 +- .../FloatingPanel/FloatingPanelActionCollectionViewCell.swift | 2 +- .../FloatingPanel/FloatingPanelSortOptionTableViewCell.swift | 2 +- .../View/Files/FloatingPanel/FloatingPanelTableViewCell.swift | 2 +- kDrive/UI/View/Files/SaveFile/DriveSwitchTableViewCell.swift | 2 +- kDrive/UI/View/Files/SaveFile/LocationTableViewCell.swift | 2 +- kDrive/UI/View/Files/SaveFile/PhotoFormatTableViewCell.swift | 2 +- .../Files/Search/FileExtensionTextInputTableViewCell.swift | 2 +- .../UI/View/Files/Search/RecentSearchCollectionViewCell.swift | 2 +- .../UI/View/Files/Search/SearchFilterCollectionViewCell.swift | 2 +- kDrive/UI/View/Files/Search/SelectTableViewCell.swift | 2 +- kDrive/UI/View/Files/Search/TextInputTableViewCell.swift | 2 +- kDrive/UI/View/Files/Upload/UploadFolderTableViewCell.swift | 2 +- kDrive/UI/View/Files/Upload/UploadTableViewCell.swift | 2 +- kDrive/UI/View/Generic/AlertTableViewCell.swift | 2 +- kDrive/UI/View/Generic/SelectionTableViewCell.swift | 2 +- kDrive/UI/View/Header view/HomeRecentFilesHeaderView.swift | 2 +- kDrive/UI/View/Header view/SelectView.swift | 2 +- .../UI/View/Home/InsufficientStorageCollectionViewCell.swift | 2 +- kDrive/UI/View/Home/RecentActivityCollectionViewCell.swift | 2 +- kDrive/UI/View/Home/UploadsInProgressTableViewCell.swift | 2 +- kDrive/UI/View/Menu/DriveTitleTableViewCell.swift | 2 +- kDrive/UI/View/Menu/MenuTableViewCell.swift | 2 +- kDrive/UI/View/Menu/Parameters/AboutDetailTableViewCell.swift | 2 +- .../UI/View/Menu/Parameters/ParameterAboutTableViewCell.swift | 2 +- .../Menu/Parameters/ParameterAccessDeniedTableViewCell.swift | 2 +- .../UI/View/Menu/Parameters/ParameterSwitchTableViewCell.swift | 3 ++- kDrive/UI/View/Menu/Parameters/ParameterTableViewCell.swift | 2 +- .../UI/View/Menu/Parameters/ParameterWifiTableViewCell.swift | 2 +- kDrive/UI/View/Menu/PhotoList/PhotoSectionHeaderView.swift | 2 +- .../PhotoSyncSettings/PhotoSyncSettingsTableViewCell.swift | 2 +- kDrive/UI/View/Menu/RootMenuCell.swift | 3 ++- kDrive/UI/View/Menu/Store/StoreCollectionViewCell.swift | 2 +- kDrive/UI/View/Menu/Store/StoreFeatureTableViewCell.swift | 2 +- kDrive/UI/View/Menu/Store/StoreStorageTableViewCell.swift | 2 +- kDrive/UI/View/NewFolder/FolderTypeTableViewCell.swift | 2 +- kDrive/UI/View/NewFolder/NewFolderHeaderTableViewCell.swift | 2 +- kDrive/UI/View/NewFolder/NewFolderLocationTableViewCell.swift | 2 +- kDrive/UI/View/NewFolder/NewFolderSettingsTableViewCell.swift | 2 +- .../View/NewFolder/NewFolderSettingsTitleTableViewCell.swift | 2 +- kDrive/UI/View/NewFolder/NewFolderShareRuleTableViewCell.swift | 2 +- kDrive/Utils/CustomLargeTitleCollectionViewController.swift | 2 +- kDrive/Utils/FileActionsHelper.swift | 3 ++- kDrive/Utils/UINavigationController+Extension.swift | 2 +- kDriveActionExtension/ActionNavigationController.swift | 2 +- kDriveCore/Data/Models/Category.swift | 2 +- kDriveCore/UI/Alert/AlertChoiceViewController.swift | 2 +- kDriveCore/UI/Alert/AlertTextViewController.swift | 2 +- kDriveCore/UI/Alert/AlertViewController.swift | 2 +- kDriveCore/UI/IKButton.swift | 2 +- kDriveCore/UI/UIConstants.swift | 3 ++- kDriveCore/Utils/Files/FileImportHelper.swift | 2 +- kDriveCore/Utils/Files/ImportedFile.swift | 2 +- kDriveCore/Utils/Files/PhotoFileFormat.swift | 2 +- kDriveCore/Utils/Files/ScanFileFormat.swift | 2 +- kDriveCore/Utils/NotificationsHelper.swift | 2 +- kDriveCore/Utils/RootViewControllerState.swift | 2 +- kDriveShareExtension/ShareNavigationViewController.swift | 2 +- kDriveTests/kDrive/Launch/ITAppLaunchTest.swift | 2 +- kDriveTests/kDrive/Launch/UTRootViewControllerState.swift | 2 +- 98 files changed, 104 insertions(+), 98 deletions(-) diff --git a/kDrive/AppDelegate.swift b/kDrive/AppDelegate.swift index b61288e25..98cc22a97 100644 --- a/kDrive/AppDelegate.swift +++ b/kDrive/AppDelegate.swift @@ -21,7 +21,7 @@ import AVFoundation import BackgroundTasks import CocoaLumberjackSwift import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import InfomaniakLogin import kDriveCore diff --git a/kDrive/AppRouter.swift b/kDrive/AppRouter.swift index 3b2f05caf..bc23f7141 100644 --- a/kDrive/AppRouter.swift +++ b/kDrive/AppRouter.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/SceneDelegate.swift b/kDrive/SceneDelegate.swift index 6f23a8f33..0bbd87862 100644 --- a/kDrive/SceneDelegate.swift +++ b/kDrive/SceneDelegate.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift b/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift index f3bb5f292..04e006511 100644 --- a/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift +++ b/kDrive/UI/Controller/DriveUpdateRequiredViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import kDriveCore import kDriveResources import SwiftUI diff --git a/kDrive/UI/Controller/Files/Categories/ManageCategoryFloatingPanelViewController.swift b/kDrive/UI/Controller/Files/Categories/ManageCategoryFloatingPanelViewController.swift index 789cce462..18db4e6a4 100644 --- a/kDrive/UI/Controller/Files/Categories/ManageCategoryFloatingPanelViewController.swift +++ b/kDrive/UI/Controller/Files/Categories/ManageCategoryFloatingPanelViewController.swift @@ -17,7 +17,7 @@ */ import FloatingPanel -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/Controller/Files/ColorSelectionFloatingPanelViewController.swift b/kDrive/UI/Controller/Files/ColorSelectionFloatingPanelViewController.swift index b5a43e643..fc9bf012b 100644 --- a/kDrive/UI/Controller/Files/ColorSelectionFloatingPanelViewController.swift +++ b/kDrive/UI/Controller/Files/ColorSelectionFloatingPanelViewController.swift @@ -17,7 +17,7 @@ */ import FloatingPanel -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/Controller/Files/Rights and Share/InviteUserViewController.swift b/kDrive/UI/Controller/Files/Rights and Share/InviteUserViewController.swift index ed9acf856..ac3625c4b 100644 --- a/kDrive/UI/Controller/Files/Rights and Share/InviteUserViewController.swift +++ b/kDrive/UI/Controller/Files/Rights and Share/InviteUserViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Files/Rights and Share/RightsSelectionViewController.swift b/kDrive/UI/Controller/Files/Rights and Share/RightsSelectionViewController.swift index 6a3592d9a..e7f164ae1 100644 --- a/kDrive/UI/Controller/Files/Rights and Share/RightsSelectionViewController.swift +++ b/kDrive/UI/Controller/Files/Rights and Share/RightsSelectionViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/Controller/Files/RootMenuViewController.swift b/kDrive/UI/Controller/Files/RootMenuViewController.swift index 8055a9cf1..31f0ae1cf 100644 --- a/kDrive/UI/Controller/Files/RootMenuViewController.swift +++ b/kDrive/UI/Controller/Files/RootMenuViewController.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift index 34da8c9db..b4684065d 100644 --- a/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift +++ b/kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift @@ -17,7 +17,7 @@ */ import Foundation -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift index b11d36e35..8c4fc0088 100644 --- a/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift +++ b/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift @@ -18,7 +18,7 @@ import CocoaLumberjackSwift import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Files/Save File/SelectFolderViewController.swift b/kDrive/UI/Controller/Files/Save File/SelectFolderViewController.swift index e27a1c925..cec483a03 100644 --- a/kDrive/UI/Controller/Files/Save File/SelectFolderViewController.swift +++ b/kDrive/UI/Controller/Files/Save File/SelectFolderViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import RealmSwift diff --git a/kDrive/UI/Controller/Files/Search/DateRangePickerViewController.swift b/kDrive/UI/Controller/Files/Search/DateRangePickerViewController.swift index 3be06ff59..1cf1d8a3c 100644 --- a/kDrive/UI/Controller/Files/Search/DateRangePickerViewController.swift +++ b/kDrive/UI/Controller/Files/Search/DateRangePickerViewController.swift @@ -17,7 +17,8 @@ */ import HorizonCalendar -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/Controller/Home/HomeViewController.swift b/kDrive/UI/Controller/Home/HomeViewController.swift index 0c3720a0b..c8cd24c9a 100644 --- a/kDrive/UI/Controller/Home/HomeViewController.swift +++ b/kDrive/UI/Controller/Home/HomeViewController.swift @@ -18,7 +18,7 @@ import DifferenceKit import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/LockedAppViewController.swift b/kDrive/UI/Controller/LockedAppViewController.swift index 5a91029a1..9d84ab34e 100644 --- a/kDrive/UI/Controller/LockedAppViewController.swift +++ b/kDrive/UI/Controller/LockedAppViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/MainTabViewController.swift b/kDrive/UI/Controller/MainTabViewController.swift index 1c6161785..f7b407741 100644 --- a/kDrive/UI/Controller/MainTabViewController.swift +++ b/kDrive/UI/Controller/MainTabViewController.swift @@ -18,7 +18,7 @@ import FloatingPanel import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Menu/AppLockSettingsViewController.swift b/kDrive/UI/Controller/Menu/AppLockSettingsViewController.swift index 4249317da..1720dbaac 100644 --- a/kDrive/UI/Controller/Menu/AppLockSettingsViewController.swift +++ b/kDrive/UI/Controller/Menu/AppLockSettingsViewController.swift @@ -16,9 +16,9 @@ along with this program. If not, see . */ +import kDriveCore import kDriveResources import LocalAuthentication -import kDriveCore import UIKit class AppLockSettingsViewController: UIViewController { diff --git a/kDrive/UI/Controller/Menu/PhotoList/PhotoListViewController.swift b/kDrive/UI/Controller/Menu/PhotoList/PhotoListViewController.swift index 50b629fd7..6dd721e35 100644 --- a/kDrive/UI/Controller/Menu/PhotoList/PhotoListViewController.swift +++ b/kDrive/UI/Controller/Menu/PhotoList/PhotoListViewController.swift @@ -20,7 +20,8 @@ import CocoaLumberjackSwift import Combine import DifferenceKit import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/Controller/Menu/SecurityTableViewController.swift b/kDrive/UI/Controller/Menu/SecurityTableViewController.swift index 7b74b1e3c..b94623f2a 100644 --- a/kDrive/UI/Controller/Menu/SecurityTableViewController.swift +++ b/kDrive/UI/Controller/Menu/SecurityTableViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Menu/StoreViewController.swift b/kDrive/UI/Controller/Menu/StoreViewController.swift index e90a4ba8f..e22017e5b 100644 --- a/kDrive/UI/Controller/Menu/StoreViewController.swift +++ b/kDrive/UI/Controller/Menu/StoreViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/Controller/Menu/Trash/TrashListViewModel.swift b/kDrive/UI/Controller/Menu/Trash/TrashListViewModel.swift index 67ab3d778..65b793eaf 100644 --- a/kDrive/UI/Controller/Menu/Trash/TrashListViewModel.swift +++ b/kDrive/UI/Controller/Menu/Trash/TrashListViewModel.swift @@ -18,7 +18,7 @@ import CocoaLumberjackSwift import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import Kingfisher diff --git a/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift b/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift index 34f471c62..e81cc3965 100644 --- a/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift +++ b/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/View/Files/Categories/CategoryBadgeCollectionViewCell.swift b/kDrive/UI/View/Files/Categories/CategoryBadgeCollectionViewCell.swift index e4bf558cf..2b1219dbe 100644 --- a/kDrive/UI/View/Files/Categories/CategoryBadgeCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Categories/CategoryBadgeCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/Categories/CategoryCollectionViewCell.swift b/kDrive/UI/View/Files/Categories/CategoryCollectionViewCell.swift index b0bdf3c8f..3130c2397 100644 --- a/kDrive/UI/View/Files/Categories/CategoryCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Categories/CategoryCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/Categories/CategoryTableViewCell.swift b/kDrive/UI/View/Files/Categories/CategoryTableViewCell.swift index 64e0cacb3..750d9f30d 100644 --- a/kDrive/UI/View/Files/Categories/CategoryTableViewCell.swift +++ b/kDrive/UI/View/Files/Categories/CategoryTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/Categories/ManageCategoriesTableViewCell.swift b/kDrive/UI/View/Files/Categories/ManageCategoriesTableViewCell.swift index 965dedd85..a4483ab25 100644 --- a/kDrive/UI/View/Files/Categories/ManageCategoriesTableViewCell.swift +++ b/kDrive/UI/View/Files/Categories/ManageCategoriesTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/DropBox/DropBoxDisableTableViewCell.swift b/kDrive/UI/View/Files/DropBox/DropBoxDisableTableViewCell.swift index f3a14a930..e0349ab99 100644 --- a/kDrive/UI/View/Files/DropBox/DropBoxDisableTableViewCell.swift +++ b/kDrive/UI/View/Files/DropBox/DropBoxDisableTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class DropBoxDisableTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Files/DropBox/DropBoxLinkTableViewCell.swift b/kDrive/UI/View/Files/DropBox/DropBoxLinkTableViewCell.swift index c2231e7a3..aff0a31a6 100644 --- a/kDrive/UI/View/Files/DropBox/DropBoxLinkTableViewCell.swift +++ b/kDrive/UI/View/Files/DropBox/DropBoxLinkTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift index 3d2ae45e1..abaf87234 100644 --- a/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import LocalizeKit diff --git a/kDrive/UI/View/Files/FileDetail/FileInformation/FileInformationUsersTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/FileInformation/FileInformationUsersTableViewCell.swift index 1f871d055..54508c147 100644 --- a/kDrive/UI/View/Files/FileDetail/FileInformation/FileInformationUsersTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/FileInformation/FileInformationUsersTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/InviteUserTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/InviteUserTableViewCell.swift index 1ee041902..8154429c0 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/InviteUserTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/InviteUserTableViewCell.swift @@ -17,7 +17,7 @@ */ import DropDown -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/InvitedUserTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/InvitedUserTableViewCell.swift index 9171e8e56..3a37353fe 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/InvitedUserTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/InvitedUserTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/MessageTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/MessageTableViewCell.swift index 08daaab61..5c8678370 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/MessageTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/MessageTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/RightsSelectionTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/RightsSelectionTableViewCell.swift index d710242db..9ba9f9e57 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/RightsSelectionTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/RightsSelectionTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkAccessRightTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkAccessRightTableViewCell.swift index ffeb1a669..f0613e419 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkAccessRightTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkAccessRightTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import MaterialOutlinedTextField import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkSettingTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkSettingTableViewCell.swift index f8f3c7dd9..c1039afcc 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkSettingTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkSettingTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import MaterialOutlinedTextField diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift index 8cd6a6868..8386bb0be 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/UsersAccessTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/UsersAccessTableViewCell.swift index ebc297466..b60eaeab0 100644 --- a/kDrive/UI/View/Files/FileDetail/ShareLink/UsersAccessTableViewCell.swift +++ b/kDrive/UI/View/Files/FileDetail/ShareLink/UsersAccessTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/View/Files/FileListBarButton.swift b/kDrive/UI/View/Files/FileListBarButton.swift index c55363306..b3ddb11de 100644 --- a/kDrive/UI/View/Files/FileListBarButton.swift +++ b/kDrive/UI/View/Files/FileListBarButton.swift @@ -17,8 +17,8 @@ */ import Foundation -import UIKit import kDriveResources +import UIKit final class FileListBarButton: UIBarButtonItem { private(set) var type: FileListBarButtonType = .cancel diff --git a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift index 24ef82f8c..998695987 100644 --- a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift +++ b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelSortOptionTableViewCell.swift b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelSortOptionTableViewCell.swift index a8c5a5fb1..0843e42fc 100644 --- a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelSortOptionTableViewCell.swift +++ b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelSortOptionTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class FloatingPanelSortOptionTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelTableViewCell.swift b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelTableViewCell.swift index 850977bc8..19e11a936 100644 --- a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelTableViewCell.swift +++ b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/SaveFile/DriveSwitchTableViewCell.swift b/kDrive/UI/View/Files/SaveFile/DriveSwitchTableViewCell.swift index 8580598c7..3ec41dfaf 100644 --- a/kDrive/UI/View/Files/SaveFile/DriveSwitchTableViewCell.swift +++ b/kDrive/UI/View/Files/SaveFile/DriveSwitchTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/SaveFile/LocationTableViewCell.swift b/kDrive/UI/View/Files/SaveFile/LocationTableViewCell.swift index 6d76af54b..9e0e85003 100644 --- a/kDrive/UI/View/Files/SaveFile/LocationTableViewCell.swift +++ b/kDrive/UI/View/Files/SaveFile/LocationTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/SaveFile/PhotoFormatTableViewCell.swift b/kDrive/UI/View/Files/SaveFile/PhotoFormatTableViewCell.swift index 1f5d98967..b1ad7e3b7 100644 --- a/kDrive/UI/View/Files/SaveFile/PhotoFormatTableViewCell.swift +++ b/kDrive/UI/View/Files/SaveFile/PhotoFormatTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/Search/FileExtensionTextInputTableViewCell.swift b/kDrive/UI/View/Files/Search/FileExtensionTextInputTableViewCell.swift index f4722372e..bc718e07c 100644 --- a/kDrive/UI/View/Files/Search/FileExtensionTextInputTableViewCell.swift +++ b/kDrive/UI/View/Files/Search/FileExtensionTextInputTableViewCell.swift @@ -17,7 +17,7 @@ */ import Foundation -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import MaterialOutlinedTextField diff --git a/kDrive/UI/View/Files/Search/RecentSearchCollectionViewCell.swift b/kDrive/UI/View/Files/Search/RecentSearchCollectionViewCell.swift index 00884df13..7f7ff5d5b 100644 --- a/kDrive/UI/View/Files/Search/RecentSearchCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Search/RecentSearchCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Files/Search/SearchFilterCollectionViewCell.swift b/kDrive/UI/View/Files/Search/SearchFilterCollectionViewCell.swift index efa0e88e2..9b99caa88 100644 --- a/kDrive/UI/View/Files/Search/SearchFilterCollectionViewCell.swift +++ b/kDrive/UI/View/Files/Search/SearchFilterCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/Search/SelectTableViewCell.swift b/kDrive/UI/View/Files/Search/SelectTableViewCell.swift index 84f9e7124..227d4121c 100644 --- a/kDrive/UI/View/Files/Search/SelectTableViewCell.swift +++ b/kDrive/UI/View/Files/Search/SelectTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/Search/TextInputTableViewCell.swift b/kDrive/UI/View/Files/Search/TextInputTableViewCell.swift index c10dff6b5..1e251a19a 100644 --- a/kDrive/UI/View/Files/Search/TextInputTableViewCell.swift +++ b/kDrive/UI/View/Files/Search/TextInputTableViewCell.swift @@ -17,7 +17,7 @@ */ import Foundation -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import MaterialOutlinedTextField diff --git a/kDrive/UI/View/Files/Upload/UploadFolderTableViewCell.swift b/kDrive/UI/View/Files/Upload/UploadFolderTableViewCell.swift index 9b937798a..6955d8577 100644 --- a/kDrive/UI/View/Files/Upload/UploadFolderTableViewCell.swift +++ b/kDrive/UI/View/Files/Upload/UploadFolderTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Files/Upload/UploadTableViewCell.swift b/kDrive/UI/View/Files/Upload/UploadTableViewCell.swift index 90a0d245a..c751dbb69 100644 --- a/kDrive/UI/View/Files/Upload/UploadTableViewCell.swift +++ b/kDrive/UI/View/Files/Upload/UploadTableViewCell.swift @@ -18,7 +18,7 @@ import InfomaniakCore import InfomaniakCoreDB -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/UI/View/Generic/AlertTableViewCell.swift b/kDrive/UI/View/Generic/AlertTableViewCell.swift index 85b3ce2aa..31b45cced 100644 --- a/kDrive/UI/View/Generic/AlertTableViewCell.swift +++ b/kDrive/UI/View/Generic/AlertTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Generic/SelectionTableViewCell.swift b/kDrive/UI/View/Generic/SelectionTableViewCell.swift index 8e218803a..fa049c0d0 100644 --- a/kDrive/UI/View/Generic/SelectionTableViewCell.swift +++ b/kDrive/UI/View/Generic/SelectionTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDrive/UI/View/Header view/HomeRecentFilesHeaderView.swift b/kDrive/UI/View/Header view/HomeRecentFilesHeaderView.swift index af215da5d..f15f7ab3d 100644 --- a/kDrive/UI/View/Header view/HomeRecentFilesHeaderView.swift +++ b/kDrive/UI/View/Header view/HomeRecentFilesHeaderView.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Header view/SelectView.swift b/kDrive/UI/View/Header view/SelectView.swift index d8bc5bdcd..2a9eced61 100644 --- a/kDrive/UI/View/Header view/SelectView.swift +++ b/kDrive/UI/View/Header view/SelectView.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDrive/UI/View/Home/InsufficientStorageCollectionViewCell.swift b/kDrive/UI/View/Home/InsufficientStorageCollectionViewCell.swift index 7728d7360..de8ab4ac7 100644 --- a/kDrive/UI/View/Home/InsufficientStorageCollectionViewCell.swift +++ b/kDrive/UI/View/Home/InsufficientStorageCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Home/RecentActivityCollectionViewCell.swift b/kDrive/UI/View/Home/RecentActivityCollectionViewCell.swift index 932890500..7bac9491e 100644 --- a/kDrive/UI/View/Home/RecentActivityCollectionViewCell.swift +++ b/kDrive/UI/View/Home/RecentActivityCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Home/UploadsInProgressTableViewCell.swift b/kDrive/UI/View/Home/UploadsInProgressTableViewCell.swift index 424c5682c..caf050da0 100644 --- a/kDrive/UI/View/Home/UploadsInProgressTableViewCell.swift +++ b/kDrive/UI/View/Home/UploadsInProgressTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import UIKit diff --git a/kDrive/UI/View/Menu/DriveTitleTableViewCell.swift b/kDrive/UI/View/Menu/DriveTitleTableViewCell.swift index 2d95dc7e5..3608d39b8 100644 --- a/kDrive/UI/View/Menu/DriveTitleTableViewCell.swift +++ b/kDrive/UI/View/Menu/DriveTitleTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class DriveTitleTableViewCell: InsetTableViewCell {} diff --git a/kDrive/UI/View/Menu/MenuTableViewCell.swift b/kDrive/UI/View/Menu/MenuTableViewCell.swift index 5363ba17f..7099a0ab4 100644 --- a/kDrive/UI/View/Menu/MenuTableViewCell.swift +++ b/kDrive/UI/View/Menu/MenuTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class MenuTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Menu/Parameters/AboutDetailTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/AboutDetailTableViewCell.swift index 90a32a46a..159c7b370 100644 --- a/kDrive/UI/View/Menu/Parameters/AboutDetailTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/AboutDetailTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class AboutDetailTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Menu/Parameters/ParameterAboutTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/ParameterAboutTableViewCell.swift index 76ecd8fd1..a9a0bdf2e 100644 --- a/kDrive/UI/View/Menu/Parameters/ParameterAboutTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/ParameterAboutTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class ParameterAboutTableViewCell: InsetTableViewCell {} diff --git a/kDrive/UI/View/Menu/Parameters/ParameterAccessDeniedTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/ParameterAccessDeniedTableViewCell.swift index 125e2f512..137e4e051 100644 --- a/kDrive/UI/View/Menu/Parameters/ParameterAccessDeniedTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/ParameterAccessDeniedTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Menu/Parameters/ParameterSwitchTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/ParameterSwitchTableViewCell.swift index 73ca17011..122fb4bbb 100644 --- a/kDrive/UI/View/Menu/Parameters/ParameterSwitchTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/ParameterSwitchTableViewCell.swift @@ -16,7 +16,8 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import UIKit class ParameterSwitchTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Menu/Parameters/ParameterTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/ParameterTableViewCell.swift index b96bfdd9b..42b1fe2a6 100644 --- a/kDrive/UI/View/Menu/Parameters/ParameterTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/ParameterTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class ParameterTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Menu/Parameters/ParameterWifiTableViewCell.swift b/kDrive/UI/View/Menu/Parameters/ParameterWifiTableViewCell.swift index 74c2f1a58..af27bd1c8 100644 --- a/kDrive/UI/View/Menu/Parameters/ParameterWifiTableViewCell.swift +++ b/kDrive/UI/View/Menu/Parameters/ParameterWifiTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class ParameterWifiTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/Menu/PhotoList/PhotoSectionHeaderView.swift b/kDrive/UI/View/Menu/PhotoList/PhotoSectionHeaderView.swift index cd3898402..ff724dea8 100644 --- a/kDrive/UI/View/Menu/PhotoList/PhotoSectionHeaderView.swift +++ b/kDrive/UI/View/Menu/PhotoList/PhotoSectionHeaderView.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Menu/PhotoSyncSettings/PhotoSyncSettingsTableViewCell.swift b/kDrive/UI/View/Menu/PhotoSyncSettings/PhotoSyncSettingsTableViewCell.swift index d0f842b4e..f28962afe 100644 --- a/kDrive/UI/View/Menu/PhotoSyncSettings/PhotoSyncSettingsTableViewCell.swift +++ b/kDrive/UI/View/Menu/PhotoSyncSettings/PhotoSyncSettingsTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit protocol PhotoSyncSettingsTableViewCellDelegate: AnyObject { diff --git a/kDrive/UI/View/Menu/RootMenuCell.swift b/kDrive/UI/View/Menu/RootMenuCell.swift index 5b66b682c..2fad40cb1 100644 --- a/kDrive/UI/View/Menu/RootMenuCell.swift +++ b/kDrive/UI/View/Menu/RootMenuCell.swift @@ -16,7 +16,8 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import RealmSwift diff --git a/kDrive/UI/View/Menu/Store/StoreCollectionViewCell.swift b/kDrive/UI/View/Menu/Store/StoreCollectionViewCell.swift index d1f70c3a0..ac6ee7062 100644 --- a/kDrive/UI/View/Menu/Store/StoreCollectionViewCell.swift +++ b/kDrive/UI/View/Menu/Store/StoreCollectionViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import StoreKit diff --git a/kDrive/UI/View/Menu/Store/StoreFeatureTableViewCell.swift b/kDrive/UI/View/Menu/Store/StoreFeatureTableViewCell.swift index b2d54ee52..1a6e1ebed 100644 --- a/kDrive/UI/View/Menu/Store/StoreFeatureTableViewCell.swift +++ b/kDrive/UI/View/Menu/Store/StoreFeatureTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/Menu/Store/StoreStorageTableViewCell.swift b/kDrive/UI/View/Menu/Store/StoreStorageTableViewCell.swift index e4be6b6a6..d41dff178 100644 --- a/kDrive/UI/View/Menu/Store/StoreStorageTableViewCell.swift +++ b/kDrive/UI/View/Menu/Store/StoreStorageTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/NewFolder/FolderTypeTableViewCell.swift b/kDrive/UI/View/NewFolder/FolderTypeTableViewCell.swift index f4ffac06f..09ccfd8c1 100644 --- a/kDrive/UI/View/NewFolder/FolderTypeTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/FolderTypeTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class FolderTypeTableViewCell: InsetTableViewCell { diff --git a/kDrive/UI/View/NewFolder/NewFolderHeaderTableViewCell.swift b/kDrive/UI/View/NewFolder/NewFolderHeaderTableViewCell.swift index 087c361cc..7dcc984fc 100644 --- a/kDrive/UI/View/NewFolder/NewFolderHeaderTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/NewFolderHeaderTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import MaterialOutlinedTextField diff --git a/kDrive/UI/View/NewFolder/NewFolderLocationTableViewCell.swift b/kDrive/UI/View/NewFolder/NewFolderLocationTableViewCell.swift index 9039033df..488b503ba 100644 --- a/kDrive/UI/View/NewFolder/NewFolderLocationTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/NewFolderLocationTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import UIKit diff --git a/kDrive/UI/View/NewFolder/NewFolderSettingsTableViewCell.swift b/kDrive/UI/View/NewFolder/NewFolderSettingsTableViewCell.swift index 1f64e994e..ab0c2bbfd 100644 --- a/kDrive/UI/View/NewFolder/NewFolderSettingsTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/NewFolderSettingsTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveCore import kDriveResources import MaterialOutlinedTextField diff --git a/kDrive/UI/View/NewFolder/NewFolderSettingsTitleTableViewCell.swift b/kDrive/UI/View/NewFolder/NewFolderSettingsTitleTableViewCell.swift index a24f866c9..83ece4799 100644 --- a/kDrive/UI/View/NewFolder/NewFolderSettingsTitleTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/NewFolderSettingsTitleTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit class NewFolderSettingsTitleTableViewCell: InsetTableViewCell {} diff --git a/kDrive/UI/View/NewFolder/NewFolderShareRuleTableViewCell.swift b/kDrive/UI/View/NewFolder/NewFolderShareRuleTableViewCell.swift index 31e96e875..c1476b640 100644 --- a/kDrive/UI/View/NewFolder/NewFolderShareRuleTableViewCell.swift +++ b/kDrive/UI/View/NewFolder/NewFolderShareRuleTableViewCell.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/Utils/CustomLargeTitleCollectionViewController.swift b/kDrive/Utils/CustomLargeTitleCollectionViewController.swift index 5c0ada33c..86d00a8d2 100644 --- a/kDrive/Utils/CustomLargeTitleCollectionViewController.swift +++ b/kDrive/Utils/CustomLargeTitleCollectionViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import UIKit class CustomLargeTitleCollectionViewController: UICollectionViewController { diff --git a/kDrive/Utils/FileActionsHelper.swift b/kDrive/Utils/FileActionsHelper.swift index 44ca2cee4..0e019f279 100644 --- a/kDrive/Utils/FileActionsHelper.swift +++ b/kDrive/Utils/FileActionsHelper.swift @@ -18,7 +18,8 @@ import CocoaLumberjackSwift import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveCore import kDriveResources diff --git a/kDrive/Utils/UINavigationController+Extension.swift b/kDrive/Utils/UINavigationController+Extension.swift index 1652bcd49..7c437892a 100644 --- a/kDrive/Utils/UINavigationController+Extension.swift +++ b/kDrive/Utils/UINavigationController+Extension.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import kDriveCore import kDriveResources import UIKit diff --git a/kDriveActionExtension/ActionNavigationController.swift b/kDriveActionExtension/ActionNavigationController.swift index 4e79b17e5..2298caf09 100644 --- a/kDriveActionExtension/ActionNavigationController.swift +++ b/kDriveActionExtension/ActionNavigationController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import InfomaniakLogin import kDriveCore diff --git a/kDriveCore/Data/Models/Category.swift b/kDriveCore/Data/Models/Category.swift index d19b3e4d6..f6540acee 100644 --- a/kDriveCore/Data/Models/Category.swift +++ b/kDriveCore/Data/Models/Category.swift @@ -17,7 +17,7 @@ */ import Foundation -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import RealmSwift import UIKit diff --git a/kDriveCore/UI/Alert/AlertChoiceViewController.swift b/kDriveCore/UI/Alert/AlertChoiceViewController.swift index 0205798e1..9c2adc470 100644 --- a/kDriveCore/UI/Alert/AlertChoiceViewController.swift +++ b/kDriveCore/UI/Alert/AlertChoiceViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDriveCore/UI/Alert/AlertTextViewController.swift b/kDriveCore/UI/Alert/AlertTextViewController.swift index cda92d63b..e2f0ea8ba 100644 --- a/kDriveCore/UI/Alert/AlertTextViewController.swift +++ b/kDriveCore/UI/Alert/AlertTextViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import UIKit /// Alert with text content diff --git a/kDriveCore/UI/Alert/AlertViewController.swift b/kDriveCore/UI/Alert/AlertViewController.swift index 6529246b5..4c9db10eb 100644 --- a/kDriveCore/UI/Alert/AlertViewController.swift +++ b/kDriveCore/UI/Alert/AlertViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import kDriveResources import UIKit diff --git a/kDriveCore/UI/IKButton.swift b/kDriveCore/UI/IKButton.swift index 2f187c148..00b4f3f43 100644 --- a/kDriveCore/UI/IKButton.swift +++ b/kDriveCore/UI/IKButton.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import UIKit @IBDesignable public class IKButton: UIButton { diff --git a/kDriveCore/UI/UIConstants.swift b/kDriveCore/UI/UIConstants.swift index 637934d06..61c29d25e 100644 --- a/kDriveCore/UI/UIConstants.swift +++ b/kDriveCore/UI/UIConstants.swift @@ -17,7 +17,8 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI +import InfomaniakCoreUIKit import kDriveResources import LinkPresentation import SnackBar diff --git a/kDriveCore/Utils/Files/FileImportHelper.swift b/kDriveCore/Utils/Files/FileImportHelper.swift index 5a18b656b..27c68fd93 100644 --- a/kDriveCore/Utils/Files/FileImportHelper.swift +++ b/kDriveCore/Utils/Files/FileImportHelper.swift @@ -20,7 +20,7 @@ import CocoaLumberjackSwift import Foundation import InfomaniakConcurrency import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI import kDriveResources import Photos diff --git a/kDriveCore/Utils/Files/ImportedFile.swift b/kDriveCore/Utils/Files/ImportedFile.swift index 0fe0bf05e..0a90ca34d 100644 --- a/kDriveCore/Utils/Files/ImportedFile.swift +++ b/kDriveCore/Utils/Files/ImportedFile.swift @@ -19,7 +19,7 @@ import CocoaLumberjackSwift import Foundation import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveResources import PDFKit diff --git a/kDriveCore/Utils/Files/PhotoFileFormat.swift b/kDriveCore/Utils/Files/PhotoFileFormat.swift index 29b24365a..acf61e31d 100644 --- a/kDriveCore/Utils/Files/PhotoFileFormat.swift +++ b/kDriveCore/Utils/Files/PhotoFileFormat.swift @@ -19,7 +19,7 @@ import CocoaLumberjackSwift import Foundation import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveResources import PDFKit diff --git a/kDriveCore/Utils/Files/ScanFileFormat.swift b/kDriveCore/Utils/Files/ScanFileFormat.swift index 9467e64fe..6a70b91e6 100644 --- a/kDriveCore/Utils/Files/ScanFileFormat.swift +++ b/kDriveCore/Utils/Files/ScanFileFormat.swift @@ -19,7 +19,7 @@ import CocoaLumberjackSwift import Foundation import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import kDriveResources import PDFKit diff --git a/kDriveCore/Utils/NotificationsHelper.swift b/kDriveCore/Utils/NotificationsHelper.swift index 3381cdf98..6e1b0c3e5 100644 --- a/kDriveCore/Utils/NotificationsHelper.swift +++ b/kDriveCore/Utils/NotificationsHelper.swift @@ -19,7 +19,7 @@ import CocoaLumberjackSwift import Foundation import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI import kDriveResources import UserNotifications diff --git a/kDriveCore/Utils/RootViewControllerState.swift b/kDriveCore/Utils/RootViewControllerState.swift index 976c89b7f..a7fb7e2b8 100644 --- a/kDriveCore/Utils/RootViewControllerState.swift +++ b/kDriveCore/Utils/RootViewControllerState.swift @@ -18,7 +18,7 @@ import Foundation import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreCommonUI import InfomaniakDI public enum RootViewControllerState { diff --git a/kDriveShareExtension/ShareNavigationViewController.swift b/kDriveShareExtension/ShareNavigationViewController.swift index 37eedaf89..978bae3e8 100644 --- a/kDriveShareExtension/ShareNavigationViewController.swift +++ b/kDriveShareExtension/ShareNavigationViewController.swift @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import InfomaniakCoreUI +import InfomaniakCoreUIKit import InfomaniakDI import InfomaniakLogin import kDriveCore diff --git a/kDriveTests/kDrive/Launch/ITAppLaunchTest.swift b/kDriveTests/kDrive/Launch/ITAppLaunchTest.swift index 7cd75cfc8..4cd9083a0 100644 --- a/kDriveTests/kDrive/Launch/ITAppLaunchTest.swift +++ b/kDriveTests/kDrive/Launch/ITAppLaunchTest.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit @testable import InfomaniakDI import InfomaniakLogin @testable import kDrive diff --git a/kDriveTests/kDrive/Launch/UTRootViewControllerState.swift b/kDriveTests/kDrive/Launch/UTRootViewControllerState.swift index 07e46669f..39a52513c 100644 --- a/kDriveTests/kDrive/Launch/UTRootViewControllerState.swift +++ b/kDriveTests/kDrive/Launch/UTRootViewControllerState.swift @@ -17,7 +17,7 @@ */ import InfomaniakCore -import InfomaniakCoreUI +import InfomaniakCoreUIKit @testable import InfomaniakDI import InfomaniakLogin @testable import kDrive From 0c78d74f14ef99147f1952ede729896d90fd8b27 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Mon, 7 Oct 2024 15:12:39 +0200 Subject: [PATCH 16/68] =?UTF-8?q?chore:=20XIB=20import=20InfomaniakCoreCom?= =?UTF-8?q?monUI=20|=C2=A0InfomaniakCoreUIKit=20where=20necessary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Weidmann --- .../UI/Controller/Base.lproj/Main.storyboard | 45 ++++------------- .../Save File/SelectPhotoFormatFooterView.xib | 8 ++-- .../InformationFloatingPanel.storyboard | 43 +++++------------ kDrive/UI/Controller/Home/Home.storyboard | 6 +-- .../UI/Controller/Home/RootMenuHeaderView.xib | 23 +++------ kDrive/UI/Controller/Menu/Menu.storyboard | 48 +++++-------------- .../Controller/NewFolder/NewFolder.storyboard | 6 +-- .../UI/View/EmptyTableView/EmptyTableView.xib | 29 ++++------- .../CategoryBadgeCollectionViewCell.xib | 11 ++--- .../Categories/CategoryCollectionViewCell.xib | 11 ++--- .../Categories/CategoryTableViewCell.xib | 11 ++--- .../ColorSelectionTableViewCell.xib | 11 ++--- .../ManageCategoriesTableViewCell.xib | 13 ++--- .../DropBox/DropBoxDisableTableViewCell.xib | 13 ++--- .../DropBox/DropBoxLinkTableViewCell.xib | 18 ++----- .../UI/View/Files/FileCollectionViewCell.xib | 18 ++----- ...leDetailActivitySeparatorTableViewCell.xib | 11 ++--- .../FileDetailActivityTableViewCell.xib | 23 +++------ .../FileDetailCommentListTableViewCell.xib | 11 ++--- .../FileDetailCommentTableViewCell.xib | 25 +++------- .../FileDetailHeaderAltTableViewCell.xib | 23 +++------ .../FileDetailHeaderTableViewCell.xib | 21 ++------ ...etailInformationUserCollectionViewCell.xib | 11 ++--- .../FileInformationCreationTableViewCell.xib | 18 ++----- .../FileInformationLocationTableViewCell.xib | 18 ++----- .../FileInformationOwnerTableViewCell.xib | 18 ++----- .../FileInformationSizeTableViewCell.xib | 18 ++----- .../FileInformationUsersTableViewCell.xib | 18 ++----- .../Files/FileDetail/InfoTableViewCell.xib | 18 ++----- .../InvitedUserCollectionViewCell.xib | 13 ++--- .../RightsSelectionTableViewCell.xib | 20 +++----- .../ShareLinkAccessRightTableViewCell.xib | 21 ++------ .../ShareLinkSettingTableViewCell.xib | 23 +++------ .../ShareLink/ShareLinkTableViewCell.xib | 26 +++------- .../ShareLink/UsersAccessTableViewCell.xib | 33 ++++--------- .../View/Files/FileGridCollectionViewCell.xib | 17 ++----- .../FloatingPanelActionCollectionViewCell.xib | 11 ++--- ...tingPanelQuickActionCollectionViewCell.xib | 13 ++--- .../FloatingPanelSortOptionTableViewCell.xib | 13 ++--- .../FloatingPanelTableViewCell.xib | 13 ++--- .../Preview/NoPreviewCollectionViewCell.xib | 14 ++---- .../SaveFile/DriveSwitchTableViewCell.xib | 13 ++--- .../Files/SaveFile/ImportingTableViewCell.xib | 13 ++--- .../Files/SaveFile/LocationTableViewCell.xib | 11 ++--- .../SaveFile/PhotoFormatTableViewCell.xib | 18 ++----- .../BasicTitleCollectionReusableView.xib | 13 ++--- .../Search/RecentSearchCollectionViewCell.xib | 11 ++--- .../Search/SearchFilterCollectionViewCell.xib | 13 ++--- .../View/Files/Search/SelectTableViewCell.xib | 11 ++--- .../Upload/UploadFolderTableViewCell.xib | 16 ++----- .../View/Files/Upload/UploadTableViewCell.xib | 18 ++----- kDrive/UI/View/Generic/AlertTableViewCell.xib | 11 ++--- .../UI/View/Header view/FilesHeaderView.xib | 36 ++++---------- .../Header view/HomeRecentFilesHeaderView.xib | 13 ++--- kDrive/UI/View/Header view/HomeTitleView.xib | 11 ++--- kDrive/UI/View/Header view/SelectView.xib | 11 ++--- .../InsufficientStorageCollectionViewCell.xib | 28 +++-------- .../RecentActivityBottomTableViewCell.xib | 13 ++--- .../Home/RecentActivityCollectionViewCell.xib | 23 +++------ .../Home/UploadsInProgressTableViewCell.xib | 16 ++----- kDrive/UI/View/Menu/MenuTableViewCell.xib | 11 ++--- kDrive/UI/View/Menu/MenuTopTableViewCell.xib | 28 +++-------- .../Parameters/AboutDetailTableViewCell.xib | 18 ++----- .../ParameterAboutTableViewCell.xib | 13 ++--- .../ParameterAccessDeniedTableViewCell.xib | 14 ++---- .../ParameterSwitchTableViewCell.xib | 15 ++---- .../Parameters/ParameterTableViewCell.xib | 18 ++----- .../Parameters/ParameterWifiTableViewCell.xib | 20 +++----- .../Menu/PhotoList/PhotoSectionHeaderView.xib | 11 ++--- .../PhotoAccessDeniedTableViewCell.xib | 14 ++---- .../PhotoSyncSettingsTableViewCell.xib | 18 ++----- .../Menu/Store/StoreCollectionViewCell.xib | 24 ++-------- .../Menu/Store/StoreFeatureTableViewCell.xib | 13 ++--- .../Menu/Store/StoreStorageTableViewCell.xib | 24 ++-------- .../SwitchUser/NoAccountTableViewCell.xib | 11 ++--- .../SwitchUser/UserAccountTableViewCell.xib | 18 ++----- .../SwitchUser/UsersDropDownTableViewCell.xib | 20 +++----- .../NewFolder/FolderTypeTableViewCell.xib | 20 +++----- .../NewFolderHeaderTableViewCell.xib | 13 ++--- .../NewFolderLocationCollectionViewCell.xib | 15 ++---- .../NewFolderLocationTableViewCell.xib | 16 ++----- .../NewFolder/NewFolderSectionHeaderView.xib | 15 ++---- .../NewFolderSettingsTableViewCell.xib | 23 +++------ .../NewFolderSettingsTitleTableViewCell.xib | 13 ++--- .../NewFolderShareRuleTableViewCell.xib | 18 ++----- .../Onboarding/SlideCollectionViewCell.xib | 26 ++++------ 86 files changed, 415 insertions(+), 1097 deletions(-) diff --git a/kDrive/UI/Controller/Base.lproj/Main.storyboard b/kDrive/UI/Controller/Base.lproj/Main.storyboard index ecfcd3e51..3dabcd4a8 100644 --- a/kDrive/UI/Controller/Base.lproj/Main.storyboard +++ b/kDrive/UI/Controller/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -290,7 +290,7 @@ -