Merge pull request #21988 from wordpress-mobile/task/integrate-media-picker

kean · web-flow · commit 75f4d226ad5c · 2023-11-07T11:00:50.000-05:00
Site Media: Integrate media picker in site icon picker and featured image picker flows
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/SiteIconView.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/SiteIconView.swift
@@ -33,7 +33,8 @@ class SiteIconView: UIView {
     }()
 
     let activityIndicator: UIActivityIndicatorView = {
-        let indicatorView = UIActivityIndicatorView(style: .large)
+        let indicatorView = UIActivityIndicatorView(style: .medium)
+        indicatorView.color = .white
         indicatorView.translatesAutoresizingMaskIntoConstraints = false
         return indicatorView
     }()
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift
@@ -42,7 +42,7 @@ extension SitePickerViewController {
         var actions = [
             mediaMenu.makePhotosAction(delegate: presenter),
             mediaMenu.makeCameraAction(delegate: presenter),
-            mediaMenu.makeMediaAction(blog: blog, delegate: presenter)
+            mediaMenu.makeSiteMediaAction(blog: blog, delegate: presenter)
         ]
         if FeatureFlag.siteIconCreator.enabled {
             actions.append(UIAction(
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteIconPickerPresenter.swift b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteIconPickerPresenter.swift
@@ -169,3 +169,24 @@ extension SiteIconPickerPresenter: MediaPickerViewControllerDelegate {
         })
     }
 }
+
+extension SiteIconPickerPresenter: SiteMediaPickerViewControllerDelegate {
+    func siteMediaPickerViewController(_ viewController: SiteMediaPickerViewController, didFinishWithSelection selection: [Media]) {
+        guard let media = selection.first else {
+            onCompletion?(nil, nil)
+            return
+        }
+
+        WPAnalytics.track(.siteSettingsSiteIconGalleryPicked)
+
+        showLoadingMessage()
+        originalMedia = media
+        MediaThumbnailCoordinator.shared.thumbnail(for: media, with: CGSize.zero, onCompletion: { [weak self] (image, error) in
+            guard let image = image else {
+                self?.showErrorLoadingImageMessage()
+                return
+            }
+            self?.showImageCropViewController(image, presentingViewController: viewController)
+        })
+    }
+}
diff --git a/WordPress/Classes/ViewRelated/Media/MediaPickerMenu.swift b/WordPress/Classes/ViewRelated/Media/MediaPickerMenu.swift
@@ -15,6 +15,13 @@ struct MediaPickerMenu {
     enum MediaFilter {
         case images
         case videos
+
+        var mediaType: MediaType {
+            switch self {
+            case .images: return .image
+            case .videos: return .video
+            }
+        }
     }
 
     /// Initializes the options.
@@ -170,19 +177,40 @@ extension MediaPickerMenu {
     private static var strongDelegateKey: UInt8 = 0
 }
 
-// MARK: - MediaPickerMenu (WordPress Media)
+// MARK: - MediaPickerMenu (Site Media)
 
 extension MediaPickerMenu {
-    func makeMediaAction(blog: Blog, delegate: MediaPickerViewControllerDelegate) -> UIAction {
+    /// Returns an action for selecting media from the media uploaded by the user
+    /// to their site.
+    func makeSiteMediaAction(blog: Blog, delegate: MediaPickerViewControllerDelegate & SiteMediaPickerViewControllerDelegate) -> UIAction {
         UIAction(
             title: Strings.pickFromMedia,
             image: UIImage(systemName: "photo.stack"),
             attributes: [],
-            handler: { _ in showMediaPicker(blog: blog, delegate: delegate) }
+            handler: { _ in showSiteMediaPicker(blog: blog, delegate: delegate) }
+        )
+    }
+
+    func showSiteMediaPicker(blog: Blog, delegate: MediaPickerViewControllerDelegate & SiteMediaPickerViewControllerDelegate) {
+        if Feature.enabled(.mediaModernization) {
+            showModernSiteMediaPicker(blog: blog, delegate: delegate)
+        } else {
+            showLegacySiteMediaPicker(blog: blog, delegate: delegate)
+        }
+    }
+
+    private func showModernSiteMediaPicker(blog: Blog, delegate: SiteMediaPickerViewControllerDelegate) {
+        let viewController = SiteMediaPickerViewController(
+            blog: blog,
+            filter: filter.map { [$0.mediaType] },
+            allowsMultipleSelection: isMultipleSelectionEnabled
         )
+        viewController.delegate = delegate
+        let navigation = UINavigationController(rootViewController: viewController)
+        presentingViewController?.present(navigation, animated: true)
     }
 
-    func showMediaPicker(blog: Blog, delegate: MediaPickerViewControllerDelegate) {
+    private func showLegacySiteMediaPicker(blog: Blog, delegate: MediaPickerViewControllerDelegate) {
         let options = WPMediaPickerOptions()
         options.showMostRecentFirst = true
         if let filter {
diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaCollectionViewController.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaCollectionViewController.swift
@@ -144,22 +144,22 @@ final class SiteMediaCollectionViewController: UIViewController, NSFetchedResult
     }
 
     private func setSelect(_ isSelected: Bool, for media: Media) {
+        guard collectionView.allowsMultipleSelection else {
+            delegate?.siteMediaViewController(self, didUpdateSelection: [media])
+            return
+        }
         if isSelected {
             selection.add(media)
         } else {
             selection.remove(media)
             getViewModel(for: media).badge = nil
         }
-        if collectionView.allowsMultipleSelection {
-            for (index, media) in selection.enumerated() {
-                if let media = media as? Media {
-                    getViewModel(for: media).badge = isSelectionOrdered ? .ordered(index: index) : .unordered
-                } else {
-                    assertionFailure("Invalid selection")
-                }
+        for (index, media) in selection.enumerated() {
+            if let media = media as? Media {
+                getViewModel(for: media).badge = isSelectionOrdered ? .ordered(index: index) : .unordered
+            } else {
+                assertionFailure("Invalid selection")
             }
-        } else {
-            // Don't display a badge
         }
         delegate?.siteMediaViewController(self, didUpdateSelection: selectedMedia)
     }
diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/SiteMediaPickerViewController.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/SiteMediaPickerViewController.swift
@@ -31,6 +31,7 @@ final class SiteMediaPickerViewController: UIViewController, SiteMediaCollection
 
         title = Strings.title
         extendedLayoutIncludesOpaqueBars = true
+        modalPresentationStyle = .formSheet
     }
 
     required init?(coder: NSCoder) {
@@ -43,21 +44,13 @@ final class SiteMediaPickerViewController: UIViewController, SiteMediaCollection
         collectionViewController.embed(in: self)
         collectionViewController.delegate = self
 
-        configureNavigationBarAppearance()
+        configureDefaultNavigationBarAppearance()
         configurationNavigationItems()
         startSelection()
     }
 
     // MARK: - Configuration
 
-    private func configureNavigationBarAppearance() {
-        let appearance = UINavigationBarAppearance()
-        navigationItem.standardAppearance = appearance
-        navigationItem.compactAppearance = appearance
-        navigationItem.scrollEdgeAppearance = appearance
-        navigationItem.compactScrollEdgeAppearance = appearance
-    }
-
     private func configurationNavigationItems() {
         let buttonCancel = UIBarButtonItem(systemItem: .cancel, primaryAction: UIAction { [weak self] _ in
             self?.buttonDoneTapped()
diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController+FeaturedImageUpload.swift b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController+FeaturedImageUpload.swift
@@ -32,7 +32,7 @@ extension PostSettingsViewController: PHPickerViewControllerDelegate, ImagePicke
         return UIMenu(children: [
             menu.makePhotosAction(delegate: self),
             menu.makeCameraAction(delegate: self),
-            menu.makeMediaAction(blog: self.apost.blog, delegate: self)
+            menu.makeSiteMediaAction(blog: self.apost.blog, delegate: self)
         ])
     }
 
@@ -74,6 +74,18 @@ extension PostSettingsViewController: MediaPickerViewControllerDelegate {
     }
 }
 
+extension PostSettingsViewController: SiteMediaPickerViewControllerDelegate {
+    func siteMediaPickerViewController(_ viewController: SiteMediaPickerViewController, didFinishWithSelection selection: [Media]) {
+        dismiss(animated: true)
+
+        guard let media = selection.first else { return }
+
+        WPAnalytics.track(.editorPostFeaturedImageChanged, properties: ["via": "settings", "action": "added"])
+        setFeaturedImage(media: media)
+        reloadFeaturedImageCell()
+    }
+}
+
 // MARK: - PostSettingsViewController (Featured Image Upload)
 
 extension PostSettingsViewController {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ extension SitePickerViewController {`
`42`	`42`	`var actions = [`
`43`	`43`	`mediaMenu.makePhotosAction(delegate: presenter),`
`44`	`44`	`mediaMenu.makeCameraAction(delegate: presenter),`
`45`		`- mediaMenu.makeMediaAction(blog: blog, delegate: presenter)`
	`45`	`+ mediaMenu.makeSiteMediaAction(blog: blog, delegate: presenter)`
`46`	`46`	`]`
`47`	`47`	`if FeatureFlag.siteIconCreator.enabled {`
`48`	`48`	`actions.append(UIAction(`