[Woo POS] Modularization: move shared dependencies to shared frameworks in preparation for POS modularization

Modules/Sources/WooFoundation/Extensions/DateFormatter+Extensions.swift

@@ -0,0 +1,16 @@
+import Foundation
+
+/// DateFormatter Extensions
+///
+extension DateFormatter {
+    /// Date formatter used for creating a **localized** date and time string.
+    ///
+    /// Example output in English: "Jan 28, 2018, 11:23 AM"
+    ///
+    public static let dateAndTimeFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.setLocalizedDateFormatFromTemplate("MMM d yyyy hh:mm a")
+
+        return formatter
+    }()
+}

WooCommerce/Classes/Extensions/Decimal+Helpers.swift → Modules/Sources/WooFoundation/Extensions/Decimal+Extensions.swift

@@ -1,22 +1,18 @@
 import Foundation
 
 extension Decimal {
-
     /// Returns the int value of a decimal. We ensure we round up our Decimal before converting it to an Int, using NSDecimalRound.
     ///
-    var intValue: Int {
+    public var intValue: Int {
         NSDecimalNumber(decimal: whole).intValue
     }
 
-    func rounded(_ roundingMode: NSDecimalNumber.RoundingMode = .up, scale: Int = 0) -> Self {
+    public func rounded(_ roundingMode: NSDecimalNumber.RoundingMode = .up, scale: Int = 0) -> Self {
         var result = Self()
         var number = self
         NSDecimalRound(&result, &number, scale, roundingMode)
         return result
     }
 
     private var whole: Self { rounded( self < 0 ? .down : .up) }
-
-    private var fraction: Self { self - whole }
-
 }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/SafariSheet.swift → Modules/Sources/WooFoundation/UI Components/SafariSheet.swift

@@ -3,14 +3,18 @@ import SwiftUI
 import SafariServices
 import UIKit
 
-struct SafariSheetView: UIViewControllerRepresentable {
-    let url: URL
+public struct SafariSheetView: UIViewControllerRepresentable {
+    private let url: URL
 
-    func makeUIViewController(context: Context) -> UIViewController {
+    public init(url: URL) {
+        self.url = url
+    }
+
+    public func makeUIViewController(context: Context) -> UIViewController {
         SFSafariViewController(url: url)
     }
 
-    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+    public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
         // nothing to do here
     }
 }
@@ -20,7 +24,7 @@ extension View {
     /// Does nothing if the input URL is nil.
     ///
     @ViewBuilder
-    func safariSheet(isPresented: Binding<Bool>, url: URL?, onDismiss: (() -> Void)? = nil) -> some View {
+    public func safariSheet(isPresented: Binding<Bool>, url: URL?, onDismiss: (() -> Void)? = nil) -> some View {
         if let url = url {
             sheet(isPresented: isPresented, onDismiss: onDismiss) {
                 SafariSheetView(url: url)
@@ -33,7 +37,7 @@ extension View {
     ///
     /// When the sheet is dismissed, the binding's value will be set to nil.
     ///
-    func safariSheet(url: Binding<URL?>, onDismiss: (() -> Void)? = nil) -> some View {
+    public func safariSheet(url: Binding<URL?>, onDismiss: (() -> Void)? = nil) -> some View {
         sheet(isPresented: url.notNil(), onDismiss: onDismiss) {
             if let url = url.wrappedValue {
                 SafariSheetView(url: url)

Modules/Sources/WooFoundation/UI Components/SafariView.swift

@@ -0,0 +1,23 @@
+import SwiftUI
+import SafariServices
+
+/// SwiftUI interface for UIKit SFSafariViewController
+/// Provides a visible interface for web browsing, and Safari features
+///
+public struct SafariView: UIViewControllerRepresentable {
+
+    private let url: URL
+
+    public init(url: URL) {
+        self.url = url
+    }
+
+    public func makeUIViewController(context: UIViewControllerRepresentableContext<SafariView>) -> SFSafariViewController {
+        return SFSafariViewController(url: url)
+    }
+
+    public func updateUIViewController(_ uiViewController: SFSafariViewController,
+                                       context: UIViewControllerRepresentableContext<SafariView>) {
+
+    }
+}

WooCommerce/Classes/Tools/SiteAddress.swift → Modules/Sources/Yosemite/Model/Extensions/CountryCode+readableCountry.swift

@@ -1,92 +1,13 @@
 import Foundation
-import Yosemite
 import WooFoundation
 
-/// Represent and parse the Address of the store, returned in the SiteSettings API `/settings/general/`
-///
-final class SiteAddress {
-
-    private let siteSettings: [SiteSetting]
-
-    var address: String {
-        return getValueFromSiteSettings(Constants.address) ?? ""
-    }
-
-    var address2: String {
-        return getValueFromSiteSettings(Constants.address2) ?? ""
-    }
-
-    var city: String {
-        return getValueFromSiteSettings(Constants.city) ?? ""
-    }
-
-    var postalCode: String {
-        return getValueFromSiteSettings(Constants.postalCode) ?? ""
-    }
-
-    var countryCode: CountryCode {
-        guard let countryComponent = getCountryAndStateComponents().first else {
-            DDLogError("⛔️ Could not determine country code for site address: no country component found.")
-            return .unknown
-        }
-        guard let countryCode = CountryCode(rawValue: countryComponent) else {
-            DDLogError("⛔️ Could not determine country code for country: \(countryComponent)")
-            return .unknown
-        }
-        return countryCode
-    }
-
-    /// Returns the name of the country associated with the current store.
-    /// The default store country is provided in a format like `HK:KOWLOON`
-    /// This method will transform `HK:KOWLOON` into `Hong Kong`
-    /// Will return nil if it can not figure out a valid country name
-    var countryName: String? {
-        guard countryCode != .unknown else {
-            return nil
-        }
-
-        return countryCode.readableCountry
-    }
-
-    var state: String {
-        return getCountryAndStateComponents().last ?? ""
-    }
-
-    init(siteSettings: [SiteSetting] = ServiceLocator.selectedSiteSettings.siteSettings) {
-        self.siteSettings = siteSettings
-    }
-
-    private func getCountryAndStateComponents() -> [String] {
-        getValueFromSiteSettings(Constants.countryAndState)?.components(separatedBy: ":") ?? []
-    }
-
-    private func getValueFromSiteSettings(_ settingID: String) -> String? {
-        return siteSettings.first { (setting) -> Bool in
-            return setting.settingID == settingID
-        }?.value
-    }
-}
-
-// MARK: - Constants.
-//
-private extension SiteAddress {
-    /// The key of the SiteSetting containing the store address
-    enum Constants {
-        static let address = "woocommerce_store_address"
-        static let address2 = "woocommerce_store_address_2"
-        static let city = "woocommerce_store_city"
-        static let postalCode = "woocommerce_store_postcode"
-        static let countryAndState = "woocommerce_default_country"
-    }
-}
-
 // MARK: - Mapping between country codes and readable names
 // The country names were extracted from the response to `/wp-json/wc/v3/settings/general`
 // The default countries are listed under `woocommerce_default_country`
 // in one of the following formats:
 // - `"COUNTRY_CODE": "READABALE_COUNTRY_NAME"
 // - `"COUNTRY_CODE:COUNTRY_REGION": "READABLE_COUNTRY_NAME - READABLE_COUNTRY_REGION"
-extension CountryCode {
+public extension CountryCode {
     var readableCountry: String {
         switch self {
             // A

Modules/Sources/Yosemite/Tools/Settings/SiteAddress.swift

@@ -0,0 +1,80 @@
+import Foundation
+import WooFoundation
+
+/// Represent and parse the Address of the store, returned in the SiteSettings API `/settings/general/`
+///
+public class SiteAddress {
+
+    private let siteSettings: [SiteSetting]
+
+    public var address: String {
+        return getValueFromSiteSettings(Constants.address) ?? ""
+    }
+
+    public var address2: String {
+        return getValueFromSiteSettings(Constants.address2) ?? ""
+    }
+
+    public var city: String {
+        return getValueFromSiteSettings(Constants.city) ?? ""
+    }
+
+    public var postalCode: String {
+        return getValueFromSiteSettings(Constants.postalCode) ?? ""
+    }
+
+    public var countryCode: CountryCode {
+        guard let countryComponent = getCountryAndStateComponents().first else {
+            DDLogError("⛔️ Could not determine country code for site address: no country component found.")
+            return .unknown
+        }
+        guard let countryCode = CountryCode(rawValue: countryComponent) else {
+            DDLogError("⛔️ Could not determine country code for country: \(countryComponent)")
+            return .unknown
+        }
+        return countryCode
+    }
+
+    /// Returns the name of the country associated with the current store.
+    /// The default store country is provided in a format like `HK:KOWLOON`
+    /// This method will transform `HK:KOWLOON` into `Hong Kong`
+    /// Will return nil if it can not figure out a valid country name
+    public var countryName: String? {
+        guard countryCode != .unknown else {
+            return nil
+        }
+
+        return countryCode.readableCountry
+    }
+
+    public var state: String {
+        return getCountryAndStateComponents().last ?? ""
+    }
+
+    public init(siteSettings: [SiteSetting]) {
+        self.siteSettings = siteSettings
+    }
+
+    private func getCountryAndStateComponents() -> [String] {
+        getValueFromSiteSettings(Constants.countryAndState)?.components(separatedBy: ":") ?? []
+    }
+
+    private func getValueFromSiteSettings(_ settingID: String) -> String? {
+        return siteSettings.first { (setting) -> Bool in
+            return setting.settingID == settingID
+        }?.value
+    }
+}
+
+// MARK: - Constants.
+//
+private extension SiteAddress {
+    /// The key of the SiteSetting containing the store address
+    enum Constants {
+        static let address = "woocommerce_store_address"
+        static let address2 = "woocommerce_store_address_2"
+        static let city = "woocommerce_store_city"
+        static let postalCode = "woocommerce_store_postcode"
+        static let countryAndState = "woocommerce_default_country"
+    }
+}

WooCommerce/WooCommerceTests/Tools/SiteAddressTests.swift → Modules/Tests/YosemiteTests/Tools/Settings/SiteAddressTests.swift

@@ -1,6 +1,6 @@
 import XCTest
-@testable import WooCommerce
 @testable import Networking
+@testable import Yosemite
 
 final class SiteAddressTests: XCTestCase {
 

WooCommerce/Classes/Extensions/DateFormatter+Helpers.swift

@@ -81,15 +81,4 @@ extension DateFormatter {
         formatter.setLocalizedDateFormatFromTemplate("hh:mm a")
         return formatter
     }()
-
-    /// Date formatter used for creating a **localized** date and time string.
-    ///
-    /// Example output in English: "Jan 28, 2018, 11:23 AM"
-    ///
-    public static let dateAndTimeFormatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.setLocalizedDateFormatFromTemplate("MMM d yyyy hh:mm a")
-
-        return formatter
-    }()
 }

WooCommerce/Classes/Extensions/SiteAddress+ServiceLocator.swift

@@ -0,0 +1,7 @@
+import class Yosemite.SiteAddress
+
+extension SiteAddress {
+    convenience init() {
+        self.init(siteSettings: ServiceLocator.selectedSiteSettings.siteSettings)
+    }
+}

WooCommerce/Classes/POS/Presentation/Settings/POSSettingsStoreViewModel.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import class Yosemite.SiteAddress
 import protocol Yosemite.PluginsServiceProtocol
 import protocol Yosemite.PointOfSaleSettingsServiceProtocol
 import enum Yosemite.Plugin

WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsHardwareDetailView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.SafariView
 
 struct PointOfSaleSettingsHardwareDetailView: View {
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize

WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsHelpDetailView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.SafariView
 
 struct PointOfSaleSettingsHelpDetailView: View {
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize

WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Yosemite
 
 /// A view that displays when the Point of Sale (POS) feature is not available for the current store.
 /// Shows the specific reason why POS is ineligible and provides a button to re-check eligibility.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardReaderManualRowView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.SafariSheetView
 
 struct CardReaderManualRowView: View {
     // Environment safe areas

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/LegacyPOSTabEligibilityChecker.swift

@@ -13,6 +13,7 @@ import enum Yosemite.FeatureFlagAction
 import enum Yosemite.SettingAction
 import protocol Yosemite.PluginsServiceProtocol
 import class Yosemite.PluginsService
+import class Yosemite.SiteAddress
 import class WooFoundation.VersionHelpers
 
 /// Legacy enum containing POS invisible reasons + POSIneligibleReason cases for i1.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift

@@ -15,6 +15,7 @@ import protocol Yosemite.POSSystemStatusServiceProtocol
 import class Yosemite.POSSystemStatusService
 import protocol Yosemite.POSSiteSettingServiceProtocol
 import class Yosemite.POSSiteSettingService
+import class Yosemite.SiteAddress
 import enum Networking.SiteSettingsFeature
 import class WooFoundation.VersionHelpers
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/WCShip Installation Process/WCShipCTAView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.SafariSheetView
 
 final class WCShipCTAHostingController: UIHostingController<WCShipCTAView> {