Rename Factory (#21)

Author: aromanov91

Package.swift

@@ -16,6 +16,7 @@ let remoteDependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/oversizedev/OversizeRouter.git", .upToNextMajor(from: "0.1.0")),
     .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
     .package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")),
+    .package(url: "https://github.com/hmlongco/Navigator.git", .upToNextMajor(from: "1.0.0")),
 ]
 
 let localDependencies: [PackageDescription.Package.Dependency] = [
@@ -30,6 +31,7 @@ let localDependencies: [PackageDescription.Package.Dependency] = [
     .package(name: "OversizeRouter", path: "../OversizeRouter"),
     .package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")),
     .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
+    .package(url: "https://github.com/hmlongco/Navigator.git", .upToNextMajor(from: "1.0.0")),
 ]
 
 let dependencies: [PackageDescription.Package.Dependency] = remoteDependencies
@@ -70,6 +72,7 @@ let package = Package(
                 .product(name: "OversizeRouter", package: "OversizeRouter"),
                 .product(name: "FactoryKit", package: "Factory"),
                 .product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
+                .product(name: "NavigatorUI", package: "Navigator"),
             ]
         ),
         .target(
@@ -93,7 +96,7 @@ let package = Package(
                 .product(name: "OversizeServices", package: "OversizeServices"),
                 .product(name: "OversizeContactsService", package: "OversizeServices"),
                 .product(name: "OversizeCalendarService", package: "OversizeServices"),
-                .product(name: "Factory", package: "Factory"),
+                .product(name: "FactoryKit", package: "Factory"),
                 .product(name: "OversizeModels", package: "OversizeModels"),
             ]
         ),

Sources/OversizeContactsKit/ContactsPicker/EmailPickerViewModel.swift

@@ -26,7 +26,6 @@ class EmailPickerViewModel: ObservableObject {
         let status = await contactsService.requestAccess()
         switch status {
         case .success:
-
             let keys = [CNContactGivenNameKey, CNContactFamilyNameKey, CNContactEmailAddressesKey, CNContactThumbnailImageDataKey]
             let result = await contactsService.fetchContacts(keysToFetch: keys as [CNKeyDescriptor])
             switch result {

Sources/OversizeKit/LockscreenKit/LockscreenView.swift

@@ -32,7 +32,7 @@ public struct LockscreenView: View {
 
     private var maxCount: Int
 
-    private var gridItemLayout = Array(repeating: GridItem(.flexible(), spacing: 0), count: 3)
+    private let gridItemLayout = Array(repeating: GridItem(.flexible(), spacing: 0), count: 3)
 
     private let action: (() -> Void)?
     private let biometricAction: (() -> Void)?
@@ -197,7 +197,6 @@ public struct LockscreenView: View {
     var numpad: some View {
         LazyVGrid(columns: gridItemLayout, spacing: isShowTitle ? 20 : 4) {
             ForEach(1 ... 9, id: \.self) { number in
-
                 let stringNumber: String = .init(number)
 
                 Button {

Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift

@@ -14,7 +14,7 @@ import SwiftUI
 
 public struct SecuritySettingsView: View {
     @Injected(\.biometricService) var biometricService
-    @Environment(Router<SettingsScreen>.self) var router
+    @Environment(\.navigator) var navigator
     @StateObject var settingsService = SettingsService()
 
     public init() {}
@@ -72,7 +72,7 @@ extension SecuritySettingsView {
                             if settingsService.isSetedPinCode() {
                                 settingsService.pinCodeEnabend = $0
                             } else {
-                                router.present(.setPINCode)
+                                navigator.navigate(to: SettingsDestinations.setPINCode)
                             }
                         })
                     ) {
@@ -83,7 +83,7 @@ extension SecuritySettingsView {
 
                     if settingsService.isSetedPinCode() {
                         Row(L10n.Security.changePINCode) {
-                            router.present(.updatePINCode)
+                            navigator.navigate(to: SettingsDestinations.updatePINCode)
                         }
                         .rowArrow()
                     }

Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift

@@ -389,7 +389,6 @@ extension StoreViewModel {
             let result = await storeKitService.updateCustomerProductStatus(products: preProducts)
             switch result {
             case let .success(finalProducts):
-
                 if let yarlyProduct = finalProducts.autoRenewable.first(where: { $0.subscription?.subscriptionPeriod.unit == .year && $0.isOffer == specialOfferMode }) {
                     selectedProduct = yarlyProduct
                 } else {