From 31e8a01dcc35b21f66a03bf9db9a28ddc4adb29b Mon Sep 17 00:00:00 2001 From: Baptiste Griva Date: Fri, 4 Oct 2024 16:07:31 +0200 Subject: [PATCH] fix: Add "e" to "syncMod" --- Tuist/Package.resolved | 16 ++++++++-------- .../Menu/ParameterTableViewController.swift | 4 ++-- .../Menu/PhotoSyncSettingsViewController.swift | 4 ++-- .../Menu/WifiSyncSettingsViewController.swift | 18 +++++++++--------- .../DriveFileManagerConstants.swift | 4 ++-- kDriveCore/Data/Cache/PhotoSyncSettings.swift | 4 ++-- .../Utils/DriveUserDefaults+Extension.swift | 10 +++++----- .../Utils/{SyncMod.swift => SyncMode.swift} | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) rename kDriveCore/Utils/{SyncMod.swift => SyncMode.swift} (95%) diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved index ca77ce3cb..313621894 100644 --- a/Tuist/Package.resolved +++ b/Tuist/Package.resolved @@ -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/kDrive/UI/Controller/Menu/ParameterTableViewController.swift b/kDrive/UI/Controller/Menu/ParameterTableViewController.swift index d9dbe4534..e7119e165 100644 --- a/kDrive/UI/Controller/Menu/ParameterTableViewController.swift +++ b/kDrive/UI/Controller/Menu/ParameterTableViewController.swift @@ -140,8 +140,8 @@ class ParameterTableViewController: BaseGroupedTableViewController { case .wifi: let cell = tableView.dequeueReusableCell(type: AboutDetailTableViewCell.self, for: indexPath) cell.initWithPositionAndShadow(isFirst: indexPath.row == 0, isLast: indexPath.row == tableContent.count - 1) - cell.titleLabel.text = UserDefaults.shared.syncMod.title - cell.detailLabel.text = UserDefaults.shared.syncMod.selectionTitle + cell.titleLabel.text = UserDefaults.shared.syncMode.title + cell.detailLabel.text = UserDefaults.shared.syncMode.selectionTitle return cell } } diff --git a/kDrive/UI/Controller/Menu/PhotoSyncSettingsViewController.swift b/kDrive/UI/Controller/Menu/PhotoSyncSettingsViewController.swift index 803d39c0b..ab006eabd 100644 --- a/kDrive/UI/Controller/Menu/PhotoSyncSettingsViewController.swift +++ b/kDrive/UI/Controller/Menu/PhotoSyncSettingsViewController.swift @@ -434,7 +434,7 @@ extension PhotoSyncSettingsViewController { let cell = tableView.dequeueReusableCell(type: AboutDetailTableViewCell.self, for: indexPath) cell.initWithPositionAndShadow(isFirst: indexPath.row == 0, isLast: indexPath.row == settingsRows.count - 1) cell.titleLabel.text = KDriveResourcesStrings.Localizable.syncWifiPicturesTitle - cell.detailLabel.text = UserDefaults.shared.syncMod.title + cell.detailLabel.text = UserDefaults.shared.syncMode.title return cell } case .syncDenied: @@ -566,7 +566,7 @@ extension PhotoSyncSettingsViewController: PhotoSyncSettingsTableViewCellDelegat } extension PhotoSyncSettingsViewController: WifiSyncSettingsDelegate { - func didSelectSyncMod(_ mod: SyncMod) { + func didSelectSyncMode(_ mod: SyncMode) { newSyncSettings.wifiSync = mod tableView.reloadRows(at: [IndexPath(row: 7, section: 2)], with: .fade) } diff --git a/kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift b/kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift index 051e98798..fe8a721a1 100644 --- a/kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift +++ b/kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift @@ -23,14 +23,14 @@ import kDriveResources import UIKit protocol WifiSyncSettingsDelegate: AnyObject { - func didSelectSyncMod(_ mod: SyncMod) + func didSelectSyncMode(_ mod: SyncMode) } class WifiSyncSettingsViewController: BaseGroupedTableViewController { @LazyInjectService private var appNavigable: AppNavigable - private var tableContent: [SyncMod] = SyncMod.allCases - private var selectedMod: SyncMod! + private var tableContent: [SyncMode] = SyncMode.allCases + private var selectedMod: SyncMode! weak var delegate: WifiSyncSettingsDelegate? override func viewDidLoad() { @@ -41,10 +41,10 @@ class WifiSyncSettingsViewController: BaseGroupedTableViewController { tableView.register(cellView: ParameterSyncTableViewCell.self) tableView.allowsMultipleSelection = false - selectedMod = UserDefaults.shared.syncMod + selectedMod = UserDefaults.shared.syncMode } - static func instantiate(selectedMod: SyncMod) -> WifiSyncSettingsViewController { + static func instantiate(selectedMod: SyncMode) -> WifiSyncSettingsViewController { let viewController = WifiSyncSettingsViewController() viewController.selectedMod = selectedMod return viewController @@ -76,10 +76,10 @@ class WifiSyncSettingsViewController: BaseGroupedTableViewController { } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - let mod = tableContent[indexPath.row] - MatomoUtils.track(eventWithCategory: .settings, name: "mod\(mod.rawValue.capitalized)") - UserDefaults.shared.syncMod = mod - delegate?.didSelectSyncMod(tableContent[indexPath.row]) + let mode = tableContent[indexPath.row] + MatomoUtils.track(eventWithCategory: .settings, name: "mod\(mode.rawValue.capitalized)") + UserDefaults.shared.syncMode = mode + delegate?.didSelectSyncMode(tableContent[indexPath.row]) navigationController?.popViewController(animated: true) } } diff --git a/kDriveCore/Data/Cache/DriveFileManager/DriveFileManagerConstants.swift b/kDriveCore/Data/Cache/DriveFileManager/DriveFileManagerConstants.swift index 396bd1f91..bc5a8c14e 100644 --- a/kDriveCore/Data/Cache/DriveFileManager/DriveFileManagerConstants.swift +++ b/kDriveCore/Data/Cache/DriveFileManager/DriveFileManagerConstants.swift @@ -212,9 +212,9 @@ public class DriveFileManagerConstants { return } if UserDefaults.shared.isWifiOnly { - newObject["wifiSync"] = SyncMod.onlyWifi + newObject["wifiSync"] = SyncMode.onlyWifi } else { - newObject["wifiSync"] = SyncMod.wifiAndMobileData + newObject["wifiSync"] = SyncMode.wifiAndMobileData } } } diff --git a/kDriveCore/Data/Cache/PhotoSyncSettings.swift b/kDriveCore/Data/Cache/PhotoSyncSettings.swift index ff0a21919..06b90f19a 100644 --- a/kDriveCore/Data/Cache/PhotoSyncSettings.swift +++ b/kDriveCore/Data/Cache/PhotoSyncSettings.swift @@ -50,7 +50,7 @@ public final class PhotoSyncSettings: Object { @Persisted public var createDatedSubFolders = false @Persisted public var deleteAssetsAfterImport = false @Persisted public var photoFormat: PhotoFileFormat = .jpg - @Persisted public var wifiSync: SyncMod = .wifiAndMobileData + @Persisted public var wifiSync: SyncMode = .wifiAndMobileData public init(userId: Int, driveId: Int, @@ -64,7 +64,7 @@ public final class PhotoSyncSettings: Object { createDatedSubFolders: Bool, deleteAssetsAfterImport: Bool, photoFormat: PhotoFileFormat, - wifiSync: SyncMod) { + wifiSync: SyncMode) { super.init() self.userId = userId self.driveId = driveId diff --git a/kDriveCore/Utils/DriveUserDefaults+Extension.swift b/kDriveCore/Utils/DriveUserDefaults+Extension.swift index baf0ef764..823edb3e9 100644 --- a/kDriveCore/Utils/DriveUserDefaults+Extension.swift +++ b/kDriveCore/Utils/DriveUserDefaults+Extension.swift @@ -49,7 +49,7 @@ extension UserDefaults.Keys { static let selectedHomeIndex = UserDefaults.Keys(rawValue: "selectedHomeIndex") static let fpStorageVersion = UserDefaults.Keys(rawValue: "fpStorageVersion") static let importPhotoFormat = UserDefaults.Keys(rawValue: "importPhotoFormat") - static let syncMod = UserDefaults.Keys(rawValue: "syncMod") + static let syncMode = UserDefaults.Keys(rawValue: "syncMode") } public extension UserDefaults { @@ -338,16 +338,16 @@ public extension UserDefaults { } } - var syncMod: SyncMod { + var syncMode: SyncMode { get { - if let rawValue = object(forKey: key(.syncMod)) as? String, - let mod = SyncMod(rawValue: rawValue) { + if let rawValue = object(forKey: key(.syncMode)) as? String, + let mod = SyncMode(rawValue: rawValue) { return mod } return .onlyWifi } set { - set(newValue.rawValue, forKey: key(.syncMod)) + set(newValue.rawValue, forKey: key(.syncMode)) } } } diff --git a/kDriveCore/Utils/SyncMod.swift b/kDriveCore/Utils/SyncMode.swift similarity index 95% rename from kDriveCore/Utils/SyncMod.swift rename to kDriveCore/Utils/SyncMode.swift index eea58c1b1..4d05f98da 100644 --- a/kDriveCore/Utils/SyncMod.swift +++ b/kDriveCore/Utils/SyncMode.swift @@ -20,7 +20,7 @@ import kDriveResources import UIKit import RealmSwift -public enum SyncMod: String, CaseIterable, PersistableEnum { +public enum SyncMode: String, CaseIterable, PersistableEnum { case onlyWifi case wifiAndMobileData