feat: code style improvements

Author: pmusolino

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetails.swift

@@ -4,8 +4,8 @@ import Yosemite
 struct ShippingLabelPackageDetails: View {
     @State private var viewModel: ShippingLabelPackageDetailsViewModel
 
-    init(items: [OrderItem], currency: String) {
-        _viewModel = State(initialValue: ShippingLabelPackageDetailsViewModel(items: items, currency: currency))
+    init(viewModel: ShippingLabelPackageDetailsViewModel) {
+        _viewModel = State(initialValue: viewModel)
     }
 
     var body: some View {
@@ -40,8 +40,10 @@ struct ShippingLabelPackageDetails: View {
 
                 ListHeaderView(text: Localization.footer, alignment: .left)
                     .background(Color(.listBackground))
-            }.background(Color(.systemBackground))
-        }.background(Color(.listBackground))
+            }
+            .background(Color(.systemBackground))
+        }
+        .background(Color(.listBackground))
     }
 }
 
@@ -61,11 +63,15 @@ private extension ShippingLabelPackageDetails {
 struct ShippingLabelPackageDetails_Previews: PreviewProvider {
 
     static var previews: some View {
-        ShippingLabelPackageDetails(items: ShippingLabelPackageDetails_Previews.sampleItems(), currency: ShippingLabelPackageDetails_Previews.sampleCurrency())
+
+        let viewModel = ShippingLabelPackageDetailsViewModel(items: ShippingLabelPackageDetails_Previews.sampleItems(),
+                                                             currency: ShippingLabelPackageDetails_Previews.sampleCurrency())
+
+        ShippingLabelPackageDetails(viewModel: viewModel)
             .environment(\.colorScheme, .light)
             .previewDisplayName("Light")
 
-        ShippingLabelPackageDetails(items: ShippingLabelPackageDetails_Previews.sampleItems(), currency: ShippingLabelPackageDetails_Previews.sampleCurrency())
+        ShippingLabelPackageDetails(viewModel: viewModel)
             .environment(\.colorScheme, .dark)
             .previewDisplayName("Dark")
     }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetailsViewController.swift

@@ -5,7 +5,8 @@ import Yosemite
 /// Displays the Shipping Label Package Details
 final class ShippingLabelPackageDetailsViewController: UIHostingController<ShippingLabelPackageDetails> {
     init(items: [OrderItem], currency: String) {
-        super.init(rootView: ShippingLabelPackageDetails(items: items, currency: currency))
+        let viewModel = ShippingLabelPackageDetailsViewModel(items: items, currency: currency)
+        super.init(rootView: ShippingLabelPackageDetails(viewModel: viewModel))
         configureNavigationBar()
     }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageNumberRow.swift

@@ -12,10 +12,13 @@ struct ShippingLabelPackageNumberRow: View {
 
     var body: some View {
         HStack {
-            Text(String(format: Localization.package, packageNumber)).font(.headline)
-            Text(String(format: Localization.numberOfItems, numberOfItems)).font(.body)
+            Text(String(format: Localization.package, packageNumber))
+                .font(.headline)
+            Text(String(format: Localization.numberOfItems, numberOfItems))
+                .font(.body)
             Spacer()
-        }.frame(height: Constants.height)
+        }
+        .frame(height: Constants.height)
         .padding([.leading, .trailing], Constants.padding)
     }
 }
@@ -24,7 +27,6 @@ private extension ShippingLabelPackageNumberRow {
     enum Localization {
         static let package = NSLocalizedString("Package %1$d", comment: "Package term in Shipping Labels. Reads like Package 1")
         static let numberOfItems = NSLocalizedString("- %1$d items", comment: "Number of items in packages in Shipping Labels. Reads like - 10 items")
-
     }
 
     enum Constants {

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/ItemToFulfillRow.swift

@@ -11,13 +11,15 @@ struct ItemToFulfillRow: View, Identifiable {
         HStack {
             VStack(alignment: .leading,
                    spacing: 8) {
-                Text(title).font(.body)
+                Text(title)
+                    .font(.body)
                 Text(subtitle)
                     .font(.footnote)
                     .foregroundColor(Color(.textSubtle))
             }.padding([.leading, .trailing], Constants.vStackPadding)
             Spacer()
-        }.padding([.top, .bottom], Constants.hStackPadding)
+        }
+        .padding([.top, .bottom], Constants.hStackPadding)
         .frame(minHeight: Constants.height)
     }
 }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/TitleAndTextFieldRow.swift

@@ -5,7 +5,7 @@ import SwiftUI
 struct TitleAndTextFieldRow: View {
     let title: String
     let placeholder: String
-    @State var text: String = ""
+    @State var text: String
     let symbol: String?
     let keyboardType: UIKeyboardType
 

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/TitleAndValueRow.swift

@@ -10,9 +10,12 @@ struct TitleAndValueRow: View {
 
     var body: some View {
         HStack {
-            Text(title).font(.body)
+            Text(title)
+                .font(.body)
             Spacer()
-            Text(value).font(.body).foregroundColor(Color(.textSubtle))
+            Text(value)
+                .font(.body)
+                .foregroundColor(Color(.textSubtle))
 
             if selectable {
                 Image(uiImage: .chevronImage)
@@ -33,21 +36,19 @@ struct TitleAndValueRow: View {
 
 private extension TitleAndValueRow {
     enum Constants {
-        static let imageSize = 22
+        static let imageSize: CGFloat = 22
         static let height: CGFloat = 44
         static let padding: CGFloat = 16
     }
 }
 
 struct TitleAndValueRow_Previews: PreviewProvider {
     static var previews: some View {
-        TitleAndValueRow(title: "Package selected", value: "Small package 1", selectable: true, action: {
-        })
+        TitleAndValueRow(title: "Package selected", value: "Small package 1", selectable: true, action: { })
             .previewLayout(.fixed(width: 375, height: 100))
             .previewDisplayName("Row Selectable")
 
-        TitleAndValueRow(title: "Package selected", value: "Small package 2", selectable: false, action: {
-        })
+        TitleAndValueRow(title: "Package selected", value: "Small package 2", selectable: false, action: { })
             .previewLayout(.fixed(width: 375, height: 100))
             .previewDisplayName("Row Not Selectable")
     }