Merge branch 'trunk' into issue/24091-site-list-not-dismissed-after-adding-a-self-hosted-site

Author: pmusolino

Modules/Package.swift

@@ -77,7 +77,18 @@ let package = Package(
             resources: [.process("Resources")],
             swiftSettings: [.swiftLanguageMode(.v5)]
         ),
-        .target(name: "FormattableContentKit", dependencies: ["WordPressShared"]),
+        .target(
+            name: "FormattableContentKit",
+            dependencies: [
+                "WordPressShared",
+                "WordPressUI",
+                .product(name: "Gridicons", package: "Gridicons-iOS"),
+                // TODO: Remove — It's here just for a NSMutableParagraphStyle init helper
+                .product(name: "WordPressKit", package: "WordPressKit-iOS"),
+            ],
+            // Set to v5 to avoid @Sendable warnings and errors
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(
             name: "ShareExtensionCore",
@@ -124,6 +135,7 @@ let package = Package(
         .target(
             name: "WordPressShared",
             dependencies: [
+                .product(name: "Reachability", package: "Reachability"),
                 .target(name: "SFHFKeychainUtils"),
                 .target(name: "WordPressSharedObjC"),
             ],

Modules/Sources/BuildSettingsKit/BuildSettings+Live.swift

@@ -14,6 +14,14 @@ extension BuildSettings {
         itunesAppID = bundle.infoValue(forKey: "WPItunesAppID")
         appURLScheme = bundle.infoValue(forKey: "WPAppURLScheme")
         jetpackAppURLScheme = bundle.infoValue(forKey: "WPJetpackAppURLScheme")
+        about = ProductAboutDetails(
+            twitterHandle: bundle.infoValue(forKey: "WPProductTwitterHandle"),
+            twitterURL: bundle.urlValue(forKey: "WPProductTwitterURL"),
+            blogURL: bundle.urlValue(forKey: "WPProductBlogURL")
+        )
+        zendeskSourcePlatform = bundle.infoValue(forKey: "WPZendeskSourcePlatform")
+        mobileAnnounceAppID = bundle.infoValue(forKey: "WPMobileAnnounceAppID")
+        authKeychainServiceName = bundle.infoValue(forKey: "WPAuthKeychainServiceName")
     }
 }
 
@@ -32,6 +40,11 @@ private extension Bundle {
             fatalError("unexpected value: \(object) for key: \(key)")
         }
     }
+
+    func urlValue(forKey key: String) -> URL {
+        let urlWithoutScheme: String = infoValue(forKey: key)
+        return URL(string: "https://\(urlWithoutScheme)")!
+    }
 }
 
 private extension Bundle {

Modules/Sources/BuildSettingsKit/BuildSettings+Preview.swift

@@ -12,7 +12,15 @@ extension BuildSettings {
         explatPlatform: "xcpreview",
         itunesAppID: "1234567890",
         appURLScheme: "xcpreview",
-        jetpackAppURLScheme: "jetpack"
+        jetpackAppURLScheme: "jetpack",
+        about: ProductAboutDetails(
+            twitterHandle: "@wordpress",
+            twitterURL: URL(string: "www.example.com")!,
+            blogURL: URL(string: "www.example.com")!
+        ),
+        zendeskSourcePlatform: "zen",
+        mobileAnnounceAppID: "1234567890",
+        authKeychainServiceName: "public-api.wordpress.com"
     )
 }
 

Modules/Sources/BuildSettingsKit/BuildSettings.swift

@@ -22,6 +22,16 @@ public struct BuildSettings: Sendable {
     public var itunesAppID: String
     public var appURLScheme: String
     public var jetpackAppURLScheme: String
+    public var about: ProductAboutDetails
+    public var zendeskSourcePlatform: String
+    public var mobileAnnounceAppID: String
+    public var authKeychainServiceName: String
+
+    public struct ProductAboutDetails: Sendable {
+        public var twitterHandle: String
+        public var twitterURL: URL
+        public var blogURL: URL
+    }
 
     public static var current: BuildSettings {
         switch BuildSettingsEnvironment.current {

Modules/Sources/FormattableContentKit/Groups/HeaderContentGroup.swift

@@ -0,0 +1 @@
+public class HeaderContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Groups/SubjectContentGroup.swift

@@ -0,0 +1 @@
+public class SubjectContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Styles/SnippetsContentStyles.swift

@@ -0,0 +1,27 @@
+import WordPressShared
+
+public class SnippetsContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
+        return WPStyleGuide.Notifications.snippetRegularStyle
+    }
+
+    public var quoteStyles: [NSAttributedString.Key: Any]?
+
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]?
+
+    public var linksColor: UIColor?
+
+    public var key: String
+
+    public init(
+        quoteStyles: [NSAttributedString.Key: Any]? = nil,
+        rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? = nil,
+        linksColor: UIColor? = nil,
+        key: String = "SnippetsContentStyles"
+    ) {
+        self.quoteStyles = quoteStyles
+        self.rangeStylesMap = rangeStylesMap
+        self.linksColor = linksColor
+        self.key = key
+    }
+}

WordPress/Classes/ViewRelated/Notifications/FormattableContent/Styles/SubjectContentStyles.swift renamed to Modules/Sources/FormattableContentKit/Styles/SubjectContentStyles.swift

@@ -1,16 +1,15 @@
 import WordPressShared
-import FormattableContentKit
 
-class SubjectContentStyles: FormattableContentStyles {
-    var attributes: [NSAttributedString.Key: Any] {
+public class SubjectContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
         return WPStyleGuide.Notifications.subjectRegularStyle
     }
 
-    var quoteStyles: [NSAttributedString.Key: Any]? {
+    public var quoteStyles: [NSAttributedString.Key: Any]? {
         return WPStyleGuide.Notifications.subjectItalicsStyle
     }
 
-    var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
         return [
             .user: WPStyleGuide.Notifications.subjectRegularStyle,
             .post: WPStyleGuide.Notifications.subjectRegularStyle,
@@ -21,6 +20,11 @@ class SubjectContentStyles: FormattableContentStyles {
         ]
     }
 
-    var linksColor: UIColor? = nil
-    var key: String = "SubjectContentStyles"
+    public var linksColor: UIColor?
+    public var key: String
+
+    public init(linkColor: UIColor? = nil, key: String = "SubjectContentStyles") {
+        self.linksColor = linkColor
+        self.key = key
+    }
 }

WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift renamed to Modules/Sources/FormattableContentKit/Styles/WPStyleGuide+Notifications.swift

@@ -1,7 +1,9 @@
+// FIXME: This does not belong here, see https://github.com/wordpress-mobile/WordPress-iOS/pull/24297
 import Foundation
-
 import Gridicons
+import UIKit
 import WordPressShared
+import WordPressKit // FIXME: Here just for the NSMutableParagraphStyle custom init
 import WordPressUI
 
 extension WPStyleGuide {
@@ -285,3 +287,29 @@ extension WPStyleGuide {
         fileprivate static let blockNoticonFont = subjectNoticonFont
     }
 }
+
+// FIXME: Duplicated move to appropriate location
+extension UIFont {
+    /// Returns a UIFont instance with the italic trait applied.
+    func italic() -> UIFont {
+        return withSymbolicTraits(.traitItalic)
+    }
+
+    /// Returns a UIFont instance with the semibold trait applied.
+    func semibold() -> UIFont {
+        return withWeight(.semibold)
+    }
+
+    private func withSymbolicTraits(_ traits: UIFontDescriptor.SymbolicTraits) -> UIFont {
+        guard let descriptor = fontDescriptor.withSymbolicTraits(traits) else {
+            return self
+        }
+
+        return UIFont(descriptor: descriptor, size: 0)
+    }
+
+    private func withWeight(_ weight: UIFont.Weight) -> UIFont {
+        let descriptor = fontDescriptor.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: weight]])
+        return UIFont(descriptor: descriptor, size: 0)
+    }
+}

Modules/Sources/WordPressShared/Reachability/Notification+Reachability.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+public extension Notification {
+    static let reachabilityKey = "org.wordpress.reachability"
+}
+
+public extension Notification.Name {
+    static var reachabilityChanged: Notification.Name {
+        return Notification.Name("\(Notification.reachabilityKey).changed")
+    }
+}
+
+@objc extension NSNotification {
+    public static let ReachabilityChangedNotification = Notification.Name.reachabilityChanged
+}