Merge release/25.5 into trunk

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+25.6
+-----
+
+
 25.6
 -----
 * [*] [internal] Update Gravatar SDK to 3.0.0 [#23701]

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

@@ -1,8 +1,49 @@
 import Foundation
 import AutomatticTracks
 import WordPressShared
+import WordPressUI
 
 final class ReaderCrossPostCell: ReaderStreamBaseCell {
+    private let view = ReaderCrossPostView()
+    private var contentViewConstraints: [NSLayoutConstraint] = []
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+
+        contentView.addSubview(view)
+        view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            view.topAnchor.constraint(equalTo: contentView.topAnchor),
+            view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor).withPriority(999),
+        ])
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("Not implemented")
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+
+        view.prepareForReuse()
+    }
+
+    func configure(with post: ReaderPost) {
+        view.configure(with: post)
+    }
+
+    override func didUpdateCompact(_ isCompact: Bool) {
+        setNeedsUpdateConstraints()
+    }
+
+    override func updateConstraints() {
+        NSLayoutConstraint.deactivate(contentViewConstraints)
+        contentViewConstraints = view.pinEdges(.horizontal, to: isCompact ? contentView : contentView.readableContentGuide)
+        super.updateConstraints()
+    }
+}
+
+private final class ReaderCrossPostView: UIView {
     private let avatarView = ReaderAvatarView()
     private let iconView = ReaderAvatarView()
     private let headerLabel = UILabel()
@@ -27,22 +68,18 @@ final class ReaderCrossPostCell: ReaderStreamBaseCell {
         .foregroundColor: UIColor.secondaryLabel
     ]
 
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    override init(frame: CGRect) {
+        super.init(frame: frame)
 
         setupStyle()
         setupLayout()
-
-        selectedBackgroundView = ReaderPostCell.makeSelectedBackgroundView()
     }
 
     required init?(coder: NSCoder) {
         fatalError("Not implemented")
     }
 
-    override func prepareForReuse() {
-        super.prepareForReuse()
-
+    func prepareForReuse() {
         avatarView.prepareForReuse()
     }
 

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

@@ -5,7 +5,6 @@ import WordPressShared
 
 final class ReaderPostCell: ReaderStreamBaseCell {
     private let view = ReaderPostCellView()
-
     private var contentViewConstraints: [NSLayoutConstraint] = []
 
     static let avatarSize: CGFloat = SiteIconViewModel.Size.small.width
@@ -23,12 +22,6 @@ final class ReaderPostCell: ReaderStreamBaseCell {
         ])
     }
 
-    static func makeSelectedBackgroundView() -> UIView {
-        let view = UIView()
-        view.backgroundColor = UIColor.opaqueSeparator.withAlphaComponent(0.2)
-        return view
-    }
-
     required init?(coder: NSCoder) {
         fatalError("Not implemented")
     }

WordPress/Jetpack/Resources/AppStoreStrings.po

@@ -81,13 +81,13 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v25.4-whats-new"
+msgctxt "v25.5-whats-new"
 msgid ""
-"Three things this month:\n"
-"1. We've updated the UI for iPadOS 18 – no more tab bar, everything is navigation-based, which should be a better use of the larger screen size.\n"
-"2. Some iOS 18 improvements – a few color tweaks, some bugfixes, and most importantly – tintable icons!\n"
-"3. We've been hard at work on an experimental new block editor. It's not ready for full-time use, but we'd love your feedback! Check it out in Me > App Settings > Experimental Features.\n"
-"If you have feedback on any of these features, we'd love to hear it – reach out to us at [email protected]!\n"
+"This month, we've:\n"
+"- Fixed some crashes in reader, improved search, and made posts load more smoothly.\n"
+"- Enabled TikTok embeds in reader.\n"
+"- Stability improvements to the experimental editor (you should try it if you haven't already!)\n"
+"- Adjusted how users log into WordPress.com – we hope it'll make it easier for folks to get started.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.

WordPress/Jetpack/Resources/beta_app_description.txt

@@ -0,0 +1 @@
+Thanks for using the Jetpack TestFlight build – please feel free to send us any feedback you might have!

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,5 +1,5 @@
-Three things this month:
-1. We've updated the UI for iPadOS 18 – no more tab bar, everything is navigation-based, which should be a better use of the larger screen size.
-2. Some iOS 18 improvements – a few color tweaks, some bugfixes, and most importantly – tintable icons!
-3. We've been hard at work on an experimental new block editor. It's not ready for full-time use, but we'd love your feedback! Check it out in Me > App Settings > Experimental Features.
-If you have feedback on any of these features, we'd love to hear it – reach out to us at [email protected]!
+This month, we've:
+- Fixed some crashes in reader, improved search, and made posts load more smoothly.
+- Enabled TikTok embeds in reader.
+- Stability improvements to the experimental editor (you should try it if you haven't already!)
+- Adjusted how users log into WordPress.com – we hope it'll make it easier for folks to get started.

WordPress/Resources/AppStoreStrings.po

@@ -45,13 +45,11 @@ msgctxt "app_store_keywords"
 msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
 msgstr ""
 
-msgctxt "v25.4-whats-new"
+msgctxt "v25.5-whats-new"
 msgid ""
-"Three things this month:\n"
-"1. We've updated the UI for iPadOS 18 – no more tab bar, everything is navigation-based, which should be a better use of the larger screen size.\n"
-"2. Some iOS 18 improvements – a few color tweaks, some bugfixes, and most importantly – tintable icons!\n"
-"3. We've been hard at work on an experimental new block editor. It's not ready for full-time use, but we'd love your feedback! Check it out in Me > App Settings > Experimental Features.\n"
-"If you have feedback on any of these features, we'd love to hear it – reach out to us at [email protected]!\n"
+"This month, we've:\n"
+"- Stability improvements to the experimental editor (you should try it if you haven't already!)\n"
+"- Adjusted how users log into WordPress.com – we hope it'll make it easier for folks to get started.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.