[Woo POS] Modularization: Bring existing changes to trunk (#16132)

Author: staskus

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/IndefiniteCircularProgressViewStyle.swift renamed to Modules/Sources/WooFoundation/UI Components/IndefiniteCircularProgressViewStyle.swift

@@ -1,20 +1,27 @@
 import SwiftUI
 
 public struct IndefiniteCircularProgressViewStyle: ProgressViewStyle {
-    var size: CGFloat
-    var lineWidth: CGFloat = Constants.lineWidth
-    var lineCap: CGLineCap = .round
-    var circleColor: Color = Color(.primaryButtonBackground).opacity(Constants.backgroundOpacity)
-    var fillColor: Color = Color(.primaryButtonBackground)
+    public var size: CGFloat
+    public var lineWidth: CGFloat = Constants.lineWidth
+    public var lineCap: CGLineCap = .round
+    public var circleColor: Color = Color(.primaryButtonBackground).opacity(Constants.backgroundOpacity)
+    public var fillColor: Color = Color(.primaryButtonBackground)
 
-    private let arcStart: Double = Constants.initialArcStart
     private let animationDuration: Double = 1.6
 
     @State private var arcEnd: Double = Constants.initialArcEnd
     @State private var rotation: Angle = Constants.threeQuarterRotation
     @State private var viewRotation: Angle = .radians(0)
     @State private var arcTimer: Timer?
 
+    public init(size: CGFloat, lineWidth: CGFloat = Constants.lineWidth, lineCap: CGLineCap = .round, circleColor: Color? = nil, fillColor: Color? = nil) {
+        self.size = size
+        self.lineWidth = lineWidth
+        self.lineCap = lineCap
+        self.circleColor = circleColor ?? Color(.primaryButtonBackground).opacity(Constants.backgroundOpacity)
+        self.fillColor = fillColor ?? Color(.primaryButtonBackground)
+    }
+
     public func makeBody(configuration: ProgressViewStyleConfiguration) -> some View {
         VStack {
             ZStack {
@@ -78,21 +85,21 @@ public struct IndefiniteCircularProgressViewStyle: ProgressViewStyle {
     }
 }
 
-private extension IndefiniteCircularProgressViewStyle {
+public extension IndefiniteCircularProgressViewStyle {
     enum Constants {
-        static let lineWidth: CGFloat = 10.0
-        static let backgroundOpacity: CGFloat = 0.2
+        public static let lineWidth: CGFloat = 10.0
+        public static let backgroundOpacity: CGFloat = 0.2
 
-        static let initialArcStart: Double = 0
-        static let initialArcEnd: Double = 0.05
-        static let fullCircle: Double = 1
+        public static let initialArcStart: Double = 0
+        public static let initialArcEnd: Double = 0.05
+        public static let fullCircle: Double = 1
 
-        static let threeQuarterRotation: Angle = .radians((9 * Double.pi)/6)
-        static let fullRotation: Angle = .radians(Double.pi * 2)
+        public static let threeQuarterRotation: Angle = .radians((9 * Double.pi)/6)
+        public static let fullRotation: Angle = .radians(Double.pi * 2)
     }
 
     enum Localization {
-        static let inProgressAccessibilityLabel = NSLocalizedString(
+        public static let inProgressAccessibilityLabel = NSLocalizedString(
             "In progress",
             comment: "Accessibility label for an indeterminate loading indicator")
     }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/KeyboardObserver.swift renamed to Modules/Sources/WooFoundation/UI Components/KeyboardObserver.swift

@@ -2,22 +2,22 @@ import SwiftUI
 import Combine
 
 @Observable
-final class KeyboardObserver {
-    private(set) var isKeyboardVisible: Bool = false
-    private(set) var keyboardHeight: CGFloat = 0
+public final class KeyboardObserver {
+    public private(set) var isKeyboardVisible: Bool = false
+    public private(set) var keyboardHeight: CGFloat = 0
 
     /// When an external keyboard is in use, iPadOS shows a quicktype bar at the bottom of the screen.
     /// This is reported as a keyboard with height, so `isKeyboardVisible` will be true and
     /// keyboard height will be > 0.
     /// However, it's much less of an impingement on the view, so there may be no modification to the view required.
     /// `isFullSizeKeyboardVisible` is true when the full software keyboard is shown.
-    var isFullSizeKeyboardVisible: Bool {
+    public var isFullSizeKeyboardVisible: Bool {
         return keyboardHeight > Constants.hardwareKeyboardHelperBarHeightThreshold
     }
 
     private var cancellables = Set<AnyCancellable>()
 
-    init() {
+    public init() {
         NotificationCenter.Publisher(center: .default, name: UIResponder.keyboardWillShowNotification)
             .merge(with: NotificationCenter.Publisher(center: .default, name: UIResponder.keyboardDidShowNotification))
             .receive(on: DispatchQueue.main)
@@ -47,9 +47,9 @@ final class KeyboardObserver {
     }
 }
 
-private extension KeyboardObserver {
+public extension KeyboardObserver {
     enum Constants {
-        static let hardwareKeyboardHelperBarHeightThreshold: CGFloat = 90
+        public static let hardwareKeyboardHelperBarHeightThreshold: CGFloat = 90
     }
 }
 
@@ -60,22 +60,22 @@ private struct KeyboardObserverKey: EnvironmentKey {
     }
 }
 
-extension EnvironmentValues {
+public extension EnvironmentValues {
     var keyboardObserver: KeyboardObserver {
         get { self[KeyboardObserverKey.self] }
         set { self[KeyboardObserverKey.self] = newValue }
     }
 }
 
-struct KeyboardObserverProvider: ViewModifier {
+public struct KeyboardObserverProvider: ViewModifier {
     @State private var observer = KeyboardObserver()
 
-    func body(content: Content) -> some View {
+    public func body(content: Content) -> some View {
         content.environment(\.keyboardObserver, observer)
     }
 }
 
-extension View {
+public extension View {
     func injectKeyboardObserver() -> some View {
         modifier(KeyboardObserverProvider())
     }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/ScrollableVStack.swift renamed to Modules/Sources/WooFoundation/UI Components/ScrollableVStack.swift

@@ -2,13 +2,13 @@ import SwiftUI
 
 /// Wraps a VStack inside a ScrollView, ensuring the content expands to fill the available space
 ///
-struct ScrollableVStack<Content: View>: View {
+public struct ScrollableVStack<Content: View>: View {
     let alignment: HorizontalAlignment
     let padding: CGFloat
     let spacing: CGFloat?
     let content: Content
 
-    init(
+    public init(
         alignment: HorizontalAlignment = .center,
         padding: CGFloat = 24,
         spacing: CGFloat? = nil,
@@ -20,7 +20,7 @@ struct ScrollableVStack<Content: View>: View {
         self.content = content()
     }
 
-    var body: some View {
+    public var body: some View {
         GeometryReader { geometry in
             ScrollView {
                 VStack(alignment: alignment, spacing: spacing) {

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/TextFieldStyles.swift renamed to Modules/Sources/WooFoundation/UI Components/TextFieldStyles.swift

@@ -1,7 +1,7 @@
 import SwiftUI
 
 /// Text field has a rounded border that has a thicker border and brighter border color when the field is focused.
-struct WooRoundedBorderTextFieldStyle: TextFieldStyle {
+public struct WooRoundedBorderTextFieldStyle: TextFieldStyle {
     private let focused: Bool
     private let focusedBorderColor: Color
     private let unfocusedBorderColor: Color
@@ -19,7 +19,7 @@ struct WooRoundedBorderTextFieldStyle: TextFieldStyle {
     ///   - insets: The insets between the background border and the text input.
     ///   - height: An optional fixed height for the field.
     ///   - content: Optional closure to wrap the text field content.
-    init(focused: Bool,
+    public init(focused: Bool,
          focusedBorderColor: Color = Defaults.focusedBorderColor,
          unfocusedBorderColor: Color = Defaults.unfocusedBorderColor,
          backgroundColor: Color = .clear,
@@ -37,7 +37,7 @@ struct WooRoundedBorderTextFieldStyle: TextFieldStyle {
         self.content = content
     }
 
-    func _body(configuration: TextField<Self._Label>) -> some View {
+    public func _body(configuration: TextField<Self._Label>) -> some View {
         let styledContent = content?(configuration) ?? AnyView(configuration)
 
         styledContent
@@ -53,11 +53,11 @@ struct WooRoundedBorderTextFieldStyle: TextFieldStyle {
     }
 }
 
-extension WooRoundedBorderTextFieldStyle {
+public extension WooRoundedBorderTextFieldStyle {
     enum Defaults {
-        static let focusedBorderColor: Color = .init(uiColor: .brand)
-        static let unfocusedBorderColor: Color = .gray
-        static let insets = EdgeInsets(top: 10, leading: 10, bottom: 10, trailing: 10)
+        public static let focusedBorderColor: Color = .init(uiColor: .brand)
+        public static let unfocusedBorderColor: Color = .gray
+        public static let insets = EdgeInsets(top: 10, leading: 10, bottom: 10, trailing: 10)
     }
 }
 

WooCommerce/Classes/Tools/Connectivity/ConnectivityObserver.swift renamed to Modules/Sources/WooFoundation/Utilities/Connectivity/ConnectivityObserver.swift

@@ -2,7 +2,7 @@ import Combine
 
 /// Interface for the observing connectivity
 ///
-protocol ConnectivityObserver {
+public protocol ConnectivityObserver {
     /// Getter for current state of the connectivity.
     var currentStatus: ConnectivityStatus { get }
 
@@ -21,7 +21,7 @@ protocol ConnectivityObserver {
 /// - unknown:      It is unknown whether the network is reachable.
 /// - notReachable: The network is not reachable.
 /// - reachable:    The network is reachable.
-enum ConnectivityStatus: Equatable {
+public enum ConnectivityStatus: Equatable {
     case unknown
     case notReachable
     case reachable(type: ConnectionType)
@@ -32,7 +32,7 @@ enum ConnectivityStatus: Equatable {
 /// - ethernetOrWiFi: The connection type is either over Ethernet or WiFi.
 /// - cellular:       The connection type is a cellular connection.
 /// - other:          The connection type is via a local loopback network, virtual network or other unknown types.
-enum ConnectionType: Equatable {
+public enum ConnectionType: Equatable {
     case ethernetOrWiFi
     case cellular
     case other

WooCommerce/Classes/Tools/Connectivity/DefaultConnectivityObserver.swift renamed to Modules/Sources/WooFoundation/Utilities/Connectivity/DefaultConnectivityObserver.swift

@@ -1,19 +1,23 @@
 import Combine
 import Network
 
-final class DefaultConnectivityObserver: ConnectivityObserver {
+public final class DefaultConnectivityObserver: ConnectivityObserver {
 
     /// Network monitor to evaluate connection.
     ///
     private let networkMonitor: NetworkMonitoring
     private let observingQueue: DispatchQueue = .global(qos: .background)
 
-    @Published private(set) var currentStatus: ConnectivityStatus = .unknown
+    @Published private(set) public var currentStatus: ConnectivityStatus = .unknown
 
-    var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
+    public var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
         $currentStatus.eraseToAnyPublisher()
     }
 
+    public convenience init() {
+        self.init(networkMonitor: NWPathMonitor())
+    }
+
     init(networkMonitor: NetworkMonitoring = NWPathMonitor()) {
         self.networkMonitor = networkMonitor
         startObserving()
@@ -25,11 +29,11 @@ final class DefaultConnectivityObserver: ConnectivityObserver {
         }
     }
 
-    func startObserving() {
+    public func startObserving() {
         networkMonitor.start(queue: observingQueue)
     }
 
-    func stopObserving() {
+    public func stopObserving() {
         networkMonitor.cancel()
     }
 

WooCommerce/Classes/View Modifiers/View+AutofocusTextModifier.swift renamed to Modules/Sources/WooFoundation/ViewModifiers/View+AutofocusTextModifier.swift

@@ -2,11 +2,13 @@ import SwiftUI
 
 /// Autofocus for `TextField` and `TextEditor` in iOS 15 and later
 ///
-struct AutofocusTextModifier: ViewModifier {
+public struct AutofocusTextModifier: ViewModifier {
 
     @FocusState private var textFieldIsFocused: Bool
 
-    func body(content: Content) -> some View {
+    public init() {}
+
+    public func body(content: Content) -> some View {
         content
             .focused($textFieldIsFocused)
             .onAppear {
@@ -21,7 +23,7 @@ struct AutofocusTextModifier: ViewModifier {
 
 // MARK: View extension
 
-extension View {
+public extension View {
 
     /// Autofocus in `TextField` and `TextEditor` is available only for iOS15+
     ///

WooCommerce/Classes/View Modifiers/View+Conditionals.swift renamed to Modules/Sources/WooFoundation/ViewModifiers/View+Conditionals.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-extension View {
+public extension View {
     /// Renders a view if the provided  `condition` is met.
     /// If the `condition` is not met, an `nil`  will be used in place of the receiver view.
     ///

WooCommerce/Classes/View Modifiers/View+Measurements.swift renamed to Modules/Sources/WooFoundation/ViewModifiers/View+Measurements.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-extension View {
+public extension View {
     /// Measures the height of a view and calls the provided callback with the height value.
     /// The callback is called both when the view first appears and whenever its height changes.
     /// If the view contains a list, consider wrapping it in a VStack to ensure the height updates are emitted as a group

WooCommerce/Classes/View Modifiers/View+RoundedBorder.swift renamed to Modules/Sources/WooFoundation/ViewModifiers/View+RoundedBorder.swift

@@ -1,13 +1,20 @@
 import SwiftUI
 
 /// Custom view modifier for applying a rounded border to a view.
-struct RoundedBorder: ViewModifier {
+public struct RoundedBorder: ViewModifier {
     let cornerRadius: CGFloat
     let lineColor: Color
     let lineWidth: CGFloat
     let dashed: Bool
 
-    func body(content: Content) -> some View {
+    public init(cornerRadius: CGFloat, lineColor: Color, lineWidth: CGFloat, dashed: Bool) {
+        self.cornerRadius = cornerRadius
+        self.lineColor = lineColor
+        self.lineWidth = lineWidth
+        self.dashed = dashed
+    }
+
+    public func body(content: Content) -> some View {
         content
             .overlay {
                 RoundedRectangle(cornerRadius: cornerRadius)
@@ -19,12 +26,11 @@ struct RoundedBorder: ViewModifier {
 
 private extension RoundedBorder {
     enum Layout {
-        static let height: CGFloat = 1
         static let dashLength: CGFloat = 5
     }
 }
 
-extension View {
+public extension View {
     /// Applies a rounded border to a view.
     func roundedBorder(cornerRadius: CGFloat, lineColor: Color, lineWidth: CGFloat, dashed: Bool = false) -> some View {
         self.modifier(RoundedBorder(cornerRadius: cornerRadius, lineColor: lineColor, lineWidth: lineWidth, dashed: dashed))