Fix an issue with site icons cropped in share extensions (#23950)

kean · web-flow · commit 6e32673a8ef4 · 2025-01-06T17:09:14.000-05:00
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -66,7 +66,15 @@ let package = Package(
         .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressShared", dependencies: [.target(name: "WordPressSharedObjC")], resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressTesting", resources: [.process("Resources")]),
-        .target(name: "WordPressUI", dependencies: [.target(name: "WordPressShared")], resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
+        .target(
+            name: "WordPressUI",
+            dependencies: [
+                "AsyncImageKit",
+                .target(name: "WordPressShared")
+            ],
+            resources: [.process("Resources")],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .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)]),
@@ -193,6 +201,7 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
                 "JetpackStatsWidgetsCore",
                 "WordPressShared",
+                "WordPressUI",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                 .product(name: "WordPressAPI", package: "wordpress-rs"),
                 .product(name: "ColorStudio", package: "color-studio"),
diff --git a/Modules/Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift b/Modules/Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift
diff --git a/Modules/Sources/WordPressUI/Resources/Assets.xcassets/Contents.json b/Modules/Sources/WordPressUI/Resources/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/Modules/Sources/WordPressUI/Resources/Assets.xcassets/vector.imageset/Contents.json b/Modules/Sources/WordPressUI/Resources/Assets.xcassets/vector.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Modules/Sources/WordPressUI/Resources/Assets.xcassets/vector.imageset/Vector.pdf b/Modules/Sources/WordPressUI/Resources/Assets.xcassets/vector.imageset/Vector.pdf
diff --git a/Modules/Sources/WordPressUI/Views/SiteIconView.swift b/Modules/Sources/WordPressUI/Views/SiteIconView.swift
@@ -1,15 +1,17 @@
 import UIKit
 import SwiftUI
 import AsyncImageKit
-import DesignSystem
-import WordPressShared
 
