Merge branch 'develop' into issue/2042-m2-feature-switch

# Conflicts:
#	WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift
#	WooCommerce/WooCommerceTests/ViewRelated/Products/Edit Product/DefaultProductFormTableViewModel+EditProductsM3Tests.swift

Author: jaclync

Networking/Networking/Model/Product/ProductStatus.swift

@@ -56,7 +56,7 @@ extension ProductStatus: RawRepresentable {
         case .pending:
             return NSLocalizedString("Pending review", comment: "Display label for the product's pending status")
         case .privateStatus:
-            return NSLocalizedString("Private", comment: "Display label for the product's private status")
+            return NSLocalizedString("Privately published", comment: "Display label for the product's private status")
         case .custom(let payload):
             return payload // unable to localize at runtime.
         }

Networking/Networking/Remote/SitePostsRemote.swift

@@ -16,7 +16,7 @@ public class SitePostsRemote: Remote {
     ///   - completion: Closure to be executed upon completion.
     ///
     public func loadSitePost(for siteID: Int64, postID: Int64, completion: @escaping (Post?, Error?) -> Void) {
-        let path = String(format: "/sites/%d/posts/%d", siteID, postID)
+        let path = String(format: "sites/%d/posts/%d", siteID, postID)
         let parameters = ["fields": "site_ID,password"]
         let request = DotcomRequest(wordpressApiVersion: .mark1_1, method: .get, path: path, parameters: parameters)
         let mapper = PostMapper()
@@ -38,7 +38,7 @@ public class SitePostsRemote: Remote {
             var parameters = try post.toDictionary()
             let parametersFields = ["fields": "site_ID,password"]
             parameters.merge(parametersFields) { (current, _) in current }
-            let path = String(format: "/sites/%d/posts/%d", siteID, postID)
+            let path = String(format: "sites/%d/posts/%d", siteID, postID)
             let request = DotcomRequest(wordpressApiVersion: .mark1_2, method: .post, path: path, parameters: parameters)
             let mapper = PostMapper()
 

Networking/NetworkingTests/Remote/SitePostsRemoteTests.swift

@@ -35,7 +35,7 @@ class SitePostsRemoteTests: XCTestCase {
 
         let postID: Int64 = 7
 
-        network.simulateResponse(requestUrlSuffix: "/sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post")
+        network.simulateResponse(requestUrlSuffix: "sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post")
         remote.loadSitePost(for: sampleSiteID, postID: postID) {[weak self] (sitePost, error) in
             XCTAssertNil(error)
             XCTAssertNotNil(sitePost)
@@ -70,7 +70,7 @@ class SitePostsRemoteTests: XCTestCase {
         let remote = SitePostsRemote(network: network)
         let expectation = self.expectation(description: "Wait for site post update")
 
-        network.simulateResponse(requestUrlSuffix: "/sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post-update")
+        network.simulateResponse(requestUrlSuffix: "sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post-update")
 
         let newPassword = "new-password"
         let post = Post(siteID: sampleSiteID, password: newPassword)

WooCommerce/Classes/Extensions/Optional+String.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+extension Optional where Wrapped == String {
+    var isNilOrEmpty: Bool {
+        guard let self = self else {
+            return true
+        }
+        return self.isEmpty
+    }
+}

WooCommerce/Classes/Extensions/UIImage+Woo.swift

@@ -397,6 +397,12 @@ extension UIImage {
         return im2.imageWithTintColor(tintColor)
     }
 
+    /// Password Field Image
+    ///
+    static var passwordFieldImage: UIImage {
+        return UIImage.gridicon(.visible)
+    }
+
     /// Waiting for Customers Image
     ///
     static var waitingForCustomersImage: UIImage {

WooCommerce/Classes/Styles/UIColor+SemanticColors.swift

@@ -149,6 +149,13 @@ extension UIColor {
         return UIColor(light: .accent,
                        dark: .systemColor(.label))
     }
+
+    /// Text. WooCommercePurple-60 (< iOS 13 and Light Mode) and WooCommercePurple-30 (Dark Mode)
+    ///
+    static var textBrand: UIColor {
+        return UIColor(light: .withColorStudio(.wooCommercePurple, shade: .shade60),
+        dark: .withColorStudio(.wooCommercePurple, shade: .shade30))
+    }
 }
 
 

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

@@ -0,0 +1,63 @@
+import Foundation
+import Yosemite
+
+/// Actions in the product form bottom sheet to add more product details.
+enum ProductFormBottomSheetAction {
+    case editInventorySettings
+    case editShippingSettings
+    case editCategories
+    case editBriefDescription
+}
+
+extension ProductFormBottomSheetAction {
+    func isVisible(product: Product) -> Bool {
+        switch self {
+        case .editInventorySettings:
+            let hasStockData = product.manageStock ? product.stockQuantity != nil: true
+            return product.sku == nil && hasStockData == false
+        case .editShippingSettings:
+            return product.weight.isNilOrEmpty &&
+                product.dimensions.height.isEmpty && product.dimensions.width.isEmpty && product.dimensions.length.isEmpty
+        case .editCategories:
+            return product.categories.isEmpty
+        case .editBriefDescription:
+            return product.briefDescription.isNilOrEmpty
+        }
+    }
+}
+
+extension ProductFormBottomSheetAction {
+    var title: String {
+        switch self {
+        case .editInventorySettings:
+            return NSLocalizedString("Inventory",
+                                     comment: "Title of the product form bottom sheet action for editing inventory settings.")
+        case .editShippingSettings:
+            return NSLocalizedString("Shipping",
+                                     comment: "Title of the product form bottom sheet action for editing shipping settings.")
+        case .editCategories:
+            return NSLocalizedString("Categories",
+                                     comment: "Title of the product form bottom sheet action for editing categories.")
+        case .editBriefDescription:
+            return NSLocalizedString("Short description",
+                                     comment: "Title of the product form bottom sheet action for editing short description.")
+        }
+    }
+
+    var subtitle: String {
+        switch self {
+        case .editInventorySettings:
+            return NSLocalizedString("Update product inventory and SKU",
+                                     comment: "Subtitle of the product form bottom sheet action for editing inventory settings.")
+        case .editShippingSettings:
+            return NSLocalizedString("Add weight and dimensions",
+                                     comment: "Subtitle of the product form bottom sheet action for editing shipping settings.")
+        case .editCategories:
+            return NSLocalizedString("Organise your products into related groups",
+                                     comment: "Subtitle of the product form bottom sheet action for editing categories.")
+        case .editBriefDescription:
+            return NSLocalizedString("A brief excerpt about your product",
+                                     comment: "Subtitle of the product form bottom sheet action for editing short description.")
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+import Yosemite
+
+/// `BottomSheetListSelectorCommand` for selecting a Product form action.
+///
+final class ProductFormBottomSheetListSelectorCommand: BottomSheetListSelectorCommand {
+    typealias Model = ProductFormBottomSheetAction
+    typealias Cell = ImageAndTitleAndTextTableViewCell
+
+    let data: [ProductFormBottomSheetAction]
+
+    let selected: ProductFormBottomSheetAction? = nil
+
+    private let onSelection: (ProductFormBottomSheetAction) -> Void
+
+    init(product: Product,
+         isEditProductsRelease3Enabled: Bool,
+         onSelection: @escaping (ProductFormBottomSheetAction) -> Void) {
+        self.onSelection = onSelection
+
+        let shouldShowShippingSettingsRow = product.isShippingEnabled
+        let shouldShowCategoriesRow = isEditProductsRelease3Enabled
+        let actions: [ProductFormBottomSheetAction?] = [
+            .editInventorySettings,
+            shouldShowShippingSettingsRow ? .editShippingSettings: nil,
+            shouldShowCategoriesRow ? .editCategories: nil,
+            .editBriefDescription
+        ]
+        self.data = actions.compactMap({ $0 }).filter({ $0.isVisible(product: product) })
+    }
+
+    func configureCell(cell: ImageAndTitleAndTextTableViewCell, model: ProductFormBottomSheetAction) {
+        cell.selectionStyle = .none
+        cell.accessoryType = .disclosureIndicator
+        let viewModel = ImageAndTitleAndTextTableViewCell.ViewModel(title: model.title, text: model.subtitle)
+        cell.updateUI(viewModel: viewModel)
+    }
+
+    func handleSelectedChange(selected: ProductFormBottomSheetAction) {
+        onSelection(selected)
+    }
+
+    func isSelected(model: ProductFormBottomSheetAction) -> Bool {
+        return model == selected
+    }
+}

WooCommerce/Classes/ViewRelated/Products/Edit Product/DefaultProductFormTableViewModel.swift

@@ -50,7 +50,7 @@ private extension DefaultProductFormTableViewModel {
     }
 
     func settingsRows(product: Product) -> [ProductFormSection.SettingsRow] {
-        let shouldShowShippingSettingsRow = product.downloadable == false && product.virtual == false
+        let shouldShowShippingSettingsRow = product.isShippingEnabled
         let shouldShowBriefDescriptionRow = isEditProductsRelease2Enabled
         let shouldShowCategoriesRow = isEditProductsRelease3Enabled
 
@@ -62,7 +62,7 @@ private extension DefaultProductFormTableViewModel {
             shouldShowBriefDescriptionRow ? .briefDescription(viewModel: briefDescriptionRow(product: product)): nil
         ]
 
-        return rows.compactMap { $0 }
+        return rows.compactMap { $0 }.filter { $0.isVisible(product: product) }
     }
 }
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/List Selector Data Source/ProductStatusSettingListSelectorCommand.swift

@@ -12,8 +12,7 @@ final class ProductStatusSettingListSelectorCommand: ListSelectorCommand {
     let data: [ProductStatus] = [
         .publish,
         .draft,
-        .pending,
-        .privateStatus
+        .pending
     ]
 
     private(set) var selected: ProductStatus?