Merge changes from 19.2.0.1 beta release (#17918)

Author: mokagio

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

@@ -33,7 +33,15 @@ extension BlogDetailsViewController {
     private func presentDomainCreditRedemptionSuccess(domain: String) {
         let controller = DomainCreditRedemptionSuccessViewController(domain: domain, delegate: self)
         present(controller, animated: true) { [weak self] in
-            self?.updateTableViewAndHeader()
+            self?.updateTableView {
+                guard
+                    let parent = self?.parent as? MySiteViewController,
+                    let blog = self?.blog
+                else {
+                    return
+                }
+                parent.sitePickerViewController?.blogDetailHeaderView.blog = blog
+            }
         }
     }
 }

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

@@ -1,6 +1,7 @@
 import UIKit
 
 extension BlogDetailsViewController {
+
     @objc func quickActionsSectionViewModel() -> BlogDetailsSection {
         let row = BlogDetailsRow()
         row.callback = {}
@@ -13,6 +14,35 @@ extension BlogDetailsViewController {
     @objc func isAccessibilityCategoryEnabled() -> Bool {
         tableView.traitCollection.preferredContentSizeCategory.isAccessibilityCategory
     }
+
+    @objc func configureQuickActions(cell: QuickActionsCell) {
+        let actionItems = createActionItems()
+
+        cell.configure(with: actionItems)
+    }
+
+    private func createActionItems() -> [ActionRow.Item] {
+        let actionItems: [ActionRow.Item] = [
+            .init(image: .gridicon(.statsAlt), title: NSLocalizedString("Stats", comment: "Noun. Abbv. of Statistics. Links to a blog's Stats screen.")) { [weak self] in
+                self?.tableView.deselectSelectedRowWithAnimation(false)
+                self?.showStats(from: .button)
+            },
+            .init(image: .gridicon(.posts), title: NSLocalizedString("Posts", comment: "Noun. Title. Links to the blog's Posts screen.")) { [weak self] in
+                self?.tableView.deselectSelectedRowWithAnimation(false)
+                self?.showPostList(from: .button)
+            },
+            .init(image: .gridicon(.image), title: NSLocalizedString("Media", comment: "Noun. Title. Links to the blog's Media library.")) { [weak self] in
+                self?.tableView.deselectSelectedRowWithAnimation(false)
+                self?.showMediaLibrary(from: .button)
+            },
+            .init(image: .gridicon(.pages), title: NSLocalizedString("Pages", comment: "Noun. Title. Links to the blog's Pages screen.")) { [weak self] in
+                self?.tableView.deselectSelectedRowWithAnimation(false)
+                self?.showPageList(from: .button)
+            }
+        ]
+
+        return actionItems
+    }
 }
 
 @objc class QuickActionsCell: UITableViewCell {

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

@@ -139,7 +139,6 @@ 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) BlogDetailHeaderView * _Nonnull headerView;
 @property (nonatomic) BOOL shouldScrollToViewSite;
 
 - (id _Nonnull)initWithMeScenePresenter:(id<ScenePresenter> _Nonnull)meScenePresenter;
@@ -154,11 +153,7 @@ typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {
 - (void)showPageListFromSource:(BlogDetailsNavigationSource)source;
 - (void)showMediaLibraryFromSource:(BlogDetailsNavigationSource)source;
 - (void)showStatsFromSource:(BlogDetailsNavigationSource)source;
-- (void)refreshSiteIcon;
-- (void)toggleSpotlightForSiteTitle;
-- (void)toggleSpotlightOnHeaderView;
-- (void)uploadDroppedSiteIcon:(nonnull UIImage *)image onCompletion:(nullable void(^)(void))completion;
-- (void)updateTableViewAndHeader;
+- (void)updateTableView:(nullable void(^)(void))completion;
 - (void)preloadMetadata;
 - (void)pulledToRefreshWith:(nonnull UIRefreshControl *)refreshControl  onCompletion:(nullable void(^)(void))completion;
 @end

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

@@ -211,9 +211,8 @@ - (instancetype)initWithTitle:(NSString *)title
 
 #pragma mark -
 
-@interface BlogDetailsViewController () <UIActionSheetDelegate, UIAlertViewDelegate, WPSplitViewControllerDetailProvider, BlogDetailHeaderViewDelegate, UITableViewDelegate, UITableViewDataSource>
+@interface BlogDetailsViewController () <UIActionSheetDelegate, UIAlertViewDelegate, WPSplitViewControllerDetailProvider, UITableViewDelegate, UITableViewDataSource>
 
-@property (nonatomic, strong, readwrite) BlogDetailHeaderView *headerView;
 @property (nonatomic, strong) NSArray *headerViewHorizontalConstraints;
 @property (nonatomic, strong) NSArray<BlogDetailsSection *> *tableSections;
 @property (nonatomic, strong) BlogService *blogService;
@@ -407,8 +406,6 @@ - (void)viewWillAppear:(BOOL)animated
 
     self.navigationItem.title = NSLocalizedString(@"My Site", @"Title of My Site tab");
 
-    [self.headerView setBlog:self.blog];
-
     // Configure and reload table data when appearing to ensure pending comment count is updated
     [self configureTableViewData];
 
@@ -744,8 +741,10 @@ - (UITableViewScrollPosition)optimumScrollPositionForIndexPath:(NSIndexPath *)in
 - (void)configureTableViewData
 {
     NSMutableArray *marr = [NSMutableArray array];
-
-    [marr addObject:[self quickActionsSectionViewModel]];
+    
+    if (AppConfiguration.showsQuickActions) {
+        [marr addObject:[self quickActionsSectionViewModel]];
+    }
     if ([DomainCreditEligibilityChecker canRedeemDomainCreditWithBlog:self.blog]) {
         if (!self.hasLoggedDomainCreditPromptShownEvent) {
             [WPAnalytics track:WPAnalyticsStatDomainCreditPromptShown];
@@ -1077,7 +1076,6 @@ - (BOOL)shouldDisplayLinkToWPAdmin
 
 - (void)switchToBlog:(Blog*)blog
 {
-    self.headerView.blog = blog;
     self.blog = blog;
     [self showInitialDetailsForBlog];
     [self.tableView reloadData];
@@ -1713,21 +1711,20 @@ - (UIPresentationController *)presentationControllerForPresentedViewController:(
 
 - (void)updateTableViewAndHeader
 {
-    [self updateTableViewAndHeader:^{}];
+    [self updateTableView:^{}];
 }
 
-/// This method syncs the blog and its metadata, then reloads the table view and updates the header with the synced blog.
+/// This method syncs the blog and its metadata, then reloads the table view.
 ///
-- (void)updateTableViewAndHeader:(void(^)(void))onComplete
+- (void)updateTableView:(void(^)(void))completion
 {
     __weak __typeof(self) weakSelf = self;
     [self.blogService syncBlogAndAllMetadata:self.blog
                            completionHandler:
      ^{
         [weakSelf configureTableViewData];
         [weakSelf reloadTableViewPreservingSelection];
-        [weakSelf.headerView setBlog:weakSelf.blog];
-        onComplete();
+        completion();
     }];
 }
 
@@ -1738,7 +1735,7 @@ - (void)pulledToRefresh {
 
 - (void)pulledToRefreshWith:(UIRefreshControl *)refreshControl onCompletion:( void(^)(void))completion {
 
-    [self updateTableViewAndHeader: ^{
+    [self updateTableView: ^{
         // WORKAROUND: if we don't dispatch this asynchronously, the refresh end animation is clunky.
         // To recognize if we can remove this, simply remove the dispatch_async call and test pulling
         // down to refresh the site.