Reader: Enhance cover image

WordPress/Classes/Networking/MediaHost+ReaderPost.swift

@@ -4,11 +4,7 @@ import Foundation
 /// initialize it from a given `Blog`.
 ///
 extension MediaHost {
-    enum ReaderPostError: Swift.Error {
-        case baseInitializerError(error: Error)
-    }
-
-    init(with post: ReaderPost, failure: (ReaderPostError) -> ()) {
+    init(with post: ReaderPost) {
         let isAccessibleThroughWPCom = post.isWPCom || post.isJetpack
 
         // This is the only way in which we can obtain the username and authToken here.
@@ -28,7 +24,7 @@ extension MediaHost {
             username: username,
             authToken: authToken,
             failure: { error in
-                failure(ReaderPostError.baseInitializerError(error: error))
+                WordPressAppDelegate.crashLogging?.logError(error)
             }
         )
     }

WordPress/Classes/Utility/Media/AsyncImageView.swift

@@ -5,23 +5,59 @@ import Gifu
 /// (see ``AnimatedImage``).
 @MainActor
 final class AsyncImageView: UIView {
-    let imageView = GIFImageView()
-
+    private let imageView = GIFImageView()
     private var errorView: UIImageView?
     private var spinner: UIActivityIndicatorView?
     private let controller = ImageViewController()
 
     enum LoadingStyle {
+        /// Shows a secondary background color during the download.
         case background
+        /// Shows a spinner during the download.
         case spinner
     }
 
-    var isErrorViewEnabled = true
-    var loadingStyle = LoadingStyle.background
+    struct Configuration {
+        /// Image tint color.
+        var tintColor: UIColor?
+
+        /// Image view content mode.
+        var contentMode: UIView.ContentMode?
+
+        /// Enabled by default and shows an error icon on failures.
+        var isErrorViewEnabled = true
+
+        /// By default, `background`.
+        var loadingStyle = LoadingStyle.background
+    }
+
+    var configuration = Configuration() {
+        didSet { didUpdateConfiguration(configuration) }
+    }
+
+    /// The currently displayed image. If the image is animated, returns an
+    /// instance of ``AnimatedImage``.
+    var image: UIImage? {
+        didSet {
+            if let image {
+                imageView.configure(image: image)
+            } else {
+                imageView.prepareForReuse()
+            }
+        }
+    }
 
     override init(frame: CGRect) {
         super.init(frame: frame)
+        setupView()
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setupView()
+    }
 
+    private func setupView() {
         controller.onStateChanged = { [weak self] in self?.setState($0) }
 
         addSubview(imageView)
@@ -35,18 +71,10 @@ final class AsyncImageView: UIView {
         backgroundColor = .secondarySystemBackground
     }
 
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
+    /// Removes the current image and stops the outstanding downloads.
     func prepareForReuse() {
         controller.prepareForReuse()
-
-        if imageView.isAnimatingGIF {
-            imageView.prepareForReuse()
-        } else {
-            imageView.image = nil
-        }
+        image = nil
     }
 
     /// - parameter size: Target image size in pixels.
@@ -66,23 +94,32 @@ final class AsyncImageView: UIView {
 
         switch state {
         case .loading:
-            switch loadingStyle {
+            switch configuration.loadingStyle {
             case .background:
                 backgroundColor = .secondarySystemBackground
             case .spinner:
                 makeSpinner().startAnimating()
             }
         case .success(let image):
-            imageView.configure(image: image)
+            self.image = image
             imageView.isHidden = false
             backgroundColor = .clear
         case .failure:
-            if isErrorViewEnabled {
+            if configuration.isErrorViewEnabled {
                 makeErrorView().isHidden = false
             }
         }
     }
 
+    private func didUpdateConfiguration(_ configuration: Configuration) {
+        if let tintColor = configuration.tintColor {
+            imageView.tintColor = tintColor
+        }
+        if let contentMode = configuration.contentMode {
+            imageView.contentMode = contentMode
+        }
+    }
+
     private func makeSpinner() -> UIActivityIndicatorView {
         if let spinner {
             return spinner
@@ -119,4 +156,12 @@ extension GIFImageView {
             self.image = image
         }
     }
+
+    private func prepareForReuse() {
+        if isAnimatingGIF {
+            prepareForReuse()
+        } else {
+            image = nil
+        }
+    }
 }

WordPress/Classes/Utility/Media/ImageLoader.swift

@@ -91,10 +91,7 @@ import WordPressShared
     @objc(loadImageWithURL:fromReaderPost:preferredSize:placeholder:success:error:)
     func loadImage(with url: URL, from readerPost: ReaderPost, preferredSize size: CGSize = .zero, placeholder: UIImage?, success: ImageLoaderSuccessBlock?, error: ImageLoaderFailureBlock?) {
 
-        let host = MediaHost(with: readerPost, failure: { error in
-            WordPressAppDelegate.crashLogging?.logError(error)
-        })
-
+        let host = MediaHost(with: readerPost)
         loadImage(with: url, from: host, preferredSize: size, placeholder: placeholder, success: success, error: error)
     }
 

WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift

@@ -76,10 +76,7 @@ private extension RichCommentContentRenderer {
                 WordPressAppDelegate.crashLogging?.logError(error)
             })
         } else if let post = comment.post as? ReaderPost, post.isBlogPrivate {
-            return MediaHost(with: post, failure: { error in
-                // We'll log the error, so we know it's there, but we won't halt execution.
-                WordPressAppDelegate.crashLogging?.logError(error)
-            })
+            return MediaHost(with: post)
         }
 
         return .publicSite

WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift

@@ -156,7 +156,7 @@ private final class ReaderPostCellView: UIView {
             avatarView.centerYAnchor.constraint(equalTo: timeLabel.centerYAnchor),
             avatarView.trailingAnchor.constraint(equalTo: headerView.leadingAnchor, constant: -8),
 
-            headerView.topAnchor.constraint(equalTo: topAnchor, constant: 4),
+            headerView.topAnchor.constraint(equalTo: topAnchor, constant: 6),
             headerView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: insets.left),
             headerView.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor, constant: -50),
 
@@ -391,7 +391,7 @@ private func makeButton(systemImage: String, font: UIFont = UIFont.preferredFont
     configuration.imagePadding = 6
     configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(font: font)
     configuration.baseForegroundColor = .secondaryLabel
-    configuration.contentInsets = .init(top: 16, leading: 12, bottom: 14, trailing: 12)
+    configuration.contentInsets = .init(top: 16, leading: 12, bottom: 16, trailing: 12)
 
     let button = UIButton(configuration: configuration)
     if #available(iOS 17.0, *) {

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift

@@ -481,20 +481,12 @@ class ReaderDetailCoordinator {
 
     /// Show the featured image fullscreen
     ///
-    private func showFeaturedImage(_ sender: CachedAnimatedImageView) {
-        guard let post else {
-            return
-        }
-
-        var controller: WPImageViewController
-        if post.featuredImageURL.isGif, let data = sender.animatedGifData {
-            controller = WPImageViewController(gifData: data)
-        } else if let featuredImage = sender.image {
-            controller = WPImageViewController(image: featuredImage)
-        } else {
+    private func showFeaturedImage(_ sender: AsyncImageView) {
+        guard let post, let imageURL = post.featuredImage.flatMap(URL.init) else {
             return
         }
-
+        let controller = WPImageViewController(url: imageURL)
+        controller.readerPost = post
         controller.modalTransitionStyle = .crossDissolve
         controller.modalPresentationStyle = .fullScreen
         viewController?.present(controller, animated: true)
@@ -722,7 +714,7 @@ extension ReaderDetailCoordinator: ReaderDetailHeaderViewDelegate {
 
 // MARK: - ReaderDetailFeaturedImageViewDelegate
 extension ReaderDetailCoordinator: ReaderDetailFeaturedImageViewDelegate {
-    func didTapFeaturedImage(_ sender: CachedAnimatedImageView) {
+    func didTapFeaturedImage(_ sender: AsyncImageView) {
         showFeaturedImage(sender)
     }
 }

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift

@@ -582,7 +582,6 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
 
     private func configureHeader() {
         header.displaySetting = displaySetting
-        header.useCompatibilityMode = useCompatibilityMode
         header.delegate = coordinator
         headerContainerView.addSubview(header)
         headerContainerView.translatesAutoresizingMaskIntoConstraints = false
@@ -719,7 +718,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
         coordinator?.openInBrowser()
     }
 
-    @objc func didTapDisplaySettingButton(_ sender: UIBarButtonItem) {
+    @objc func didTapDisplaySettingButton() {
         let viewController = ReaderDisplaySettingViewController(initialSetting: displaySetting,
                                                                 source: .readerPostNavBar) { [weak self] newSetting in
             // no need to refresh if there are no changes to the display setting.
@@ -1051,8 +1050,7 @@ private extension ReaderDetailViewController {
         let rightItems = [
             moreButtonItem(enabled: enableRightBarButtons),
             shareButtonItem(enabled: enableRightBarButtons),
-            safariButtonItem(),
-            displaySettingButtonItem()
+            safariButtonItem()
         ]
         navigationItem.largeTitleDisplayMode = .never
         navigationItem.rightBarButtonItems = rightItems.compactMap({ $0 })
@@ -1095,17 +1093,6 @@ private extension ReaderDetailViewController {
         dismiss(animated: true)
     }
 
-    func displaySettingButtonItem() -> UIBarButtonItem? {
-        guard ReaderDisplaySetting.customizationEnabled,
-              let icon = UIImage(named: "reader-reading-preferences") else {
-            return nil
-        }
-        let button = barButtonItem(with: icon, action: #selector(didTapDisplaySettingButton(_:)))
-        button.accessibilityLabel = Strings.displaySettingAccessibilityLabel
-
-        return button
-    }
-
     func safariButtonItem() -> UIBarButtonItem? {
         let button = barButtonItem(with: .gridicon(.globe), action: #selector(didTapBrowserButton(_:)))
         button.accessibilityLabel = Strings.safariButtonAccessibilityLabel
@@ -1132,12 +1119,20 @@ private extension ReaderDetailViewController {
         guard let post else {
             return []
         }
-        return ReaderPostMenu(
+        var elements = ReaderPostMenu(
             post: post,
             topic: nil,
             anchor: anchor,
             viewController: self
         ).makeMenu()
+
+        if ReaderDisplaySetting.customizationEnabled {
+            elements.append(UIAction(title: Strings.displaySettingsLabel, image: UIImage(systemName: "textformat.size")) { [weak self] _ in
+                self?.didTapDisplaySettingButton()
+            })
+        }
+
+        return elements
     }
 
     func shareButtonItem(enabled: Bool = true) -> UIBarButtonItem? {
@@ -1186,8 +1181,8 @@ extension ReaderDetailViewController {
             value: "Dismiss",
             comment: "Spoken accessibility label"
         )
-        static let displaySettingAccessibilityLabel = NSLocalizedString(
-            "readerDetail.displaySettingButton.accessibilityLabel",
+        static let displaySettingsLabel = NSLocalizedString(
+            "readerDetail.displaySettingButton.displaySettingsLabel",
             value: "Reading Preferences",
             comment: "Spoken accessibility label for the Reading Preferences menu.")
         static let safariButtonAccessibilityLabel = NSLocalizedString(