Merge branch 'develop' into issue/2003-remove-showWPUsernamePassword

Author: mindgraffiti

Podfile

@@ -56,7 +56,7 @@ target 'WooCommerce' do
   pod 'Charts', '~> 3.3.0'
   pod 'ZendeskSupportSDK', '~> 5.0'
   pod 'Kingfisher', '~> 5.11.0'
-  pod 'Wormholy', '~> 1.5.2', :configurations => ['Debug']
+  pod 'Wormholy', '~> 1.6.0', :configurations => ['Debug']
 
   # Unit Tests
   # ==========

Podfile.lock

@@ -72,7 +72,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - WordPressUI (1.5.2)
-  - Wormholy (1.5.2)
+  - Wormholy (1.6.0)
   - WPMediaPicker (1.6.0)
   - wpxmlrpc (0.8.5)
   - XLPagerTabStrip (9.0.0)
@@ -104,7 +104,7 @@ DEPENDENCIES:
   - WordPressAuthenticator (~> 1.14.0-beta.1)
   - WordPressShared (~> 1.8.16)
   - WordPressUI (~> 1.5.2)
-  - Wormholy (~> 1.5.2)
+  - Wormholy (~> 1.6.0)
   - WPMediaPicker (~> 1.6.0)
   - XLPagerTabStrip (~> 9.0)
   - ZendeskSupportSDK (~> 5.0)
@@ -176,7 +176,7 @@ SPEC CHECKSUMS:
   WordPressKit: 84045e236949248632a2c644149e5657733011bb
   WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01
   WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18
-  Wormholy: 3344d3591d78488d957402d51dccfbfafd6f9641
+  Wormholy: f52cd3c384fb49ae3e8fdb2b1398b66746a65104
   WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
   wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf
   XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
@@ -188,6 +188,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0
   ZendeskSupportSDK: e52f37fa8bcba91f024b81025869fe5a2860f741
 
-PODFILE CHECKSUM: 241533919f715d30f23901123d0a89d3dc3e80c5
+PODFILE CHECKSUM: d66561e633700641266a46e0d1583e889aa31798
 
 COCOAPODS: 1.9.1

WooCommerce/Classes/Extensions/UINavigationController+Woo.swift

@@ -43,7 +43,7 @@ protocol UINavigationBarBackButtonHandler {
 
 extension UIViewController: UINavigationBarBackButtonHandler {
     //Do not block the "Back" button action by default, otherwise, override this function in the specified viewcontroller
-    @objc func  shouldPopOnBackButton() -> Bool {
+    @objc func shouldPopOnBackButton() -> Bool {
         return true
     }
 }
@@ -75,3 +75,34 @@ extension UINavigationController: UINavigationBarDelegate {
         return false
     }
 }
+
+// MARK: - Handle the swipe back gesture
+protocol NavigationSwipeBackHandler {
+
+    /// Should block the 'SwipeBack' gesture
+    ///
+    /// - Returns: true - don't block，false - block
+    func shouldPopOnSwipeBack() -> Bool
+}
+
+extension UIViewController: NavigationSwipeBackHandler {
+    //Do not block the "Swipe back" gesture by default, otherwise, override this function in the specified viewcontroller
+    @objc func shouldPopOnSwipeBack() -> Bool {
+        return true
+    }
+}
+
+extension UIViewController: UIGestureRecognizerDelegate {
+
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer.isEqual(navigationController?.interactivePopGestureRecognizer) {
+            return shouldPopOnSwipeBack()
+        }
+
+        return false
+    }
+
+    func handleSwipeBackGesture() {
+        navigationController?.interactivePopGestureRecognizer?.delegate = self
+    }
+}

WooCommerce/Classes/ViewRelated/Editor/AztecEditorViewController.swift

