Merge branch 'trunk' into feature/media-permissions-dynamic-type

Author: frosty

Podfile

@@ -47,7 +47,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.46.0-beta.1'
+    pod 'WordPressKit', '~> 4.46.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''

Podfile.lock

@@ -465,7 +465,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.46.0-beta.1):
+  - WordPressKit (4.46.0-beta.2):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -569,7 +569,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.7)
   - WordPressAuthenticator (~> 1.43.0-beta.2)
-  - WordPressKit (~> 4.46.0-beta.1)
+  - WordPressKit (~> 4.46.0-beta)
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.0)
   - WordPressUI (~> 1.12.3)
@@ -581,6 +581,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
+    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -619,7 +620,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WordPressUI
@@ -833,7 +833,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 144f124148079084860368dfd27cb96e0952853e
   WordPress-Editor-iOS: 20551d5a5e51f29832064f08faaaae8e1da7e1e2
   WordPressAuthenticator: 0b3423546d92a976e3ce627d2e5a0350716b1f5b
-  WordPressKit: 52329b519bd0da6533cd4c79070424d0672ed7ee
+  WordPressKit: e623ffb39b2b9d7730a9be63e26fa77929e6e43b
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: a4b0308a6345d4dda20c8f7ad9317df4246b4a00
   WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
