Merge branch 'trunk' into issue/7114-coupon-encoder-bug

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 9.5
 -----
 - [*] Coupons: Fixed issue saving "Individual Use" and "Exclude Sale Items" fields. [https://github.com/woocommerce/woocommerce-ios/pull/7117]
+- [*] Orders: The customer shipping/billing address form now navigates back automatically after selecting a country or state. [https://github.com/woocommerce/woocommerce-ios/pull/7119]
 
 9.4
 -----

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -65,6 +65,12 @@ final class OrderDetailsDataSource: NSObject {
             !isEligibleForCardPresentPayment
     }
 
+    /// Whether the row for amount paid should be visible.
+    ///
+    private var shouldShowCustomerPaidRow: Bool {
+        order.datePaid != nil
+    }
+
     /// Whether the option to re-create shipping labels should be visible.
     ///
     var shouldAllowRecreatingShippingLabels: Bool {
@@ -576,7 +582,7 @@ private extension OrderDetailsDataSource {
     }
 
     private func configureRefund(cell: TwoColumnHeadlineFootnoteTableViewCell, at indexPath: IndexPath) {
-        let index = indexPath.row - Constants.paymentCell - Constants.paidByCustomerCell
+        let index = indexPath.row - Constants.paymentCell - Constants.paidByCustomerCell(isDisplayed: shouldShowCustomerPaidRow)
         let condensedRefund = condensedRefunds[index]
         let refund = lookUpRefund(by: condensedRefund.refundID)
         let paymentViewModel = OrderPaymentDetailsViewModel(order: order, refund: refund)
@@ -1140,8 +1146,6 @@ extension OrderDetailsDataSource {
         let payment: Section = {
             var rows: [Row] = [.payment]
 
-            let shouldShowCustomerPaidRow = order.datePaid != nil
-
             if shouldShowCustomerPaidRow {
                 rows.append(.customerPaid)
             }
@@ -1220,7 +1224,7 @@ extension OrderDetailsDataSource {
     }
 
     func refund(at indexPath: IndexPath) -> Refund? {
-        let index = indexPath.row - Constants.paymentCell - Constants.paidByCustomerCell
+        let index = indexPath.row - Constants.paymentCell - Constants.paidByCustomerCell(isDisplayed: shouldShowCustomerPaidRow)
         let condensedRefund = condensedRefunds[index]
         let refund = refunds.first { $0.refundID == condensedRefund.refundID }
 
@@ -1616,10 +1620,15 @@ extension OrderDetailsDataSource {
         case editShippingAddress
     }
 
-    struct Constants {
+    enum Constants {
         static let addOrderCell = 1
         static let paymentCell = 1
-        static let paidByCustomerCell = 1
+
+        /// Input value required because cell is displayed conditionally
+        ///
+        static func paidByCustomerCell(isDisplayed: Bool) -> Int {
+            isDisplayed ? 1 : 0
+        }
     }
 }
 

WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/DiscountTypeBottomSheetListSelectorCommand.swift

@@ -28,8 +28,8 @@ final class DiscountTypeBottomSheetListSelectorCommand: BottomSheetListSelectorC
                                                                     image: model.actionSheetIcon,
                                                                     imageTintColor: .gray(.shade20),
                                                                     numberOfLinesForText: 0,
-                                                                    isSelected: isSelected(model: model),
-                                                                    isActionable: false)
+                                                                    isSelected: isSelected(model: model)
+        )
         cell.updateUI(viewModel: viewModel)
     }
 

WooCommerce/Classes/ViewRelated/Orders/Order Creation/FlowCoordinator/BottomSheetOrderType.swift

@@ -77,8 +77,7 @@ final class OrderTypeBottomSheetListSelectorCommand: BottomSheetListSelectorComm
                                                                     image: model.actionSheetImage,
                                                                     imageTintColor: .gray(.shade20),
                                                                     numberOfLinesForTitle: 0,
-                                                                    numberOfLinesForText: 0,
-                                                                    isActionable: false)
+                                                                    numberOfLinesForText: 0)
         cell.updateUI(viewModel: viewModel)
     }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorCommand.swift

@@ -31,6 +31,7 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {
 
     func handleSelectedChange(selected: Country, viewController: ViewController) {
         self.selected = selected
+        viewController.navigationController?.popViewController(animated: true)
     }
 
     func isSelected(model: Country) -> Bool {

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/StateSelectorCommand.swift

@@ -31,6 +31,7 @@ final class StateSelectorCommand: ObservableListSelectorCommand {
 
     func handleSelectedChange(selected: StateOfACountry, viewController: ViewController) {
         self.selected = selected
+        viewController.navigationController?.popViewController(animated: true)
     }
 
     func isSelected(model: StateOfACountry) -> Bool {

WooCommerce/Classes/ViewRelated/Products/Edit Product/BottomSheetListSelector/ProductTypeBottomSheetListSelectorCommand.swift

@@ -163,8 +163,7 @@ final class ProductTypeBottomSheetListSelectorCommand: BottomSheetListSelectorCo
                                                                     text: model.actionSheetDescription,
                                                                     image: model.actionSheetImage,
                                                                     imageTintColor: .gray(.shade20),
-                                                                    numberOfLinesForText: 0,
-                                                                    isActionable: false)
+                                                                    numberOfLinesForText: 0)
         cell.updateUI(viewModel: viewModel)
     }
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/Cells/ImageAndTitleAndTextTableViewCell.swift

@@ -68,6 +68,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
         let numberOfLinesForText: Int
         let isActionable: Bool
         let isSelected: Bool
+        let showsDisclosureIndicator: Bool
         let showsSeparator: Bool
 
         init(title: String?,
@@ -80,6 +81,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
              numberOfLinesForText: Int = 1,
              isSelected: Bool = false,
              isActionable: Bool = true,
+             showsDisclosureIndicator: Bool = false,
              showsSeparator: Bool = true) {
             self.title = title
             self.titleFontStyle = titleFontStyle
@@ -91,6 +93,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
             self.numberOfLinesForText = numberOfLinesForText
             self.isSelected = isSelected
             self.isActionable = isActionable
+            self.showsDisclosureIndicator = showsDisclosureIndicator
             self.showsSeparator = showsSeparator
         }
     }
@@ -129,6 +132,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
         configureContentStackView()
         configureTitleAndTextStackView()
         applyDefaultBackgroundStyle()
+        configureSelectedBackground()
     }
 
     override func prepareForReuse() {
@@ -157,7 +161,13 @@ extension ImageAndTitleAndTextTableViewCell {
         descriptionLabel.numberOfLines = viewModel.numberOfLinesForText
         contentImageView.image = viewModel.image
         contentImageStackView.isHidden = viewModel.image == nil
-        accessoryType = viewModel.isActionable ? .disclosureIndicator : (viewModel.isSelected ? .checkmark : .none)
+        if viewModel.showsDisclosureIndicator {
+            accessoryType = .disclosureIndicator
+        } else if viewModel.isSelected {
+            accessoryType = .checkmark
+        } else {
+            accessoryType = .none
+        }
         selectionStyle = viewModel.isActionable ? .default: .none
         accessoryView = nil
 
@@ -290,6 +300,11 @@ private extension ImageAndTitleAndTextTableViewCell {
     func configureTitleAndTextStackView() {
         titleAndTextStackView.spacing = 2
     }
+
+    func configureSelectedBackground() {
+        selectedBackgroundView = UIView()
+        selectedBackgroundView?.backgroundColor = .listBackground
+    }
 }
 
 // MARK: Accessibility

WooCommerce/Classes/ViewRelated/Products/Edit Product/Downloadable Files/File List/BottomSheetListSelector/DownloadableFileBottomSheetListSelectorCommand.swift

@@ -26,7 +26,8 @@ final class DownloadableFileBottomSheetListSelectorCommand: BottomSheetListSelec
                                                                     textTintColor: .text,
                                                                     image: model.image,
                                                                     imageTintColor: .gray(.shade20),
-                                                                    numberOfLinesForText: 0)
+                                                                    numberOfLinesForText: 0,
+                                                                    showsDisclosureIndicator: true)
         cell.updateUI(viewModel: viewModel)
     }
 