@@ -131,6 +131,7 @@ final class AztecEditorViewController: UIViewController, Editor {
         content = getHTML()
 
         refreshPlaceholderVisibility()
+        handleSwipeBackGesture()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -258,6 +259,10 @@ extension AztecEditorViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     private func presentBackNavigationActionSheet() {
         UIAlertController.presentDiscardChangesActionSheet(viewController: self, onDiscard: { [weak self] in
             self?.navigationController?.popViewController(animated: true)

WooCommerce/Classes/ViewRelated/Products/Edit Product/Edit Price/ProductPriceSettingsViewController.swift

@@ -62,6 +62,7 @@ final class ProductPriceSettingsViewController: UIViewController {
         configureSections()
         configureTableView()
         retrieveProductTaxClass()
+        handleSwipeBackGesture()
     }
 }
 
@@ -137,6 +138,10 @@ extension ProductPriceSettingsViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     @objc private func completeUpdating() {
         viewModel.completeUpdating(onCompletion: { [weak self] (regularPrice, salePrice, dateOnSaleStart, dateOnSaleEnd, taxStatus, taxClass) in
             self?.onCompletion(regularPrice, salePrice, dateOnSaleStart, dateOnSaleEnd, taxStatus, taxClass)

WooCommerce/Classes/ViewRelated/Products/Edit Product/Inventory Settings/ProductInventorySettingsViewController.swift

@@ -73,6 +73,7 @@ final class ProductInventorySettingsViewController: UIViewController {
         configureMainView()
         configureTableView()
         reloadSections()
+        handleSwipeBackGesture()
     }
 }
 
@@ -193,6 +194,10 @@ extension ProductInventorySettingsViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     @objc private func completeUpdating() {
         if skuIsValid {
             let data = ProductInventoryEditableData(sku: self.sku,

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsViewController.swift

@@ -31,6 +31,7 @@ final class ProductSettingsViewController: UIViewController {
         configureNavigationBar()
         configureMainView()
         configureTableView()
+        handleSwipeBackGesture()
         viewModel.onReload = {  [weak self] in
             self?.tableView.reloadData()
         }
@@ -77,6 +78,10 @@ extension ProductSettingsViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     @objc private func completeUpdating() {
         onCompletion(viewModel.productSettings)
         navigationController?.popViewController(animated: true)

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

@@ -87,6 +87,7 @@ final class ProductFormViewController: UIViewController {
         configureTableView()
 
         startListeningToNotifications()
+        handleSwipeBackGesture()
 
         productImageActionHandler.addUpdateObserver(self) { [weak self] (productImageStatuses, error) in
             guard let self = self else {
@@ -426,6 +427,10 @@ extension ProductFormViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     private func presentBackNavigationActionSheet() {
         UIAlertController.presentDiscardChangesActionSheet(viewController: self, onDiscard: { [weak self] in
             self?.navigationController?.popViewController(animated: true)

WooCommerce/Classes/ViewRelated/Products/Edit Product/Shipping Settings/ProductShippingSettingsViewController.swift

@@ -66,6 +66,7 @@ final class ProductShippingSettingsViewController: UIViewController {
         configureMainView()
         configureTableView()
         retrieveProductShippingClass()
+        handleSwipeBackGesture()
     }
 }
 
@@ -130,6 +131,10 @@ extension ProductShippingSettingsViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     @objc private func completeUpdating() {
         let dimensions = ProductDimensions(length: length ?? "",
                                            width: width ?? "",

WooCommerce/Classes/ViewRelated/Products/Media/ProductImagesViewController.swift

@@ -86,6 +86,7 @@ final class ProductImagesViewController: UIViewController {
         configureAddButtonBottomBorderView()
         configureImagesContainerView()
         configureProductImagesObservation()
+        handleSwipeBackGesture()
     }
 }
 
@@ -177,6 +178,10 @@ extension ProductImagesViewController {
         return true
     }
 
+    override func shouldPopOnSwipeBack() -> Bool {
+        return shouldPopOnBackButton()
+    }
+
     private func presentDiscardChangesActionSheet() {
         UIAlertController.presentDiscardChangesActionSheet(viewController: self, onDiscard: { [weak self] in
             self?.resetProductImages()