diff --git a/Modules/Package.swift b/Modules/Package.swift index 36669a34ba12..513237db4e23 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "JetpackStatsWidgetsCore", targets: ["JetpackStatsWidgetsCore"]), .library(name: "DesignSystem", targets: ["DesignSystem"]), .library(name: "WordPressFlux", targets: ["WordPressFlux"]), - .library(name: "WordPressMedia", targets: ["WordPressMedia"]), + .library(name: "AsyncImageKit", targets: ["AsyncImageKit"]), .library(name: "WordPressShared", targets: ["WordPressShared"]), .library(name: "WordPressUI", targets: ["WordPressUI"]), ], @@ -59,7 +59,7 @@ let package = Package( .product(name: "XCUITestHelpers", package: "XCUITestHelpers"), ], swiftSettings: [.swiftLanguageMode(.v5)]), .target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]), - .target(name: "WordPressMedia", dependencies: [ + .target(name: "AsyncImageKit", dependencies: [ .product(name: "Collections", package: "swift-collections"), ]), .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]), @@ -69,8 +69,8 @@ let package = Package( .testTarget(name: "JetpackStatsWidgetsCoreTests", dependencies: [.target(name: "JetpackStatsWidgetsCore")], swiftSettings: [.swiftLanguageMode(.v5)]), .testTarget(name: "DesignSystemTests", dependencies: [.target(name: "DesignSystem")], swiftSettings: [.swiftLanguageMode(.v5)]), .testTarget(name: "WordPressFluxTests", dependencies: ["WordPressFlux"], swiftSettings: [.swiftLanguageMode(.v5)]), - .testTarget(name: "WordPressMediaTests", dependencies: [ - .target(name: "WordPressMedia"), + .testTarget(name: "AsyncImageKitTests", dependencies: [ + .target(name: "AsyncImageKit"), .target(name: "WordPressTesting"), .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs") ]), @@ -145,7 +145,7 @@ enum XcodeSupport { "JetpackStatsWidgetsCore", "WordPressFlux", "WordPressShared", - "WordPressMedia", + "AsyncImageKit", "WordPressUI", .product(name: "Alamofire", package: "Alamofire"), .product(name: "AutomatticAbout", package: "AutomatticAbout-swift"), diff --git a/Modules/Sources/WordPressMedia/AnimagedImage.swift b/Modules/Sources/AsyncImageKit/AnimagedImage.swift similarity index 100% rename from Modules/Sources/WordPressMedia/AnimagedImage.swift rename to Modules/Sources/AsyncImageKit/AnimagedImage.swift diff --git a/Modules/Sources/WordPressMedia/FaviconService.swift b/Modules/Sources/AsyncImageKit/FaviconService.swift similarity index 100% rename from Modules/Sources/WordPressMedia/FaviconService.swift rename to Modules/Sources/AsyncImageKit/FaviconService.swift diff --git a/Modules/Sources/WordPressMedia/ImageDecoder.swift b/Modules/Sources/AsyncImageKit/ImageDecoder.swift similarity index 100% rename from Modules/Sources/WordPressMedia/ImageDecoder.swift rename to Modules/Sources/AsyncImageKit/ImageDecoder.swift diff --git a/Modules/Sources/WordPressMedia/ImageDownloader.swift b/Modules/Sources/AsyncImageKit/ImageDownloader.swift similarity index 100% rename from Modules/Sources/WordPressMedia/ImageDownloader.swift rename to Modules/Sources/AsyncImageKit/ImageDownloader.swift diff --git a/Modules/Sources/WordPressMedia/ImagePrefetcher.swift b/Modules/Sources/AsyncImageKit/ImagePrefetcher.swift similarity index 100% rename from Modules/Sources/WordPressMedia/ImagePrefetcher.swift rename to Modules/Sources/AsyncImageKit/ImagePrefetcher.swift diff --git a/Modules/Sources/WordPressMedia/ImageRequest.swift b/Modules/Sources/AsyncImageKit/ImageRequest.swift similarity index 100% rename from Modules/Sources/WordPressMedia/ImageRequest.swift rename to Modules/Sources/AsyncImageKit/ImageRequest.swift diff --git a/Modules/Sources/WordPressMedia/MediaHost.swift b/Modules/Sources/AsyncImageKit/MediaHost.swift similarity index 100% rename from Modules/Sources/WordPressMedia/MediaHost.swift rename to Modules/Sources/AsyncImageKit/MediaHost.swift diff --git a/Modules/Sources/WordPressMedia/MemoryCache.swift b/Modules/Sources/AsyncImageKit/MemoryCache.swift similarity index 100% rename from Modules/Sources/WordPressMedia/MemoryCache.swift rename to Modules/Sources/AsyncImageKit/MemoryCache.swift diff --git a/Modules/Tests/WordPressMediaTests/ImageDownloaderTests.swift b/Modules/Tests/AsyncImageKitTests/ImageDownloaderTests.swift similarity index 99% rename from Modules/Tests/WordPressMediaTests/ImageDownloaderTests.swift rename to Modules/Tests/AsyncImageKitTests/ImageDownloaderTests.swift index f661075ddfb4..95e967a166c2 100644 --- a/Modules/Tests/WordPressMediaTests/ImageDownloaderTests.swift +++ b/Modules/Tests/AsyncImageKitTests/ImageDownloaderTests.swift @@ -1,6 +1,6 @@ import UIKit import Testing -import WordPressMedia +import AsyncImageKit import WordPressTesting import OHHTTPStubs import OHHTTPStubsSwift diff --git a/Modules/Tests/WordPressMediaTests/MediaHostTests.swift b/Modules/Tests/AsyncImageKitTests/MediaHostTests.swift similarity index 100% rename from Modules/Tests/WordPressMediaTests/MediaHostTests.swift rename to Modules/Tests/AsyncImageKitTests/MediaHostTests.swift diff --git a/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift b/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift index 1bb9ef503f36..9cc05988f5c4 100644 --- a/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift +++ b/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift @@ -1,7 +1,7 @@ import UIKit import MobileCoreServices import UniformTypeIdentifiers -import WordPressMedia +import AsyncImageKit @objc public extension NSAttributedString { diff --git a/WordPress/Classes/Networking/MediaHost+Extensions.swift b/WordPress/Classes/Networking/MediaHost+Extensions.swift index ef6a44815f0d..9525bf47677e 100644 --- a/WordPress/Classes/Networking/MediaHost+Extensions.swift +++ b/WordPress/Classes/Networking/MediaHost+Extensions.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit /// Extends `MediaRequestAuthenticator.MediaHost` so that we can easily /// initialize it from a given `AbstractPost`. diff --git a/WordPress/Classes/Networking/MediaRequestAuthenticator.swift b/WordPress/Classes/Networking/MediaRequestAuthenticator.swift index f616d7c4a9a6..e6af940a29c1 100644 --- a/WordPress/Classes/Networking/MediaRequestAuthenticator.swift +++ b/WordPress/Classes/Networking/MediaRequestAuthenticator.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit fileprivate let photonHost = "i0.wp.com" fileprivate let secureHttpScheme = "https" diff --git a/WordPress/Classes/Services/MediaHelper.swift b/WordPress/Classes/Services/MediaHelper.swift index 1c6ba9132cad..be1d0170a007 100644 --- a/WordPress/Classes/Services/MediaHelper.swift +++ b/WordPress/Classes/Services/MediaHelper.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit class MediaHelper: NSObject { diff --git a/WordPress/Classes/Services/MediaImageService.swift b/WordPress/Classes/Services/MediaImageService.swift index e80679b40bd0..67768d200317 100644 --- a/WordPress/Classes/Services/MediaImageService.swift +++ b/WordPress/Classes/Services/MediaImageService.swift @@ -1,7 +1,7 @@ import UIKit import CoreData import WordPressShared -import WordPressMedia +import AsyncImageKit /// A service for retrieval and caching of thumbnails for ``Media`` objects. final class MediaImageService { diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift index fd78c601c94d..aba96ac78543 100644 --- a/WordPress/Classes/System/WordPressAppDelegate.swift +++ b/WordPress/Classes/System/WordPressAppDelegate.swift @@ -5,7 +5,7 @@ import AutomatticTracks import AutomatticEncryptedLogs import WordPressAuthenticator import WordPressShared -import WordPressMedia +import AsyncImageKit import AutomatticAbout import UIDeviceIdentifier import WordPressUI diff --git a/WordPress/Classes/Utility/Media/AsyncImageView.swift b/WordPress/Classes/Utility/Media/AsyncImageView.swift index b094ea94f3fc..32dd51be6c8a 100644 --- a/WordPress/Classes/Utility/Media/AsyncImageView.swift +++ b/WordPress/Classes/Utility/Media/AsyncImageView.swift @@ -1,6 +1,6 @@ import UIKit import Gifu -import WordPressMedia +import AsyncImageKit /// A simple image view that supports rendering both static and animated images /// (see ``AnimatedImage``). diff --git a/WordPress/Classes/Utility/Media/CachedAsyncImage.swift b/WordPress/Classes/Utility/Media/CachedAsyncImage.swift index a93fa0c2b663..8841e311fca4 100644 --- a/WordPress/Classes/Utility/Media/CachedAsyncImage.swift +++ b/WordPress/Classes/Utility/Media/CachedAsyncImage.swift @@ -1,6 +1,6 @@ import SwiftUI import DesignSystem -import WordPressMedia +import AsyncImageKit /// Asynchronous Image View that replicates the public API of `SwiftUI.AsyncImage`. /// It uses `ImageDownloader` to fetch and cache the images. diff --git a/WordPress/Classes/Utility/Media/ImageDownloader+Extensions.swift b/WordPress/Classes/Utility/Media/ImageDownloader+Extensions.swift index 3cc28ddf4250..e2ab2f650ebd 100644 --- a/WordPress/Classes/Utility/Media/ImageDownloader+Extensions.swift +++ b/WordPress/Classes/Utility/Media/ImageDownloader+Extensions.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit extension ImageDownloader { nonisolated static let shared = ImageDownloader(authenticator: MediaRequestAuthenticator()) diff --git a/WordPress/Classes/Utility/Media/ImageDownloader+Gravatar.swift b/WordPress/Classes/Utility/Media/ImageDownloader+Gravatar.swift index af43bc1eb757..57c6ed5991a2 100644 --- a/WordPress/Classes/Utility/Media/ImageDownloader+Gravatar.swift +++ b/WordPress/Classes/Utility/Media/ImageDownloader+Gravatar.swift @@ -1,9 +1,9 @@ -import Foundation +import UIKit import WordPressUI import Gravatar -import WordPressMedia +import AsyncImageKit -extension WordPressMedia.ImageDownloader { +extension AsyncImageKit.ImageDownloader { nonisolated func downloadGravatarImage(with email: String, forceRefresh: Bool = false, completion: @escaping (UIImage?) -> Void) { diff --git a/WordPress/Classes/Utility/Media/ImageLoadingController.swift b/WordPress/Classes/Utility/Media/ImageLoadingController.swift index 1611a2c2aed1..102a33d415a4 100644 --- a/WordPress/Classes/Utility/Media/ImageLoadingController.swift +++ b/WordPress/Classes/Utility/Media/ImageLoadingController.swift @@ -1,6 +1,6 @@ import Foundation import UIKit -import WordPressMedia +import AsyncImageKit /// A convenience class for managing image downloads for individual views. @MainActor diff --git a/WordPress/Classes/Utility/Media/MediaExternalExporter.swift b/WordPress/Classes/Utility/Media/MediaExternalExporter.swift index 25809dfccba3..62bf11469178 100644 --- a/WordPress/Classes/Utility/Media/MediaExternalExporter.swift +++ b/WordPress/Classes/Utility/Media/MediaExternalExporter.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit /// Media export handling assets from external sources i.e.: Stock Photos /// diff --git a/WordPress/Classes/Utility/Media/MemoryCache+Extensions.swift b/WordPress/Classes/Utility/Media/MemoryCache+Extensions.swift index dc3e2cf3c11e..4123729b19f3 100644 --- a/WordPress/Classes/Utility/Media/MemoryCache+Extensions.swift +++ b/WordPress/Classes/Utility/Media/MemoryCache+Extensions.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit import WordPressUI extension MemoryCache { diff --git a/WordPress/Classes/Utility/Media/UIImageView+ImageDownloader.swift b/WordPress/Classes/Utility/Media/UIImageView+ImageDownloader.swift index 92d5c0619831..1ea7a3647b0f 100644 --- a/WordPress/Classes/Utility/Media/UIImageView+ImageDownloader.swift +++ b/WordPress/Classes/Utility/Media/UIImageView+ImageDownloader.swift @@ -1,7 +1,7 @@ import Foundation import UIKit import Gifu -import WordPressMedia +import AsyncImageKit extension UIImageView { @MainActor diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift index 03c86785f764..44bd9b2656e6 100644 --- a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift +++ b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift @@ -6,7 +6,7 @@ import Gridicons import WordPressShared import MobileCoreServices import WordPressEditor -import WordPressMedia +import AsyncImageKit import AVKit import AutomatticTracks import MediaEditor diff --git a/WordPress/Classes/ViewRelated/Blaze Campaigns/BlazeCampaignTableViewCell.swift b/WordPress/Classes/ViewRelated/Blaze Campaigns/BlazeCampaignTableViewCell.swift index 6976b2e9ba62..b29d2351bdb2 100644 --- a/WordPress/Classes/ViewRelated/Blaze Campaigns/BlazeCampaignTableViewCell.swift +++ b/WordPress/Classes/ViewRelated/Blaze Campaigns/BlazeCampaignTableViewCell.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit final class BlazeCampaignTableViewCell: UITableViewCell, Reusable { diff --git a/WordPress/Classes/ViewRelated/Blaze/Overlay/BlazePostPreviewView.swift b/WordPress/Classes/ViewRelated/Blaze/Overlay/BlazePostPreviewView.swift index 3f58ab5c5c3d..f88760928a50 100644 --- a/WordPress/Classes/ViewRelated/Blaze/Overlay/BlazePostPreviewView.swift +++ b/WordPress/Classes/ViewRelated/Blaze/Overlay/BlazePostPreviewView.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit final class BlazePostPreviewView: UIView { diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Blaze/DashboardBlazeCampaignView.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Blaze/DashboardBlazeCampaignView.swift index 0fc0c6d7163a..e510fcb26ee6 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Blaze/DashboardBlazeCampaignView.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Blaze/DashboardBlazeCampaignView.swift @@ -1,7 +1,7 @@ import Foundation import UIKit import WordPressKit -import WordPressMedia +import AsyncImageKit final class DashboardBlazeCampaignView: UIView { private let statusView = BlazeCampaignStatusView() diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Me.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Me.swift index e5355eeebacf..af86d97d5858 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Me.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Me.swift @@ -1,6 +1,6 @@ -import Foundation +import UIKit import WordPressUI -import WordPressMedia +import AsyncImageKit import Gravatar extension BlogDetailsViewController { diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel.swift index a6a98aeffeb5..903d86bb25bb 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel.swift +++ b/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel.swift @@ -2,7 +2,7 @@ import Foundation import SwiftUI import WordPressShared import WordPressKit -import WordPressMedia +import AsyncImageKit struct SiteIconViewModel { var imageURL: URL? diff --git a/WordPress/Classes/ViewRelated/Cells/MediaItemHeaderView.swift b/WordPress/Classes/ViewRelated/Cells/MediaItemHeaderView.swift index 4d19260cbacd..3d54aabbda1c 100644 --- a/WordPress/Classes/ViewRelated/Cells/MediaItemHeaderView.swift +++ b/WordPress/Classes/ViewRelated/Cells/MediaItemHeaderView.swift @@ -1,7 +1,7 @@ import UIKit import Gridicons import WordPressShared -import WordPressMedia +import AsyncImageKit final class MediaItemHeaderView: UIView { let imageView = AsyncImageView() diff --git a/WordPress/Classes/ViewRelated/Cells/PostFeaturedImageCell.swift b/WordPress/Classes/ViewRelated/Cells/PostFeaturedImageCell.swift index 461d23fd669f..41cedf53d84f 100644 --- a/WordPress/Classes/ViewRelated/Cells/PostFeaturedImageCell.swift +++ b/WordPress/Classes/ViewRelated/Cells/PostFeaturedImageCell.swift @@ -1,6 +1,6 @@ import UIKit import WordPressUI -import WordPressMedia +import AsyncImageKit final class PostFeaturedImageCell: UITableViewCell { let featuredImageView = AsyncImageView() diff --git a/WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift b/WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift index 51f042e12672..8c8f796324e6 100644 --- a/WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift +++ b/WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit /// Renders the comment body through `WPRichContentView`. /// diff --git a/WordPress/Classes/ViewRelated/Gutenberg/AztecAttachmentDelegate.swift b/WordPress/Classes/ViewRelated/Gutenberg/AztecAttachmentDelegate.swift index 995bd75deea4..37a03f3edd8e 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/AztecAttachmentDelegate.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/AztecAttachmentDelegate.swift @@ -1,5 +1,5 @@ import Aztec -import WordPressMedia +import AsyncImageKit class AztecAttachmentDelegate: TextViewAttachmentDelegate { private let post: AbstractPost diff --git a/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift b/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift index 225583627599..dca6a14bbac6 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift @@ -2,7 +2,7 @@ import AutomatticTracks import Aztec import Gridicons import WordPressShared -import WordPressMedia +import AsyncImageKit class EditorMediaUtility { private static let InternalInconsistencyError = NSError(domain: NSExceptionName.internalInconsistencyException.rawValue, code: 0) diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 1589fc3e3ade..8fb10799e061 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit import Gutenberg import Aztec import WordPressFlux diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergMediaEditorImage.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergMediaEditorImage.swift index a3882df36f10..53558805f90a 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergMediaEditorImage.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergMediaEditorImage.swift @@ -1,6 +1,6 @@ import Foundation import MediaEditor -import WordPressMedia +import AsyncImageKit /** This is a struct to be given to MediaEditor that represent the image. diff --git a/WordPress/Classes/ViewRelated/Me/My Profile/Gravatar/GravatarQuickEditorPresenter.swift b/WordPress/Classes/ViewRelated/Me/My Profile/Gravatar/GravatarQuickEditorPresenter.swift index a1ad28d733d6..3e66dc5d3e38 100644 --- a/WordPress/Classes/ViewRelated/Me/My Profile/Gravatar/GravatarQuickEditorPresenter.swift +++ b/WordPress/Classes/ViewRelated/Me/My Profile/Gravatar/GravatarQuickEditorPresenter.swift @@ -2,7 +2,7 @@ import Foundation import GravatarUI import WordPressShared import WordPressAuthenticator -import WordPressMedia +import AsyncImageKit @MainActor struct GravatarQuickEditorPresenter { diff --git a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerCollectionCell.swift b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerCollectionCell.swift index 4d80e39286f1..7ee79240e2f8 100644 --- a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerCollectionCell.swift +++ b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerCollectionCell.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit final class ExternalMediaPickerCollectionCell: UICollectionViewCell { private let imageView = AsyncImageView() diff --git a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift index 729b59ba52ca..b0ad72b0d00a 100644 --- a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift +++ b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit protocol ExternalMediaPickerViewDelegate: AnyObject { /// If the user cancels the flow, the selection is empty. diff --git a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxImagePageViewController.swift b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxImagePageViewController.swift index fdc0ae966234..075015b84353 100644 --- a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxImagePageViewController.swift +++ b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxImagePageViewController.swift @@ -1,6 +1,6 @@ import UIKit import WordPressUI -import WordPressMedia +import AsyncImageKit final class LightboxImagePageViewController: UIViewController { private(set) var scrollView = LightboxImageScrollView() diff --git a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxItem.swift b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxItem.swift index 69e37075929e..254f4aa49da2 100644 --- a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxItem.swift +++ b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxItem.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit enum LightboxItem { case image(UIImage) diff --git a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxViewController.swift b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxViewController.swift index ec1058a8fe75..0f9f8debc036 100644 --- a/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxViewController.swift +++ b/WordPress/Classes/ViewRelated/Media/Lightbox/LightboxViewController.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit import WordPressUI import UniformTypeIdentifiers diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift index 54d1b8d7f510..e4c9e8b7fe67 100644 --- a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift +++ b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift @@ -1,7 +1,7 @@ import UIKit import Combine import Gifu -import WordPressMedia +import AsyncImageKit final class SiteMediaCollectionCell: UICollectionViewCell, Reusable { private let imageContainerView = UIView() diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index f3fd5637ea5a..c7a4721ea5bd 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit import AutomatticTracks import GutenbergKit import SafariServices diff --git a/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift b/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift index 861e06c50c3a..557f9f398413 100644 --- a/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift +++ b/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift @@ -1,6 +1,6 @@ import Foundation import UIKit -import WordPressMedia +import AsyncImageKit /// The purpose of this class is to provide a simple API to download assets from the web. /// Assets are downloaded, and resized to fit a maximumWidth, specified in the initial download call. diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift index 0633039f54ba..bba43f80f4f2 100644 --- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift +++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift @@ -1,7 +1,7 @@ import Foundation import WordPressShared import WordPressUI -import WordPressMedia +import AsyncImageKit import Gravatar // MARK: - NoteBlockHeaderTableViewCell diff --git a/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift b/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift index 7d6534431d1c..266debf1e90f 100644 --- a/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift +++ b/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift @@ -1,7 +1,7 @@ import Foundation import UIKit import Combine -import WordPressMedia +import AsyncImageKit final class PageListCell: UITableViewCell, AbstractPostListCell, PostSearchResultCell, Reusable { diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewTextViewManager.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewTextViewManager.swift index 3f6c036029a0..3b9317740842 100644 --- a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewTextViewManager.swift +++ b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewTextViewManager.swift @@ -1,6 +1,6 @@ import Aztec import Gridicons -import WordPressMedia +import AsyncImageKit class RevisionPreviewTextViewManager: NSObject { var post: AbstractPost? diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostCompactCell.swift b/WordPress/Classes/ViewRelated/Post/Views/PostCompactCell.swift index cb84ba4496cc..6d4d2e5c5949 100644 --- a/WordPress/Classes/ViewRelated/Post/Views/PostCompactCell.swift +++ b/WordPress/Classes/ViewRelated/Post/Views/PostCompactCell.swift @@ -2,7 +2,7 @@ import AutomatticTracks import UIKit import WordPressShared import WordPressUI -import WordPressMedia +import AsyncImageKit final class PostCompactCell: UITableViewCell, Reusable { private let titleLabel = UILabel() diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift index 8ec4cb3c89dd..431b482a3d9f 100644 --- a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift +++ b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift @@ -1,6 +1,6 @@ import Foundation import UIKit -import WordPressMedia +import AsyncImageKit protocol AbstractPostListCell { /// A post displayed by the cell. diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift index ed69ee523d0c..923c06598f19 100644 --- a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift @@ -2,7 +2,7 @@ import Foundation import AutomatticTracks import WordPressShared import WordPressUI -import WordPressMedia +import AsyncImageKit final class ReaderCrossPostCell: ReaderStreamBaseCell { private let view = ReaderCrossPostView() diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift index 29693a544e8d..b822ab27de3d 100644 --- a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift @@ -2,7 +2,7 @@ import SwiftUI import UIKit import Combine import WordPressShared -import WordPressMedia +import AsyncImageKit final class ReaderPostCell: ReaderStreamBaseCell { private let view = ReaderPostCellView() diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCellViewModel.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCellViewModel.swift index 0600cf4b61e4..91b6f8d48c85 100644 --- a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCellViewModel.swift +++ b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCellViewModel.swift @@ -1,5 +1,5 @@ import Foundation -import WordPressMedia +import AsyncImageKit final class ReaderPostCellViewModel { // Header diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController.swift index 612dfec0326a..21c787b39fb5 100644 --- a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController.swift +++ b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController.swift @@ -2,7 +2,7 @@ import Foundation import SVProgressHUD import WordPressShared import WordPressFlux -import WordPressMedia +import AsyncImageKit import UIKit import Combine import WordPressUI diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift index 607ff17c6c8a..4ea86b982473 100644 --- a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift +++ b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift @@ -1,6 +1,6 @@ import Foundation import WordPressShared -import WordPressMedia +import AsyncImageKit import Combine class ReaderDetailCoordinator { diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift b/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift index 6c5242a6c3de..d86c3f31387a 100644 --- a/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit protocol ReaderDetailFeaturedImageViewDelegate: AnyObject { func didTapFeaturedImage(_ sender: AsyncImageView) diff --git a/WordPress/Classes/ViewRelated/Reader/Views/ReaderAvatarView.swift b/WordPress/Classes/ViewRelated/Reader/Views/ReaderAvatarView.swift index 87913fe3306a..34c78ee41187 100644 --- a/WordPress/Classes/ViewRelated/Reader/Views/ReaderAvatarView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Views/ReaderAvatarView.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit final class ReaderAvatarView: UIView { private let asyncImageView = AsyncImageView() diff --git a/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift b/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift index 27363ecacf74..c1eca881cc4d 100644 --- a/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift @@ -1,5 +1,5 @@ import SwiftUI -import WordPressMedia +import AsyncImageKit struct ReaderSiteIconView: View, Hashable { let site: ReaderSiteTopic diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/StatsLatestPostSummaryInsightsCell.swift b/WordPress/Classes/ViewRelated/Stats/Insights/StatsLatestPostSummaryInsightsCell.swift index f07e4b7cad3a..7d7f1e0c1fd8 100644 --- a/WordPress/Classes/ViewRelated/Stats/Insights/StatsLatestPostSummaryInsightsCell.swift +++ b/WordPress/Classes/ViewRelated/Stats/Insights/StatsLatestPostSummaryInsightsCell.swift @@ -1,7 +1,7 @@ import UIKit import Gridicons import DesignSystem -import WordPressMedia +import AsyncImageKit protocol LatestPostSummaryConfigurable { func configure(withInsightData lastPostInsight: StatsLastPostInsight?, andDelegate delegate: SiteStatsInsightsDelegate?) diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift index 1d0dcfe2a23c..d95c1e0f49d2 100644 --- a/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift +++ b/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit struct StatsTotalRowData: Equatable { var id: UUID? diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift index 897eb3fccd3f..8429125f5e49 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift @@ -1,7 +1,7 @@ import Foundation import WordPressUI import Gravatar -import WordPressMedia +import AsyncImageKit extension WPTabBarController { diff --git a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift index 223f26f637bc..f52ca6f856d8 100644 --- a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift +++ b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift @@ -1,7 +1,7 @@ import Foundation import UIKit import WordPressShared -import WordPressMedia +import AsyncImageKit @objc protocol WPRichContentViewDelegate: UITextViewDelegate { func richContentView(_ richContentView: WPRichContentView, didReceiveImageAction image: WPRichTextImage) diff --git a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextImage.swift b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextImage.swift index dd314f896c58..b6f00c328715 100644 --- a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextImage.swift +++ b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextImage.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit import Gifu class WPRichTextImage: UIControl, WPRichTextMediaAttachment { diff --git a/WordPress/Classes/ViewRelated/WhatsNew/Views/DashboardCustomAnnouncementCell.swift b/WordPress/Classes/ViewRelated/WhatsNew/Views/DashboardCustomAnnouncementCell.swift index f3acd56f02cc..3ad260d672f3 100644 --- a/WordPress/Classes/ViewRelated/WhatsNew/Views/DashboardCustomAnnouncementCell.swift +++ b/WordPress/Classes/ViewRelated/WhatsNew/Views/DashboardCustomAnnouncementCell.swift @@ -1,5 +1,5 @@ import UIKit -import WordPressMedia +import AsyncImageKit class DashboardCustomAnnouncementCell: AnnouncementTableViewCell { diff --git a/WordPress/WordPressTest/MediaImageServiceTests.swift b/WordPress/WordPressTest/MediaImageServiceTests.swift index c2e35546f2a8..7fbe89e78ae5 100644 --- a/WordPress/WordPressTest/MediaImageServiceTests.swift +++ b/WordPress/WordPressTest/MediaImageServiceTests.swift @@ -1,7 +1,7 @@ import XCTest import OHHTTPStubs import OHHTTPStubsSwift -import WordPressMedia +import AsyncImageKit @testable import WordPress class MediaImageServiceTests: CoreDataTestCase {