@@ -849,6 +849,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 5061295d7316fff43e35b70aa417d40afabb0789
+PODFILE CHECKSUM: 2198bf3dcf133317995199bc08b6af69a74ee863
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 * [*] Signup: Fixed bug where username selection screen could be pushed twice. [#17624]
 * [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17758]
 * [**] Reader post details Comments snippet: added ability to manage conversation subscription and notifications. [#17749]
-* [**] Accessibility: VoiceOver improvements on Activity Log and Schedule Post calendars [#17756, #17761]
+* [**] Accessibility: VoiceOver and Dynamic Type improvements on Activity Log and Schedule Post calendars [#17756, #17761, #17780]
 * [*] Weekly Roundup: Fix a crash which was preventing weekly roundup notifications from appearing [#17765]
 * [*] Self-hosted login: Improved error messages. [#17724]
 * [*] Share Sheet from Photos: Fix an issue where certain filenames would not upload or render in Post [#16773]
@@ -17,6 +17,7 @@
 * [*] Block editor: Fix cut-off setting labels by properly wrapping the text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4475]
 * [*] Block editor: Highlight text: fix applying formatting for non-selected text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4471]
 * [**] Block editor: Fix Android handling of Hebrew and Indonesian translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4397]
+* [***] Self-hosted sites: Fixed a crash when saving media and no Internet connection was available. [#17759]
 
 19.0
 -----

WordPress/Classes/Models/Media.m

@@ -261,4 +261,18 @@ - (BOOL)hasRemote {
     return self.mediaID.intValue != 0;
 }
 
+- (void)setError:(NSError *)error
+{
+    if (error != nil) {
+        // Cherry pick keys that support secure coding. NSErrors thrown from the OS can
+        // contain types that don't adopt NSSecureCoding, leading to a Core Data exception and crash.
+        NSDictionary *userInfo = @{NSLocalizedDescriptionKey: error.localizedDescription};
+        error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
+    }
+
+    [self willChangeValueForKey:@"error"];
+    [self setPrimitiveValue:error forKey:@"error"];
+    [self didChangeValueForKey:@"error"];
+}
+
 @end

WordPress/Classes/Services/MediaService.m

@@ -425,7 +425,7 @@ - (NSError *)customMediaUploadError:(NSError *)error remote:(id <MediaServiceRem
                 case NSURLErrorNetworkConnectionLost:
                 case NSURLErrorNotConnectedToInternet:
                     // Clear lack of device internet connection, notify the user
-                    customErrorMessage = NSLocalizedString(@"The internet connection appears to be offline.", @"Error message shown when a media upload fails because the user isn't connected to the internet.");
+                    customErrorMessage = NSLocalizedString(@"The Internet connection appears to be offline.", @"Error message shown when a media upload fails because the user isn't connected to the Internet.");
                     break;
                 default:
                     // Default NSURL error messaging, probably server-side, encourage user to try again
@@ -434,11 +434,13 @@ - (NSError *)customMediaUploadError:(NSError *)error remote:(id <MediaServiceRem
             }
         }
     }
+
     if (customErrorMessage) {
-        NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
+        NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
         userInfo[NSLocalizedDescriptionKey] = customErrorMessage;
-        error = [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:userInfo];
+        error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
     }
+
     return error;
 }
 

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift

@@ -2,12 +2,16 @@ import UIKit
 
 final class BlogDashboardViewController: UIViewController {
 
+    var blog: Blog?
+
     enum Section: CaseIterable {
         case quickLinks
+        case posts
     }
 
     // FIXME: temporary placeholder
     private let quickLinks = ["Quick Links"]
+    private let posts = ["Posts"]
 
     typealias DataSource = UICollectionViewDiffableDataSource<Section, String>
     typealias Snapshot = NSDiffableDataSourceSnapshot<Section, String>
@@ -20,22 +24,38 @@ final class BlogDashboardViewController: UIViewController {
     }()
 
     private lazy var dataSource: DataSource = {
-        return DataSource(collectionView: collectionView) { collectionView, indexPath, identifier in
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: QuickLinksHostCell.defaultReuseID, for: indexPath) as? QuickLinksHostCell
-            cell?.hostedView = QuickLinksView(title: self.quickLinks[indexPath.item])
-            return cell
+        return DataSource(collectionView: collectionView) { [unowned self] collectionView, indexPath, identifier in
+            switch identifier {
+            case self.quickLinks.first:
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: QuickLinksHostCell.defaultReuseID, for: indexPath) as? QuickLinksHostCell
+                cell?.hostedView = QuickLinksView(title: self.quickLinks[indexPath.item])
+                return cell
+            case self.posts.first:
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: DashboardPostsCardCell.defaultReuseID, for: indexPath) as? DashboardPostsCardCell
+                cell?.configure(self, blog: self.blog!)
+                return cell
+            default:
+                break
+            }
+            return UICollectionViewCell()
         }
     }()
 
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         setupCollectionView()
         applySnapshotForInitialData()
+        addHeightObservers()
     }
 
     private func setupCollectionView() {
         collectionView.backgroundColor = .listBackground
         collectionView.register(QuickLinksHostCell.self, forCellWithReuseIdentifier: QuickLinksHostCell.defaultReuseID)
+        collectionView.register(DashboardPostsCardCell.self, forCellWithReuseIdentifier: DashboardPostsCardCell.defaultReuseID)
 
         view.addSubview(collectionView)
         view.pinSubviewToAllEdges(collectionView)
@@ -45,8 +65,17 @@ final class BlogDashboardViewController: UIViewController {
         var snapshot = Snapshot()
         snapshot.appendSections(Section.allCases)
         snapshot.appendItems(quickLinks, toSection: Section.quickLinks)
+        snapshot.appendItems(posts, toSection: Section.posts)
         dataSource.apply(snapshot, animatingDifferences: false)
     }
+
+    private func addHeightObservers() {
+        NotificationCenter.default.addObserver(self, selector: #selector(self.updateCollectionViewHeight(notification:)), name: .postCardTableViewSizeChanged, object: nil)
+    }
+
+    @objc private func updateCollectionViewHeight(notification: Notification) {
+        collectionView.collectionViewLayout.invalidateLayout()
+    }
 }
 
 // MARK: - Collection view layout

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Posts/DashboardPostsCardCell.swift

@@ -0,0 +1,12 @@
+import UIKit
+
+class DashboardPostsCardCell: UICollectionViewCell, Reusable {
+    func configure(_ viewController: UIViewController, blog: Blog) {
+        let postsViewController = PostsCardViewController(blog: blog)
+        viewController.addChild(postsViewController)
+        contentView.addSubview(postsViewController.view)
+        postsViewController.view.translatesAutoresizingMaskIntoConstraints = false
+        contentView.pinSubviewToAllEdges(postsViewController.view)
+        postsViewController.didMove(toParent: viewController)
+    }
+}

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Posts/PostsCardViewController.swift

@@ -7,7 +7,7 @@ import UIKit
 @objc class PostsCardViewController: UIViewController {
     var blog: Blog
 
-    let tableView: UITableView = IntrinsicTableView()
+    let tableView: UITableView = PostCardTableView()
 
     private var viewModel: PostsCardViewModel!
     private var ghostableTableView: UITableView?
@@ -125,3 +125,26 @@ extension PostsCardViewController: EditorAnalyticsProperties {
         return properties
     }
 }
+
+// MARK: - PostCardTableView
+
+extension NSNotification.Name {
+    /// Fired when a PostCardTableView changes its size
+    static let postCardTableViewSizeChanged = NSNotification.Name("IntrinsicContentSizeUpdated")
+}
+
+private class PostCardTableView: UITableView {
+    override var contentSize: CGSize {
+        didSet {
+            self.invalidateIntrinsicContentSize()
+        }
+    }
+
+    /// Emits a notification when the intrinsicContentSize changes
+    /// This allows subscribers to update their layouts (ie.: UICollectionViews)
+    override var intrinsicContentSize: CGSize {
+        layoutIfNeeded()
+        NotificationCenter.default.post(name: .postCardTableViewSizeChanged, object: nil)
+        return CGSize(width: UIView.noIntrinsicMetric, height: contentSize.height)
+    }
+}

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Header.swift

@@ -2,11 +2,11 @@ import Gridicons
 import WordPressFlux
 
 extension BlogDetailsViewController {
-    @objc func configureHeaderView() -> BlogDetailHeader {
+    @objc func configureHeaderView() -> BlogDetailHeaderView {
 
         let actionItems = createActionItems()
 
-        return NewBlogDetailHeaderView(items: actionItems)
+        return BlogDetailHeaderView(items: actionItems)
     }
 
     @objc

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.h

@@ -137,7 +137,7 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
 @property (nonatomic, strong) id<ScenePresenter> _Nonnull meScenePresenter;
 @property (nonatomic, strong, readonly) CreateButtonCoordinator * _Nullable createButtonCoordinator;
 @property (nonatomic, strong, readwrite) UITableView * _Nonnull tableView;
-@property (nonatomic, strong, readonly) id<BlogDetailHeader> _Nonnull headerView;
+@property (nonatomic, strong, readonly) BlogDetailHeaderView * _Nonnull headerView;
 @property (nonatomic) BOOL shouldScrollToViewSite;
 
 - (id _Nonnull)initWithMeScenePresenter:(id<ScenePresenter> _Nonnull)meScenePresenter;
@@ -157,4 +157,5 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
 - (void)toggleSpotlightOnHeaderView;
 - (void)uploadDroppedSiteIcon:(nonnull UIImage *)image onCompletion:(nullable void(^)(void))completion;
 - (void)updateTableViewAndHeader;
+- (void)preloadMetadata;
 @end