Merge pull request #21602 from wordpress-mobile/fix/split-view-support-2

Fix split view support on large iPhones

Author: kean

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

@@ -248,6 +248,7 @@ extension BlogDashboardViewController {
                                                         trailing: horizontalInset)
 
         section.interGroupSpacing = Constants.cellSpacing
+        section.contentInsetsReference = .readableContent
 
         return section
     }
@@ -322,7 +323,7 @@ extension BlogDashboardViewController {
     private enum Constants {
         static let estimatedWidth: CGFloat = 100
         static let estimatedHeight: CGFloat = 44
-        static let horizontalSectionInset: CGFloat = 20
+        static let horizontalSectionInset: CGFloat = 12
         static let verticalSectionInset: CGFloat = 20
         static var bottomSectionInset: CGFloat {
             // Make room for FAB on iPhone

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Quick Actions/DashboardQuickActionsCardCell.swift

@@ -131,7 +131,7 @@ extension DashboardQuickActionsCardCell: BlogDetailsPresentationDelegate {
     }
 
     func presentBlogDetailsViewController(_ viewController: UIViewController) {
-        self.parentViewController?.showDetailViewController(viewController, sender: nil)
+        self.blogDetailsViewController?.show(viewController, sender: nil)
     }
 }
 

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

@@ -384,6 +384,8 @@ - (void)viewDidLoad
     [self.tableView registerClass:[MigrationSuccessCell class] forCellReuseIdentifier:BlogDetailsMigrationSuccessCellIdentifier];
     [self.tableView registerClass:[JetpackBrandingMenuCardCell class] forCellReuseIdentifier:BlogDetailsJetpackBrandingCardCellIdentifier];
     [self.tableView registerClass:[JetpackRemoteInstallTableViewCell class] forCellReuseIdentifier:BlogDetailsJetpackInstallCardCellIdentifier];
+    
+    self.tableView.cellLayoutMarginsFollowReadableWidth = YES;
 
     self.hasLoggedDomainCreditPromptShownEvent = NO;
 
@@ -409,7 +411,7 @@ - (void)viewWillAppear:(BOOL)animated
 
     [self observeWillEnterForegroundNotification];
 
-    if (self.splitViewControllerIsHorizontallyCompact) {
+    if (!self.isSplitViewDisplayed) {
         self.restorableSelectedIndexPath = nil;
     }
 
@@ -994,7 +996,7 @@ - (void)reloadTableViewPreservingSelection
 
     BOOL isValidIndexPath = self.restorableSelectedIndexPath.section < self.tableView.numberOfSections &&
                             self.restorableSelectedIndexPath.row < [self.tableView numberOfRowsInSection:self.restorableSelectedIndexPath.section];
-    if (isValidIndexPath && ![self splitViewControllerIsHorizontallyCompact]) {
+    if (isValidIndexPath && [self isSplitViewDisplayed]) {
         // And finally we'll reselect the selected row, if there is one
         [self.tableView selectRowAtIndexPath:self.restorableSelectedIndexPath
                                     animated:NO
@@ -1038,7 +1040,7 @@ - (void)configureTableViewData
     if ([self shouldShowQuickStartChecklist]) {
         [marr addNullableObject:[self quickStartSectionViewModel]];
     }
-    if ([self isDashboardEnabled] && ![self splitViewControllerIsHorizontallyCompact]) {
+    if ([self isDashboardEnabled] && [self isSplitViewDisplayed]) {
         [marr addNullableObject:[self homeSectionViewModel]];
     }
 
@@ -1077,6 +1079,10 @@ - (void)configureTableViewData
     self.tableSections = [NSArray arrayWithArray:marr];
 }
 
+- (Boolean)isSplitViewDisplayed {
+    return ![self splitViewControllerIsHorizontallyCompact] && [MySitesCoordinator isSplitViewEnabled];
+}
+
 /// This section is available on Jetpack only.
 - (BlogDetailsSection *)contentSectionViewModel
 {
@@ -1511,7 +1517,7 @@ - (void)switchToBlog:(Blog*)blog
 
 - (void)showInitialDetailsForBlog
 {
-    if ([self splitViewControllerIsHorizontallyCompact]) {
+    if (![self isSplitViewDisplayed]) {
         return;
     }
 
@@ -1617,7 +1623,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         [WPStyleGuide configureTableViewDestructiveActionCell:cell];
     } else {
         if (row.showsDisclosureIndicator) {
-            cell.accessoryType = [self splitViewControllerIsHorizontallyCompact] ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone;
+            cell.accessoryType = [self isSplitViewDisplayed] ? UITableViewCellAccessoryNone : UITableViewCellAccessoryDisclosureIndicator;
         } else {
             cell.accessoryType = UITableViewCellAccessoryNone;
         }
@@ -1654,7 +1660,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     if (row.showsSelectionState) {
         self.restorableSelectedIndexPath = indexPath;
     } else {
-        if ([self splitViewControllerIsHorizontallyCompact]) {
+        if (![self isSplitViewDisplayed]) {
             // Deselect current row when not in split view layout
             [tableView deselectRowAtIndexPath:indexPath animated:YES];
         } else {

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -31,7 +31,7 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
     private func getSection(for blog: Blog) -> Section {
         if JetpackFeaturesRemovalCoordinator.jetpackFeaturesEnabled() &&
             blog.isAccessibleThroughWPCom() &&
-            splitViewControllerIsHorizontallyCompact {
+            (splitViewControllerIsHorizontallyCompact || !MySitesCoordinator.isSplitViewEnabled) {
             return .dashboard
         } else {
             return .siteMenu
@@ -893,11 +893,15 @@ extension MySiteViewController: BlogDetailsPresentationDelegate {
     }
 
     func presentBlogDetailsViewController(_ viewController: UIViewController) {
-        switch currentSection {
-        case .dashboard:
-            blogDashboardViewController?.showDetailViewController(viewController, sender: blogDashboardViewController)
-        case .siteMenu:
-            blogDetailsViewController?.showDetailViewController(viewController, sender: blogDetailsViewController)
+        if MySitesCoordinator.isSplitViewEnabled {
+            switch currentSection {
+            case .dashboard:
+                blogDashboardViewController?.showDetailViewController(viewController, sender: blogDashboardViewController)
+            case .siteMenu:
+                blogDetailsViewController?.showDetailViewController(viewController, sender: blogDetailsViewController)
+            }
+        } else {
+            blogDetailsViewController?.show(viewController, sender: nil)
         }
     }
 }

WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift

@@ -36,7 +36,17 @@ class MySitesCoordinator: NSObject {
     ///
     @objc
     var rootViewController: UIViewController {
-        return splitViewController
+        if MySitesCoordinator.isSplitViewEnabled {
+            return splitViewController
+        } else {
+            // `hidesBottomBarWhenPushed` doesn't work with `UISplitViewController`,
+            // so it we have to use `UINavigationController` directly.
+            return navigationController
+        }
+    }
+
+    @objc class var isSplitViewEnabled: Bool {
+        UIDevice.current.userInterfaceIdiom == .pad
     }
 
     @objc
@@ -65,6 +75,7 @@ class MySitesCoordinator: NSObject {
         navigationController.tabBarItem.accessibilityLabel = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.")
         navigationController.tabBarItem.accessibilityIdentifier = "mySitesTabButton"
         navigationController.tabBarItem.title = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.")
+        navigationController.extendedLayoutIncludesOpaqueBars = true
 
         return navigationController
     }()