WooCommerce/Resources/ar.lproj/InfoPlist.strings

@@ -1,14 +1,17 @@
-/* A message that tells the user why the app is requesting access to the device’s camera. */
-NSCameraUsageDescription = "To take photos or videos to add to your Products, scan barcode for Product SKU, or support tickets.";
-
-/* A message that tells the user why the app is requesting access to the user’s photo library. */
-NSPhotoLibraryUsageDescription = "To save photos from camera for Product images, or to add photos or videos to your Products or support tickets.";
-
-/* A message that tells the user why the app is requesting access to the user’s location information while the app is running in the foreground. */
-NSLocationWhenInUseUsageDescription = "Location access is required in order to accept payments.";
-
-/* A message that tells the user why the app is requesting the ability to connect to Bluetooth peripherals. */
-NSBluetoothPeripheralUsageDescription = "Bluetooth access is required in order to connect to supported card readers.";
-
-/* A message that tells the user why the app needs access to Bluetooth. */
-NSBluetoothAlwaysUsageDescription = "This app uses Bluetooth to connect to supported card readers.";
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--Warning: Auto-generated file, do not edit.-->
+<plist version="1.0">
+  <dict>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>يستخدم هذا التطبيق تقنية Bluetooth للربط بأجهزة قارئ البطاقة المدعومة.</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>يلزم الوصول إلى تقنية Bluetooth للربط بأجهزة قارئ البطاقة المدعومة.</string>
+    <key>NSCameraUsageDescription</key>
+    <string>لالتقاط صور أو مقاطع فيديو لإضافتها إلى منتجاتك، قم بإجراء مسح ضوئي للرمز الشريطي الخاص بوحدة SKU للمنتج أو تذاكر الدعم</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>يلزم الوصول إلى الموقع لقبول المدفوعات.</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>لحفظ الصور من كاميرا خاصة بصور المنتجات أو لإضافة صور أو مقاطع فيديو إلى منتجاتك أو تذاكر الدعم الخاصة بك.</string>
+  </dict>
+</plist>