Merge branch 'trunk' into issue/18484-site-title-updates-mt-site

Gio2018 · web-flow · commit 3cb1edfc117a · 2022-05-10T11:34:58.000-05:00
diff --git a/Podfile b/Podfile
@@ -210,7 +210,7 @@ abstract_target 'Apps' do
 
     pod 'NSURL+IDN', '~> 0.4'
 
-    pod 'WPMediaPicker', '~> 1.8.3'
+    pod 'WPMediaPicker', '~> 1.8.4-beta.1'
     # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
     ## while PR is in review:
     # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''
diff --git a/Podfile.lock b/Podfile.lock
@@ -499,7 +499,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.5)
-  - WPMediaPicker (1.8.3)
+  - WPMediaPicker (1.8.4-beta.1)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -595,7 +595,7 @@ DEPENDENCIES:
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.1)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.3)
+  - WPMediaPicker (~> 1.8.4-beta.1)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -857,7 +857,7 @@ SPEC CHECKSUMS:
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
-  WPMediaPicker: 0f4f20c7f661b46d33283f1ac2adceb98718fffa
+  WPMediaPicker: 547b19abb9361a0a70ac7df4399502b3d59f1f3b
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -869,6 +869,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: a9583cec2bc246d23cf0045230cd179dc03c5adb
+PODFILE CHECKSUM: f6bd23447af8d4f331d87b63590f4bf520730633
 
 COCOAPODS: 1.11.2
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 19.9
 -----
