Merge branch 'develop' into issue/4990-display-version

Author: allendav

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 7.6
 -----
-
+- [*] Fix: when product image upload fails, the image cell stop loading. [https://github.com/woocommerce/woocommerce-ios/pull/4989]
 
 7.5
 -----

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -0,0 +1,137 @@
+import SwiftUI
+import SafariServices
+
+/// Hosting controller wrapper for `StorePickerError`
+///
+final class StorePickerErrorHostingController: UIHostingController<StorePickerError> {
+
+    /// Creates an `StorePickerErrorHostingController` with preconfigured button actions.
+    ///
+    static func createWithActions(presenting: UIViewController) -> StorePickerErrorHostingController {
+        let viewController = StorePickerErrorHostingController()
+        viewController.setActions(troubleshootingAction: {
+            let safariViewController = SFSafariViewController(url: WooConstants.URLs.troubleshootErrorLoadingData.asURL())
+            viewController.present(safariViewController, animated: true)
+        },
+        contactSupportAction: {
+            presenting.dismiss(animated: true) {
+                ZendeskManager.shared.showNewRequestIfPossible(from: presenting)
+            }
+        },
+        dismissAction: {
+            presenting.dismiss(animated: true)
+        })
+        return viewController
+    }
+
+    init() {
+        super.init(rootView: StorePickerError())
+    }
+
+    required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    /// Actions are set in a separate function because most of the time, they will require to access `self` to be able to present new view controllers.
+    ///
+    func setActions(troubleshootingAction: @escaping () -> Void, contactSupportAction: @escaping () -> Void, dismissAction: @escaping () -> Void) {
+        self.rootView.troubleshootingAction = troubleshootingAction
+        self.rootView.contactSupportAction = contactSupportAction
+        self.rootView.dismissAction = dismissAction
+    }
+}
+
+/// Generic Store Picker error view that allows the user to contact support.
+///
+struct StorePickerError: View {
+
+    /// Closure invoked when the "Troubleshooting" button is pressed
+    ///
+    var troubleshootingAction: () -> Void = {}
+
+    /// Closure invoked when the "Contact Support" button is pressed
+    ///
+    var contactSupportAction: () -> Void = {}
+
+    /// Closure invoked when the "Back To Sites" button is pressed
+    ///
+    var dismissAction: () -> Void = {}
+
+    var body: some View {
+        VStack(alignment: .center, spacing: Layout.mainVerticalSpacing) {
+            // Title
+            Text(Localization.title)
+                .headlineStyle()
+
+            // Main image
+            Image(uiImage: .errorImage)
+
+            // Body text
+            Text(Localization.body)
+                .multilineTextAlignment(.center)
+                .bodyStyle()
+
+            VStack(spacing: Layout.buttonsSpacing) {
+                // Primary Button
+                Button(Localization.troubleshoot, action: troubleshootingAction)
+                    .buttonStyle(PrimaryButtonStyle())
+
+                // Secondary button
+                Button(Localization.contact, action: contactSupportAction)
+                    .buttonStyle(SecondaryButtonStyle())
+
+                // Dismiss button
+                Button(Localization.back, action: dismissAction)
+                    .buttonStyle(LinkButtonStyle())
+            }
+        }
+        .padding([.leading, .trailing, .bottom])
+        .padding(.top, Layout.topPadding)
+        .background(Color(.tertiarySystemBackground))
+        .cornerRadius(Layout.rounderCorners)
+    }
+}
+
+// MARK: Constant
+
+private extension StorePickerError {
+    enum Localization {
+        static let title = NSLocalizedString("We couldn't load your site", comment: "Title for the default store picker error screen")
+        static let body = NSLocalizedString("Please try again or reach out to us and we'll be happy to assist you!",
+                                            comment: "Body text for the default store picker error screen")
+        static let troubleshoot = NSLocalizedString("Read our Troubleshooting Tips",
+                                                    comment: "Text for the button to navigate to troubleshooting tips from the store picker error screen")
+        static let contact = NSLocalizedString("Contact Support",
+                                               comment: "Text for the button to contact support from the store picker error screen")
+        static let back = NSLocalizedString("Back to Sites",
+                                            comment: "Text for the button to dismiss the store picker error screen")
+    }
+
+    enum Layout {
+        static let rounderCorners: CGFloat = 10
+        static let mainVerticalSpacing: CGFloat = 25
+        static let buttonsSpacing: CGFloat = 15
+        static let topPadding: CGFloat = 30
+    }
+}
+
+// MARK: Previews
+
+struct StorePickerError_Preview: PreviewProvider {
+    static var previews: some View {
+        VStack {
+            StorePickerError()
+        }
+        .padding()
+        .background(Color.gray)
+        .previewLayout(.sizeThatFits)
+
+        VStack {
+            StorePickerError()
+        }
+        .padding()
+        .background(Color.gray)
+        .environment(\.colorScheme, .dark)
+        .previewLayout(.sizeThatFits)
+    }
+}

WooCommerce/Classes/Authentication/Epilogue/StorePickerError.swift

@@ -8,9 +8,11 @@ import WordPressUI
 /// an error when Jetpack is not installed or is not connected
 struct JetpackErrorViewModel: ULErrorViewModel {
     private let siteURL: String
+    private let analytics: Analytics
 
-    init(siteURL: String?) {
+    init(siteURL: String?, analytics: Analytics = ServiceLocator.analytics) {
         self.siteURL = siteURL ?? Localization.yourSite
+        self.analytics = analytics
     }
 
     // MARK: - Data and configuration
@@ -46,6 +48,8 @@ struct JetpackErrorViewModel: ULErrorViewModel {
         let safariViewController = SFSafariViewController(url: url)
         safariViewController.modalPresentationStyle = .pageSheet
         viewController?.present(safariViewController, animated: true)
+
+        analytics.track(.loginJetpackRequiredViewInstructionsButtonTapped)
     }
 
     func didTapSecondaryButton(in viewController: UIViewController?) {
@@ -54,10 +58,16 @@ struct JetpackErrorViewModel: ULErrorViewModel {
     }
 
     func didTapAuxiliaryButton(in viewController: UIViewController?) {
-        let fancyAlert = FancyAlertViewController.makeWhatIsJetpackAlertController()
+        let fancyAlert = FancyAlertViewController.makeWhatIsJetpackAlertController(analytics: analytics)
         fancyAlert.modalPresentationStyle = .custom
         fancyAlert.transitioningDelegate = AppDelegate.shared.tabBarController
         viewController?.present(fancyAlert, animated: true)
+
+        analytics.track(.loginWhatIsJetpackHelpScreenViewed)
+    }
+
+    func viewDidLoad() {
+        analytics.track(.loginJetpackRequiredScreenViewed)
     }
 }
 

WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackErrorViewModel.swift

@@ -32,6 +32,10 @@ struct NoSecureConnectionErrorViewModel: ULErrorViewModel {
         // NO-OP
     }
 
+    func viewDidLoad() {
+        // NO-OP
+    }
+
 }
 
 private extension NoSecureConnectionErrorViewModel {

WooCommerce/Classes/Authentication/Navigation Exceptions/NoSecureConnectionErrorViewModel.swift

@@ -37,6 +37,10 @@ struct NotWPAccountViewModel: ULErrorViewModel {
         fancyAlert.transitioningDelegate = AppDelegate.shared.tabBarController
         viewController?.present(fancyAlert, animated: true)
     }
+
+    func viewDidLoad() {
+        // NO-OP
+    }
 }
 
 

WooCommerce/Classes/Authentication/Navigation Exceptions/NotWPAccountViewModel.swift

@@ -34,6 +34,10 @@ struct NotWPErrorViewModel: ULErrorViewModel {
     func didTapAuxiliaryButton(in viewController: UIViewController?) {
         // NO-OP
     }
+
+    func viewDidLoad() {
+        // NO-OP
+    }
 }
 
 

WooCommerce/Classes/Authentication/Navigation Exceptions/NotWPErrorViewModel.swift

@@ -49,6 +49,8 @@ final class ULErrorViewController: UIViewController {
         configureSecondaryButton()
 
         setUnifiedMargins(forWidth: view.frame.width)
+
+        viewModel.viewDidLoad()
     }
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {

WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift

@@ -21,6 +21,9 @@ protocol ULErrorViewModel {
     /// Provides a title for a secondary action button
     var secondaryButtonTitle: String { get }
 
+    /// Executed by the view controller when its view was loaded.
+    func viewDidLoad()
+
     /// Executes action associated to a tap in the view controller primary button
     /// - Parameter viewController: usually the view controller sending the tap
     func didTapPrimaryButton(in viewController: UIViewController?)

WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewModel.swift

@@ -0,0 +1,26 @@
+import Foundation
+
+extension NumberFormatter {
+    /// Get a double from a string value, with locale taken into consideration.
+    ///
+    static func double(from string: String, locale: Locale = .current) -> Double? {
+        let formatter = NumberFormatter()
+        formatter.locale = locale
+        let number = formatter.number(from: string)
+        return number?.doubleValue
+    }
+
+    /// Get a string from a number with locale taken into consideration.
+    ///
+    static func localizedString(from number: NSNumber, locale: Locale = .current) -> String? {
+        let formatter = NumberFormatter()
+        formatter.locale = locale
+        formatter.usesGroupingSeparator = true
+        formatter.groupingSize = 3
+        formatter.formatterBehavior = .behavior10_4
+        formatter.numberStyle = .decimal
+        formatter.generatesDecimalNumbers = true
+        formatter.roundingMode = .halfUp
+        return formatter.string(from: number)
+    }
+}