refactor: PR self feedback

Infomaniak · Feb 11, 2025 · 08faf5b · 08faf5b
1 parent db4366a
commit 08faf5b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/kDrive/UI/Controller/Files/File List/FileListViewController.swift b/kDrive/UI/Controller/Files/File List/FileListViewController.swift
@@ -108,7 +108,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
         return button
     }()
 
-    lazy var selectedPackId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
+    lazy var packId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
 
     // MARK: - View controller lifecycle
 
@@ -593,7 +593,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
         }
 
         let isTrash = viewModel.currentDirectory.id == DriveFileManager.trashRootFile.id
-        let isMykSuite = selectedPackId == .myKSuite
+        let isMykSuite = packId == .myKSuite
         headerView.trashInformationView.isHidden = !isTrash // !(isTrash && isMykSuite) TODO: Use actual logic
 
         headerView.sortView.isHidden = !isEmptyViewHidden

diff --git a/kDrive/UI/Controller/Files/FileDetailViewController.swift b/kDrive/UI/Controller/Files/FileDetailViewController.swift
@@ -40,8 +40,8 @@ class FileDetailViewController: UIViewController, SceneStateRestorable {
     private var comments = [Comment]()
     private var commentsInfo = (page: 1, hasNextPage: true, isLoading: true)
 
-    lazy var selectedPackId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
-    
+    lazy var packId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
+
     private struct ActivitySection {
         let referenceDate: Date
         var elements: [FileActivity]
@@ -552,7 +552,7 @@ extension FileDetailViewController: UITableViewDelegate, UITableViewDataSource {
                 case .share:
                     let cell = tableView.dequeueReusableCell(type: ShareLinkTableViewCell.self, for: indexPath)
                     cell.delegate = self
-                    cell.configureWith(file: file, selectedPackId: selectedPackId, insets: false)
+                    cell.configureWith(file: file, currentPackId: packId, insets: false)
                     return cell
                 case .categories:
                     let cell = tableView.dequeueReusableCell(type: ManageCategoriesTableViewCell.self, for: indexPath)

diff --git a/kDrive/UI/Controller/Files/Rights and Share/ShareAndRightsViewController.swift b/kDrive/UI/Controller/Files/Rights and Share/ShareAndRightsViewController.swift
@@ -49,7 +49,7 @@ class ShareAndRightsViewController: UIViewController {
     var driveFileManager: DriveFileManager!
     var file: File!
 
-    lazy var selectedPackId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
+    lazy var packId = DrivePackId(rawValue: driveFileManager.drive.pack.name)
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -192,7 +192,7 @@ extension ShareAndRightsViewController: UITableViewDelegate, UITableViewDataSour
             let cell = tableView.dequeueReusableCell(type: ShareLinkTableViewCell.self, for: indexPath)
             cell.initWithPositionAndShadow(isFirst: true, isLast: true, radius: 6)
             cell.delegate = self
-            cell.configureWith(file: file, displayChip: true, selectedPackId: selectedPackId) // TODO: selectedPackId == .myKSuite
+            cell.configureWith(file: file, displayChip: true, currentPackId: packId) // TODO: selectedPackId == .myKSuite
             return cell
         case .access:
             let cell = tableView.dequeueReusableCell(type: UsersAccessTableViewCell.self, for: indexPath)
@@ -214,8 +214,8 @@ extension ShareAndRightsViewController: UITableViewDelegate, UITableViewDataSour
         case .link:
             // TODO: Remove force display
 //            guard selectedPackId != .myKSuite else {
-                router.presentUpSaleSheet()
-                return
+            router.presentUpSaleSheet()
+            return
 //            }
 
             let canBecomeLink = file?.capabilities.canBecomeSharelink ?? false || file.hasSharelink

diff --git a/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/ShareLink/ShareLinkTableViewCell.swift
@@ -47,7 +47,7 @@ class ShareLinkTableViewCell: InsetTableViewCell {
 
     weak var delegate: ShareLinkTableViewCellDelegate?
     var url = ""
-    var selectedPackId: DrivePackId?
+    var packId: DrivePackId?
 
     private var contentBackgroundColor = KDriveResourcesAsset.backgroundCardViewColor.color
 
@@ -96,8 +96,8 @@ class ShareLinkTableViewCell: InsetTableViewCell {
         chipContainerView.subviews.forEach { $0.removeFromSuperview() }
     }
 
-    func configureWith(file: File, displayChip: Bool = false, selectedPackId: DrivePackId?, insets: Bool = true) {
-        self.selectedPackId = selectedPackId
+    func configureWith(file: File, displayChip: Bool = false, currentPackId: DrivePackId?, insets: Bool = true) {
+        packId = currentPackId
         selectionStyle = file.isDropbox ? .none : .default
         if insets {
             leadingConstraint.constant = 24
@@ -182,8 +182,8 @@ class ShareLinkTableViewCell: InsetTableViewCell {
     @IBAction func copyButtonPressed(_ sender: UIButton) {
         // TODO: Remove force display
 //        if let selectedPackId, selectedPackId == .myKSuite {
-            router.presentUpSaleSheet()
-            return
+        router.presentUpSaleSheet()
+        return
 //        }
 //        MatomoUtils.track(eventWithCategory: .shareAndRights, name: "shareButton")
 //        delegate?.shareLinkSharedButtonPressed(link: url, sender: sender)
@@ -192,8 +192,8 @@ class ShareLinkTableViewCell: InsetTableViewCell {
     @IBAction func shareLinkSettingsButtonPressed(_ sender: Any) {
         // TODO: Remove force display
 //        if let selectedPackId, selectedPackId == .myKSuite {
-            router.presentUpSaleSheet()
-            return
+        router.presentUpSaleSheet()
+        return
 //        }
 //        delegate?.shareLinkSettingsButtonPressed()
     }