Address remaining feedback for 25.7.

Modules/Sources/AsyncImageKit/ImagePrefetcher.swift

@@ -89,6 +89,7 @@ public final class ImagePrefetcher {
                 value.task?.cancel()
             }
             queue.removeAll()
+            numberOfActiveTasks = 0
         }
     }
 

Modules/Sources/AsyncImageKit/ImageRequest.swift

@@ -51,29 +51,34 @@ public struct ImageRequestOptions: Hashable, Sendable {
 
 /// Image size in **pixels**.
 public struct ImageSize: Hashable, Sendable {
-    public let width: CGFloat
-    public let height: CGFloat
+    /// Width in **pixels**.
+    public var width: Int
+    /// Height in **pixels**.
+    public var height: Int
 
-    public init(width: CGFloat, height: CGFloat) {
-        self.width = width
-        self.height = height
+    /// Initializes the struct with given size in **pixels**.
+    public init(width: Int, height: Int) {
+        self.width = Int(width)
+        self.height = Int(height)
     }
 
-    public init(_ size: CGSize) {
-        self.width = size.width
-        self.height = size.height
+    /// Initializes the struct with given size in **pixels**.
+    public init(pixels size: CGSize) {
+        self.width = Int(size.width)
+        self.height = Int(size.height)
     }
 
-    /// Initializes `ImageSize` with the given size scaled for the given view.
+    /// A convenience initializer that creates `ImageSize` with the given size
+    /// in **points** scaled for the given view.
     @MainActor
     public init(scaling size: CGSize, in view: UIView) {
-        self.init(size.scaled(by: view.traitCollection.displayScale))
+        self.init(scaling: size, scale: view.traitCollection.displayScale)
     }
 
-    /// Initializes `ImageSize` with the given size scaled for the current trait
-    /// collection display scale.
-    public init(scaling size: CGSize) {
-        self.init(size.scaled(by: UITraitCollection.current.displayScale))
+    /// Initializes `ImageSize` with the given size in **points** scaled for the
+    /// current trait collection display scale.
+    public init(scaling size: CGSize, scale: CGFloat) {
+        self.init(pixels: size.scaled(by: max(1, scale)))
     }
 }
 

Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift

@@ -30,6 +30,7 @@ public final class AsyncImageView: UIView {
         /// By default, `background`.
         public var loadingStyle = LoadingStyle.background
 
+        // TODO: remove when WPRichTextImage is removed
         public var passTouchesToSuperview = false
 
         public init() {}

WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift

@@ -236,7 +236,7 @@ final class ExternalMediaPickerViewController: UIViewController, UICollectionVie
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Self.cellReuseID, for: indexPath) as! ExternalMediaPickerCollectionCell
         let item = dataSource.assets[indexPath.item]
-        cell.configure(imageURL: item.thumbnailURL, size: ImageSize(scaling: flowLayout.itemSize))
+        cell.configure(imageURL: item.thumbnailURL, size: ImageSize(scaling: flowLayout.itemSize, in: self.view))
         return cell
     }
 

WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift

@@ -71,7 +71,7 @@ class NoteBlockHeaderTableViewCell: NoteBlockTableViewCell {
         if let gravatar = AvatarURL(url: url) {
             authorAvatarImageView.downloadGravatar(gravatar, placeholder: .gravatarPlaceholderImage, animate: true)
         } else {
-            authorAvatarImageView.wp.setImage(with: url, size: ImageSize(scaling: SiteIconViewModel.Size.regular.size))
+            authorAvatarImageView.wp.setImage(with: url, size: ImageSize(scaling: SiteIconViewModel.Size.regular.size, in: self))
         }
     }
 

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

@@ -133,7 +133,7 @@ private final class ReaderCrossPostView: UIView {
 
         avatarView.setPlaceholder(UIImage(named: "post-blavatar-placeholder"))
         if let avatarURL = post.avatarURLForDisplay() {
-            let avatarSize = ImageSize(scaling: CGSize(width: avatarSize, height: avatarSize))
+            let avatarSize = ImageSize(scaling: CGSize(width: avatarSize, height: avatarSize), in: self)
             avatarView.setImage(with: avatarURL, size: avatarSize)
         }
     }

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

@@ -360,7 +360,7 @@ private final class ReaderPostCellView: UIView {
 
     private func setAvatar(with viewModel: ReaderPostCellViewModel) {
         avatarView.setPlaceholder(UIImage(named: "post-blavatar-placeholder"))
-        let avatarSize = ImageSize(scaling: CGSize(width: ReaderPostCell.avatarSize, height: ReaderPostCell.avatarSize))
+        let avatarSize = ImageSize(scaling: CGSize(width: ReaderPostCell.avatarSize, height: ReaderPostCell.avatarSize), in: self)
         if let avatarURL = viewModel.avatarURL {
             avatarView.setImage(with: avatarURL, size: avatarSize)
         } else {