-struct SiteIconView: View {
-    let viewModel: SiteIconViewModel
+public struct SiteIconView: View {
+    public let viewModel: SiteIconViewModel
 
     @Environment(\.siteIconBackgroundColor) private var backgroundColor
 
-    var body: some View {
+    public init(viewModel: SiteIconViewModel) {
+        self.viewModel = viewModel
+    }
+
+    public var body: some View {
         contents
             .clipShape(RoundedRectangle(cornerRadius: 6))
     }
@@ -56,7 +58,7 @@ struct SiteIconView: View {
 
     private var failureStateView: some View {
         backgroundColor.overlay {
-            Image.DS.icon(named: .vector)
+            Image("vector", bundle: .module)
                 .resizable()
                 .frame(width: 18, height: 18)
                 .tint(Color(.tertiaryLabel))
@@ -69,18 +71,52 @@ private struct SiteIconViewBackgroundColorKey: EnvironmentKey {
 }
 
 extension EnvironmentValues {
-    var siteIconBackgroundColor: Color {
+    public var siteIconBackgroundColor: Color {
         get { self[SiteIconViewBackgroundColorKey.self] }
         set { self[SiteIconViewBackgroundColorKey.self] = newValue }
     }
 }
 
+// MARK: - SiteIconViewModel
+
+public struct SiteIconViewModel {
+    public var imageURL: URL?
+    public var firstLetter: Character?
+    public var size: Size
+    public var host: MediaHostProtocol?
+
+    public enum Size {
+        case small
+        case regular
+        case large
+
+        public var width: CGFloat {
+            switch self {
+            case .small: 28
+            case .regular: 40
+            case .large: 72
+            }
+        }
+
+        public var size: CGSize {
+            CGSize(width: width, height: width)
+        }
+    }
+
+    public init(imageURL: URL? = nil, firstLetter: Character? = nil, size: Size = .regular, host: MediaHostProtocol? = nil) {
+        self.imageURL = imageURL
+        self.firstLetter = firstLetter
+        self.size = size
+        self.host = host
+    }
+}
+
 // MARK: - SiteIconHostingView (UIKit)
 
-final class SiteIconHostingView: UIView {
+public final class SiteIconHostingView: UIView {
     private let viewModel = SiteIconHostingViewModel()
 
-    override init(frame: CGRect) {
+    public override init(frame: CGRect) {
         super.init(frame: frame)
 
         let host = UIHostingController(rootView: _SiteIconHostingView(viewModel: viewModel))
@@ -90,11 +126,11 @@ final class SiteIconHostingView: UIView {
         host.view.pinSubviewToAllEdges(self)
     }
 
-    required init?(coder: NSCoder) {
+    public required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    func setIcon(with viewModel: SiteIconViewModel) {
+    public func setIcon(with viewModel: SiteIconViewModel) {
         self.viewModel.icon = viewModel
     }
 }
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@
 * [*] Fix an issue with Referrers in Stats showing invalid icons [#23943]
 * [*] Update site menu style on iPhone [#23944]
 * [*] Integrate zoom transitions in Themes, Reader [#23945, #23947]
-
+* [*] Fix an issue with site icons cropped in share extensions [#23950]
 
 25.6
 -----
diff --git a/WordPress/Classes/Models/ReaderPost+Swift.swift b/WordPress/Classes/Models/ReaderPost+Swift.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressUI
 
 extension ReaderPost {
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift
@@ -2,6 +2,7 @@ import Gridicons
 import UIKit
 import DesignSystem
 import SwiftUI
+import WordPressUI
 
 @objc protocol BlogDetailHeaderViewDelegate {
     func makeSiteIconMenu() -> UIMenu?
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/SiteDetailsSiteIconView.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/SiteDetailsSiteIconView.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressUI
 
 final class SiteDetailsSiteIconView: UIView {
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/BlogListSiteView.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/BlogListSiteView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressUI
 import WordPressShared
 
 struct BlogListSiteView: View {
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel+Extensions.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/BlogList/SiteIconViewModel+Extensions.swift
@@ -3,33 +3,12 @@ import SwiftUI
 import WordPressShared
 import WordPressKit
 import AsyncImageKit
+import WordPressUI
 
-struct SiteIconViewModel {
-    var imageURL: URL?
-    var firstLetter: Character?
-    var size: Size
-    var host: MediaHost?
-
-    enum Size {
-        case small
-        case regular
-        case large
-
-        var width: CGFloat {
-            switch self {
-            case .small: 28
-            case .regular: 40
-            case .large: 72
-            }
-        }
-
-        var size: CGSize {
-            CGSize(width: width, height: width)
-        }
-    }
-
+extension SiteIconViewModel {
     init(blog: Blog, size: Size = .regular) {
-        self.size = size
+        self.init(size: size)
+
         self.firstLetter = blog.title?.first
 
         if blog.hasIcon, let icon = blog.icon {
@@ -39,7 +18,8 @@ struct SiteIconViewModel {
     }
 
     init(readerSiteTopic: ReaderSiteTopic, size: Size = .regular) {
-        self.size = size
+        self.init(size: size)
+
         self.firstLetter = readerSiteTopic.title.first
         self.imageURL = SiteIconViewModel.makeReaderSiteIconURL(
             iconURL: readerSiteTopic.siteBlavatar,
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
@@ -4,6 +4,7 @@ import Gutenberg
 import Aztec
 import WordPressFlux
 import WordPressShared
+import WordPressUI
 import React
 import AutomatticTracks
 import Combine
diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationSettingsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationSettingsViewController.swift
@@ -331,11 +331,15 @@ private extension NotificationSettingsViewController {
         labelView.translatesAutoresizingMaskIntoConstraints = false
 
         let textProvider = JetpackBrandingTextProvider(screen: JetpackBadgeScreen.notificationsSettings)
-        let badgeView = JetpackButton.makeBadgeView(title: textProvider.brandingText(),
-                                                    topPadding: FooterMetrics.jetpackBadgeTopPadding,
-                                                    bottomPadding: FooterMetrics.jetpackBadgeBottomPatting,
-                                                    target: self,
-                                                    selector: #selector(jetpackButtonTapped))
+        let badgeView = JetpackButton.makeBadgeView(
+            title: textProvider.brandingText(),
+            topPadding: FooterMetrics.jetpackBadgeTopPadding,
+            bottomPadding: FooterMetrics.jetpackBadgeBottomPatting,
+            target: self,
+            selector: #selector(
+                jetpackButtonTapped
+            )
+        )
         badgeView.translatesAutoresizingMaskIntoConstraints = false
 
         let stackView = UIStackView(arrangedSubviews: [labelView, badgeView])
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NotificationSettingsSiteView.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NotificationSettingsSiteView.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SwiftUI
+import WordPressUI
 
 struct NotificationSettingsSiteView: View {
     let viewModel: NotificationSettingsSiteViewModel
diff --git a/WordPress/Classes/ViewRelated/Post/Prepublishing Nudge/PrepublishingHeaderView.swift b/WordPress/Classes/ViewRelated/Post/Prepublishing Nudge/PrepublishingHeaderView.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressUI
 
 final class PrepublishingHeaderView: UIView {
     private let blogImageView = SiteIconHostingView()
diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift
@@ -1,6 +1,7 @@
 import SwiftUI
 import UIKit
 import Combine
+import WordPressUI
 import WordPressShared
 import AsyncImageKit
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderFeedCell.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderFeedCell.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressUI
 import WordPressKit
 
 struct ReaderFeedCell: View {
@@ -25,7 +26,7 @@ struct ReaderFeedCell: View {
 
 extension SiteIconViewModel {
     init(feed: ReaderFeed, size: Size = .regular) {
-        self.size = size
+        self.init(size: size)
         if let iconURL = feed.blavatarURL {
             self.imageURL = SiteIconViewModel.optimizedURL(for: iconURL.absoluteString, imageSize: size.size)
         }
diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressUI
 
 struct ReaderSubscriptionCell: View {
     let site: ReaderSiteTopic
diff --git a/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift b/WordPress/Classes/ViewRelated/Reader/Views/ReaderSiteIconView.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import AsyncImageKit
+import WordPressUI
 
 struct ReaderSiteIconView: View, Hashable {
     let site: ReaderSiteTopic
diff --git a/WordPress/WordPressShareExtension/ShareModularViewController.swift b/WordPress/WordPressShareExtension/ShareModularViewController.swift
diff --git a/WordPress/WordPressShareExtension/WPStyleGuide+Share.swift b/WordPress/WordPressShareExtension/WPStyleGuide+Share.swift

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"info" : {`
`3`		`- "version" : 1,`
`4`		`- "author" : "xcode"`
	`3`	`+ "author" : "xcode",`
	`4`	`+ "version" : 1`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import Foundation`
	`2`	`+import WordPressUI`
`2`	`3`
`3`	`4`	`extension ReaderPost {`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import UIKit`
	`2`	`+import WordPressUI`
`2`	`3`
`3`	`4`	`final class SiteDetailsSiteIconView: UIView {`
`4`	`5`