-[*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
+* [*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
+* [*] Media Picker: Fixed an issue where the empty state view was being displayed incorrectly. [#18471]
 
 19.8
 -----
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift
@@ -164,7 +164,7 @@ final class BlogDashboardViewController: UIViewController {
                 switch element {
                 case .setupQuickStart, .removeQuickStart:
                     self.loadCardsFromCache()
-                case .stats:
+                case .stats, .mediaScreen:
                     if self.embeddedInScrollView {
                         self.mySiteScrollView?.scrollToTop(animated: true)
                     } else {
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Quick Actions/DashboardQuickActionsCardCell.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Quick Actions/DashboardQuickActionsCardCell.swift
@@ -138,18 +138,23 @@ extension DashboardQuickActionsCardCell {
                let element = info[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
 
                 switch element {
-                case .noSuchElement:
-                    self?.statsButton.shouldShowSpotlight = false
                 case .stats:
                     guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDashboard else {
                         return
                     }
 
-                    self?.statsButton.shouldShowSpotlight = true
                     self?.autoScrollToStatsButton()
+                case .mediaScreen:
+                    guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDashboard else {
+                        return
+                    }
+
+                    self?.autoScrollToMediaButton()
                 default:
                     break
                 }
+                self?.statsButton.shouldShowSpotlight = element == .stats
+                self?.mediaButton.shouldShowSpotlight = element == .mediaScreen
             }
         }
     }
@@ -161,6 +166,10 @@ extension DashboardQuickActionsCardCell {
     private func autoScrollToStatsButton() {
         scrollView.scrollHorizontallyToView(statsButton, animated: true)
     }
+
+    private func autoScrollToMediaButton() {
+        scrollView.scrollHorizontallyToView(mediaButton, animated: true)
+    }
 }
 
 extension DashboardQuickActionsCardCell {
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+FancyAlerts.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+FancyAlerts.swift
@@ -15,7 +15,7 @@ extension BlogDetailsViewController {
 
             if let info = notification.userInfo?[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
                 switch info {
-                case .stats:
+                case .stats, .mediaScreen:
                     guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDetails else {
                         return
                     }
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.h b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.h
@@ -73,6 +73,8 @@ typedef NS_ENUM(NSInteger, QuickStartTourElement) {
     QuickStartTourElementNotifications = 22,
     QuickStartTourElementSetupQuickStart = 23,
     QuickStartTourElementRemoveQuickStart = 24,
+    QuickStartTourElementMediaScreen = 25,
+    QuickStartTourElementMediaUpload = 26,
 };
 
 typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -900,6 +900,7 @@ - (BlogDetailsSection *)publishTypeSectionViewModel
                                                             callback:^{
                    [weakSelf showMediaLibraryFromSource:BlogDetailsNavigationSourceRow];
                                                             }];
+    mediaRow.quickStartIdentifier = QuickStartTourElementMediaScreen;
     [rows addObject:mediaRow];
 
     BlogDetailsRow *pagesRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Pages", @"Noun. Title. Links to the blog's Pages screen.")
@@ -1437,7 +1438,7 @@ - (void)showMediaLibraryFromSource:(BlogDetailsNavigationSource)source
     controller.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
     [self showDetailViewController:controller sender:self];
 
-    [[QuickStartTourGuide shared] visited:QuickStartTourElementBlogDetailNavigation];
+    [[QuickStartTourGuide shared] visited:QuickStartTourElementMediaScreen];
 }
 
 - (void)showPeople
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartTours.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartTours.swift
@@ -371,6 +371,32 @@ struct QuickStartNotificationsTour: QuickStartTour {
     let accessibilityHintText = NSLocalizedString("Guides you through the process of checking your notifications.", comment: "This value is used to set the accessibility hint text for viewing the user's notifications.")
 }
 
+struct QuickStartMediaUploadTour: QuickStartTour {
+    let key = "quick-start-media-upload-tour"
+    let analyticsKey = "media"
+    let title = NSLocalizedString("Upload photos or videos", comment: "Title of a Quick Start Tour")
+    let titleMarkedCompleted = NSLocalizedString("Completed: Upload photos or videos", comment: "The Quick Start Tour title after the user finished the step.")
+    let description = NSLocalizedString("Bring media straight from your device or camera to your site.", comment: "Description of a Quick Start Tour")
+    let icon = UIImage.gridicon(.addImage)
+    let suggestionNoText = Strings.notNow
+    let suggestionYesText = Strings.yesShowMe
+    let possibleEntryPoints: Set<QuickStartTourEntryPoint> = [.blogDetails, .blogDashboard]
+
+    var waypoints: [WayPoint] = {
+        let step1DescriptionBase = NSLocalizedString("Select %@ to see your current library.", comment: "A step in a guided tour for quick start. %@ will be the name of the item to select.")
+        let step1DescriptionTarget = NSLocalizedString("Media", comment: "The menu item to select during a guided tour.")
+        let step1: WayPoint = (element: .mediaScreen, description: step1DescriptionBase.highlighting(phrase: step1DescriptionTarget, icon: .gridicon(.image)))
+
+        let step2DescriptionBase = NSLocalizedString("Select %@to upload media. You can add it to your posts / pages from any device.", comment: "A step in a guided tour for quick start. %@ will be a plus icon.")
+        let step2DescriptionTarget = ""
+        let step2: WayPoint = (element: .mediaUpload, description: step2DescriptionBase.highlighting(phrase: step2DescriptionTarget, icon: .gridicon(.plus)))
+
+        return [step1, step2]
+    }()
+
+    let accessibilityHintText = NSLocalizedString("Guides you through the process of uploading new media.", comment: "This value is used to set the accessibility hint text for viewing the user's notifications.")
+}
+
 private extension String {
     func highlighting(phrase: String, icon: UIImage?) -> NSAttributedString {
         let normalParts = components(separatedBy: "%@")
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartToursCollection.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartToursCollection.swift
@@ -77,6 +77,7 @@ struct QuickStartGetToKnowAppCollection: QuickStartToursCollection {
             QuickStartCheckStatsTour(),
             QuickStartNotificationsTour(),
             QuickStartViewTour(blog: blog),
+            QuickStartMediaUploadTour(),
             QuickStartFollowTour()
         ]
     }
diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift
@@ -16,6 +16,9 @@ class MediaLibraryViewController: WPMediaPickerViewController {
 
     fileprivate var isLoading: Bool = false
     fileprivate let noResultsView = NoResultsViewController.controller()
+    fileprivate let addButton: SpotlightableButton = SpotlightableButton(type: .custom)
+
+    fileprivate var kvoTokens: [NSKeyValueObservation]?
 
     fileprivate var selectedAsset: Media? = nil
 
@@ -62,12 +65,13 @@ class MediaLibraryViewController: WPMediaPickerViewController {
         controller.navigationItem.largeTitleDisplayMode = .never
         sourceController.navigationController?.pushViewController(controller, animated: true)
 
-        QuickStartTourGuide.shared.visited(.blogDetailNavigation)
+        QuickStartTourGuide.shared.visited(.mediaScreen)
     }
 
     deinit {
         unregisterChangeObserver()
         unregisterUploadCoordinatorObserver()
+        stopObservingNavigationBarClipsToBounds()
     }
 
     private class func pickerOptions() -> WPMediaPickerOptions {
@@ -104,6 +108,9 @@ class MediaLibraryViewController: WPMediaPickerViewController {
         if let collectionView = collectionView {
             WPStyleGuide.configureColors(view: view, collectionView: collectionView)
         }
+
+        navigationController?.navigationBar.subviews.forEach ({ $0.clipsToBounds = false })
+        startObservingNavigationBarClipsToBounds()
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -120,6 +127,11 @@ class MediaLibraryViewController: WPMediaPickerViewController {
         }
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        addButton.shouldShowSpotlight = QuickStartTourGuide.shared.isCurrentElement(.mediaUpload)
+    }
+
     // MARK: - Update view state
 
     fileprivate func updateViewState(for assetCount: Int) {
@@ -142,12 +154,18 @@ class MediaLibraryViewController: WPMediaPickerViewController {
 
             var barButtonItems = [UIBarButtonItem]()
 
-            if blog.userCanUploadMedia && assetCount > 0 {
-                let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(addTapped))
+            if blog.userCanUploadMedia {
+                addButton.spotlightOffset = Constants.addButtonSpotlightOffset
+                let config = UIImage.SymbolConfiguration(textStyle: .body, scale: .large)
+                let image = UIImage(systemName: "plus", withConfiguration: config) ?? .gridicon(.plus)
+                addButton.setImage(image, for: .normal)
+                addButton.contentEdgeInsets = Constants.addButtonContentInset
+                addButton.addTarget(self, action: #selector(addTapped), for: .touchUpInside)
                 addButton.accessibilityLabel = NSLocalizedString("Add", comment: "Accessibility label for add button to add items to the user's media library")
                 addButton.accessibilityHint = NSLocalizedString("Add new media", comment: "Accessibility hint for add button to add items to the user's media library")
 
-                barButtonItems.append(addButton)
+                let addBarButton = UIBarButtonItem(customView: addButton)
+                barButtonItems.append(addBarButton)
             }
 
             if blog.supports(.mediaDeletion) && assetCount > 0 {
@@ -157,10 +175,8 @@ class MediaLibraryViewController: WPMediaPickerViewController {
 
                 barButtonItems.append(editButton)
 
-                navigationItem.setRightBarButtonItems(barButtonItems, animated: false)
-            } else {
-                navigationItem.setRightBarButtonItems(barButtonItems, animated: false)
             }
+            navigationItem.setRightBarButtonItems(barButtonItems, animated: false)
         }
     }
 
@@ -255,6 +271,8 @@ class MediaLibraryViewController: WPMediaPickerViewController {
     // MARK: - Actions
 
     @objc fileprivate func addTapped() {
+        QuickStartTourGuide.shared.visited(.mediaUpload)
+        addButton.shouldShowSpotlight = QuickStartTourGuide.shared.isCurrentElement(.mediaUpload)
         showOptionsMenu()
     }
 
@@ -427,6 +445,25 @@ class MediaLibraryViewController: WPMediaPickerViewController {
             MediaCoordinator.shared.removeObserver(withUUID: uuid)
         }
     }
+
+    // MARK: ClipsToBounds KVO Observer
+
+    /// The content view of the navigation bar causes the spotlight view on the add button to be clipped.
+    /// This ensures that `clipsToBounds` of the content view is always `false`.
+    /// Without this, `clipsToBounds` reverts to `true` at some point during the view lifecycle. This happens asynchronously,
+    /// so we can't confidently reset it. Hence the need for KVO.
+    private func startObservingNavigationBarClipsToBounds() {
+        kvoTokens = navigationController?.navigationBar.subviews.map({ subview in
+            return subview.observe(\.clipsToBounds, options: .new, changeHandler: { view, change in
+                guard let newValue = change.newValue, newValue else { return }
+                view.clipsToBounds = false
+            })
+        })
+    }
+
+    private func stopObservingNavigationBarClipsToBounds() {
+        kvoTokens?.forEach({ $0.invalidate() })
+    }
 }
 
 // MARK: - UIDocumentPickerDelegate
@@ -742,3 +779,12 @@ extension MediaLibraryViewController: TenorPickerDelegate {
         }
     }
 }
+
+// MARK: Constants
+
+extension MediaLibraryViewController {
+    private enum Constants {
+        static let addButtonSpotlightOffset = UIOffset(horizontal: 20, vertical: -10)
+        static let addButtonContentInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
+    }
+}
diff --git a/WordPress/WordPressTest/QuickStartFactoryTests.swift b/WordPress/WordPressTest/QuickStartFactoryTests.swift
@@ -83,11 +83,12 @@ class QuickStartFactoryTests: XCTestCase {
         let tours = QuickStartFactory.allTours(for: blog)
 
         // Then
-        XCTAssertEqual(tours.count, 4)
+        XCTAssertEqual(tours.count, 5)
         XCTAssertTrue(tours[0] is QuickStartCheckStatsTour)
         XCTAssertTrue(tours[1] is QuickStartNotificationsTour)
         XCTAssertTrue(tours[2] is QuickStartViewTour)
-        XCTAssertTrue(tours[3] is QuickStartFollowTour)
+        XCTAssertTrue(tours[3] is QuickStartMediaUploadTour)
+        XCTAssertTrue(tours[4] is QuickStartFollowTour)
     }
 
     func testToursForNewSite() {

Original file line number	Diff line number	Diff line change
`@@ -138,18 +138,23 @@ extension DashboardQuickActionsCardCell {`
`138`	`138`	`let element = info[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {`
`139`	`139`
`140`	`140`	`switch element {`
`141`		`- case .noSuchElement:`
`142`		`- self?.statsButton.shouldShowSpotlight = false`
`143`	`141`	`case .stats:`
`144`	`142`	`guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDashboard else {`
`145`	`143`	`return`
`146`	`144`	`}`
`147`	`145`
`148`		`- self?.statsButton.shouldShowSpotlight = true`
`149`	`146`	`self?.autoScrollToStatsButton()`
	`147`	`+ case .mediaScreen:`
	`148`	`+ guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDashboard else {`
	`149`	`+ return`
	`150`	`+ }`
	`151`	`+`
	`152`	`+ self?.autoScrollToMediaButton()`
`150`	`153`	`default:`
`151`	`154`	`break`
`152`	`155`	`}`
	`156`	`+ self?.statsButton.shouldShowSpotlight = element == .stats`
	`157`	`+ self?.mediaButton.shouldShowSpotlight = element == .mediaScreen`
`153`	`158`	`}`
`154`	`159`	`}`
`155`	`160`	`}`
`@@ -161,6 +166,10 @@ extension DashboardQuickActionsCardCell {`
`161`	`166`	`private func autoScrollToStatsButton() {`
`162`	`167`	`scrollView.scrollHorizontallyToView(statsButton, animated: true)`
`163`	`168`	`}`
	`169`	`+`
	`170`	`+ private func autoScrollToMediaButton() {`
	`171`	`+ scrollView.scrollHorizontallyToView(mediaButton, animated: true)`
	`172`	`+ }`
`164`	`173`	`}`
`165`	`174`
`166`	`175`	`extension DashboardQuickActionsCardCell {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ extension BlogDetailsViewController {`
`15`	`15`
`16`	`16`	`if let info = notification.userInfo?[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {`
`17`	`17`	`switch info {`
`18`		`- case .stats:`
	`18`	`+ case .stats, .mediaScreen:`
`19`	`19`	`guard QuickStartTourGuide.shared.entryPointForCurrentTour == .blogDetails else {`
`20`	`20`	`return`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ struct QuickStartGetToKnowAppCollection: QuickStartToursCollection {`
`77`	`77`	`QuickStartCheckStatsTour(),`
`78`	`78`	`QuickStartNotificationsTour(),`
`79`	`79`	`QuickStartViewTour(blog: blog),`
	`80`	`+ QuickStartMediaUploadTour(),`
`80`	`81`	`QuickStartFollowTour()`
`81`	`82`	`]`
`82`	`83`	`}`