Merge branch 'trunk' into task/remove-minimum-barcode-length

Author: joshheald

Modules/Sources/Networking/Mapper/ProductListMapper.swift

@@ -3,7 +3,7 @@ import XCTest
 @testable import NetworkingCore
 
 
-/// ProductListMapper Unit Tests
+/// ListMapper<Product> Unit Tests
 ///
 final class ProductListMapperTests: XCTestCase {
     private enum ProductListMapperTestsError: Error {
@@ -230,17 +230,17 @@ final class ProductListMapperTests: XCTestCase {
 ///
 private extension ProductListMapperTests {
 
-    /// Returns the ProductListMapper output upon receiving `filename` (Data Encoded)
+    /// Returns the ListMapper<Product> output upon receiving `filename` (Data Encoded)
     ///
     func mapProducts(from filename: String) throws -> [Product] {
         guard let response = Loader.contentsOf(filename) else {
             throw ProductListMapperTestsError.unableToLoadFile
         }
 
-        return try ProductListMapper(siteID: dummySiteID).map(response: response)
+        return try ListMapper<Product>(siteID: dummySiteID).map(response: response)
     }
 
-    /// Returns the ProductListMapper output upon receiving `products-load-all` and `products-load-all-without-data`
+    /// Returns the ListMapper<Product> output upon receiving `products-load-all` and `products-load-all-without-data`
     ///
     func mapLoadAllProductsResponse() throws -> [[Product]] {
         let products = try mapProducts(from: "products-load-all")

Modules/Tests/NetworkingTests/Mapper/ProductListMapperTests.swift

@@ -74,13 +74,13 @@ private extension ProductReviewListMapperTests {
         return try! ProductReviewListMapper(siteID: dummySiteID).map(response: response)
     }
 
-    /// Returns the ProductListMapper output upon receiving `reviews-all`
+    /// Returns the ProductReviewListMapper output upon receiving `reviews-all`
     ///
     func mapLoadAllProductReviewsResponse() -> [ProductReview] {
         return mapProductReviews(from: "reviews-all")
     }
 
-    /// Returns the ProductListMapper output upon receiving `reviews-all-without-data`
+    /// Returns the ProductReviewListMapper output upon receiving `reviews-all-without-data`
     ///
     func mapLoadAllProductReviewsResponseWithoutDataEnvelope() -> [ProductReview] {
         return mapProductReviews(from: "reviews-all-without-data")

Modules/Tests/NetworkingTests/Mapper/ProductReviewListMapperTests.swift

@@ -12,6 +12,7 @@
 - [*] Shipping Labels: Fixed issue displaying fulfilled shipment after purchasing a label and quickly navigating back to the purchase form. [https://github.com/woocommerce/woocommerce-ios/pull/15790]
 - [*] Shipping Labels: Fixed mismatched indices of purchased labels on the order details screen. [https://github.com/woocommerce/woocommerce-ios/pull/15800]
 - [*] POS: Prevent card reader connection success alert flashing when connecting during a payment [https://github.com/woocommerce/woocommerce-ios/pull/15784]
+- [internal] POS: Improved scrolling and animation performance by refactoring the shadow implementation and updating the cart and checkout views. [https://github.com/woocommerce/woocommerce-ios/pull/15817]
 
 22.6
 -----

RELEASE-NOTES.txt

@@ -24,7 +24,8 @@ extension Cart {
             title: title(for: error),
             subtitle: subtitle(for: error),
             quantity: 1,
-            state: .error
+            state: .error,
+            accessibilityLabel: accessibilityLabel(for: error)
         )
     }
 
@@ -50,6 +51,12 @@ extension Cart {
     private func subtitle(for error: PointOfSaleBarcodeScanError) -> String {
         return error.localizedDescription
     }
+
+    private func accessibilityLabel(for error: PointOfSaleBarcodeScanError) -> String {
+        let errorDescription = error.localizedDescription
+        let scannedValue = title(for: error)
+        return "\(errorDescription). \(scannedValue)"
+    }
 }
 
 extension PointOfSaleBarcodeScanError {

WooCommerce/Classes/POS/Models/Cart+BarcodeScanError.swift

@@ -6,6 +6,8 @@ import enum Yosemite.PointOfSaleBarcodeScanError
 struct Cart {
     var purchasableItems: [Cart.PurchasableItem] = []
     var coupons: [Cart.CouponItem] = []
+
+    var accessibilityFocusedItemID: UUID? = nil
 }
 
 protocol CartItem {
@@ -26,6 +28,7 @@ extension Cart {
         let quantity: Int
         let type: CartItemType = .purchasableItem
         let state: ItemState
+        let accessibilityLabel: String?
 
         enum ItemState {
             case loaded(POSOrderableItem)
@@ -42,12 +45,22 @@ extension Cart {
             }
         }
 
-        init(id: UUID, title: String, subtitle: String?, quantity: Int, state: ItemState) {
+        var formattedPrice: String? {
+            switch state {
+            case .loaded(let item):
+                return item.formattedPrice
+            case .loading, .error:
+                return nil
+            }
+        }
+
+        init(id: UUID, title: String, subtitle: String?, quantity: Int, state: ItemState, accessibilityLabel: String? = nil) {
             self.id = id
             self.title = title
             self.subtitle = subtitle
             self.quantity = quantity
             self.state = state
+            self.accessibilityLabel = accessibilityLabel
         }
 
         init(id: UUID, item: POSOrderableItem, title: String, subtitle: String?, quantity: Int) {
@@ -56,6 +69,7 @@ extension Cart {
             self.subtitle = subtitle
             self.quantity = quantity
             self.state = .loaded(item)
+            self.accessibilityLabel = nil
         }
 
         static func loading(id: UUID) -> PurchasableItem {

WooCommerce/Classes/POS/Models/Cart.swift

@@ -218,6 +218,8 @@ extension PointOfSaleAggregateModel {
                         productType: .init(cartItem: cartItem)
                     )
                 )
+
+                cart.accessibilityFocusedItemID = cartItem.id
             }
         } catch {
             DDLogInfo("Failed to find item by barcode: \(error)")