Post list revamp

Podfile

@@ -13,13 +13,13 @@ plugin 'cocoapods-repo-update'
 ##
 def wordpress_shared
     ## for production:
-    pod 'WordPressShared', '~> 1.8.4'
+    # pod 'WordPressShared', '~> 1.8.4'
 
     ## for development:
     # pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
 
     ## while PR is in review:
-    # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'add/app-icon-analytics'
+    pod 'WordPressShared', :git => 'https://github.com/leandroalonso/WordPress-iOS-Shared.git', :branch => 'feature/wpios11646_post_list_toggle_events'
     # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit	=> ''
 end
 
@@ -36,10 +36,11 @@ end
 def wordpress_ui
     ## for production:
     pod 'WordPressUI', '~> 1.3.4'
+
     ## for development:
     ## pod 'WordPressUI', :path => '../WordPressUI-iOS'
     ## while PR is in review:
-    ## pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :commit => 'edd2908'
+    ## pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => 'change_layout_margins_uiview_helper'
 end
 
 def wordpress_kit
@@ -56,7 +57,7 @@ def shared_with_all_pods
     pod 'NSObject-SafeExpectations', '0.0.3'
 end
 
-def shared_with_networking_pods    
+def shared_with_networking_pods
     pod 'Alamofire', '4.7.3'
     pod 'Reachability', '3.2'
 
@@ -249,7 +250,7 @@ end
 ##
 target 'WordPressTodayWidget' do
     project 'WordPress/WordPress.xcodeproj'
-  
+
     shared_with_all_pods
     shared_with_networking_pods
 end

Podfile.lock

@@ -257,7 +257,7 @@ DEPENDENCIES:
   - WordPressAuthenticator (~> 1.6.0)
   - WordPressKit (~> 4.2.0)
   - WordPressMocks (~> 0.0.5)
-  - WordPressShared (~> 1.8.4)
+  - WordPressShared (from `https://github.com/leandroalonso/WordPress-iOS-Shared.git`, branch `feature/wpios11646_post_list_toggle_events`)
   - WordPressUI (~> 1.3.4)
   - WPMediaPicker (~> 1.4.2)
   - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.8.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`)
@@ -303,7 +303,6 @@ SPEC REPOS:
     - WordPressAuthenticator
     - WordPressKit
     - WordPressMocks
-    - WordPressShared
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -334,6 +333,9 @@ EXTERNAL SOURCES:
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
     :tag: v1.8.0
+  WordPressShared:
+    :branch: feature/wpios11646_post_list_toggle_events
+    :git: https://github.com/leandroalonso/WordPress-iOS-Shared.git
   yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.8.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json
 
@@ -353,6 +355,9 @@ CHECKOUT OPTIONS:
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
     :tag: v1.8.0
+  WordPressShared:
+    :commit: f5c10cda240dac3ec86526b1646ab8c2031adcdc
+    :git: https://github.com/leandroalonso/WordPress-iOS-Shared.git
 
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
@@ -409,6 +414,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: cbd49d65efb2f2cdbdcaac84e618896ae87b861e
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 9500c157b4a0ffc32da7461e3a21e5c43271e50e
+PODFILE CHECKSUM: 2a0ffdd371186f29bd5e0964e26a4f97e6d77dec
 
 COCOAPODS: 1.6.1

WordPress/Classes/Models/AbstractPost.m

@@ -41,7 +41,7 @@ + (NSString *)titleForStatus:(NSString *)status
         return NSLocalizedString(@"Pending review", @"Name for the status of a post pending review.");
 
     } else if ([status isEqualToString:PostStatusPrivate]) {
-        return NSLocalizedString(@"Privately published", @"Name for the status of a post that is marked private.");
+        return NSLocalizedString(@"Private", @"Name for the status of a post that is marked private.");
 
     } else if ([status isEqualToString:PostStatusPublish]) {
         return NSLocalizedString(@"Published", @"Name for the status of a published post.");
@@ -507,9 +507,7 @@ - (NSString *)contentPreviewForDisplay
 - (NSString *)dateStringForDisplay
 {
     if ([self isDraft] || [self.status isEqualToString:PostStatusPending]) {
-        NSString *shortDate = [[self dateModified] mediumString];
-        NSString *lastModified = NSLocalizedString(@"last-modified",@"A label for a post's last-modified date.");
-        return [NSString stringWithFormat:@"%@ (%@)", shortDate, lastModified];
+        return [[self dateModified] mediumString];
     } else if ([self isScheduled]) {
         return [[self dateCreated] mediumStringWithTime];
     } else if ([self shouldPublishImmediately]) {

WordPress/Classes/Models/Post.swift

@@ -277,14 +277,16 @@ class Post: AbstractPost {
     override func statusForDisplay() -> String? {
         var statusString: String?
 
-        if status != .publish && status != .draft {
+        if status == .trash || status == .scheduled {
+            statusString = ""
+        } else if status != .publish && status != .draft {
             statusString = statusTitle as String?
         }
 
         if isRevision() {
             let localOnly = NSLocalizedString("Local", comment: "A status label for a post that only exists on the user's iOS device, and has not yet been published to their blog.")
 
-            if let tempStatusString = statusString {
+            if let tempStatusString = statusString, !tempStatusString.isEmpty {
                 statusString = String(format: "%@, %@", tempStatusString, localOnly)
             } else {
                 statusString = localOnly

WordPress/Classes/System/WordPress-Bridging-Header.h

@@ -31,9 +31,6 @@
 
 #import "HockeyManager.h"
 
-#import "InteractivePostView.h"
-#import "InteractivePostViewDelegate.h"
-
 #import "LocalCoreDataService.h"
 
 #import "Media.h"
@@ -49,7 +46,6 @@
 #import "PageListTableViewCell.h"
 #import "PageSettingsViewController.h"
 #import "PostContentProvider.h"
-#import "PostCardTableViewCell.h"
 #import "PostCategory.h"
 #import "PostContentProvider.h"
 #import "PostListFooterView.h"
@@ -109,7 +105,7 @@
 #import "WPGUIConstants.h"
 #import "WPImageViewController.h"
 #import "WPScrollableViewController.h"
-#import "WPStyleGuide+Posts.h"
+#import "WPStyleGuide+Pages.h"
 #import "WPStyleGuide+ReadableMargins.h"
 #import "WPStyleGuide+WebView.h"
 #import "WPTableImageSource.h"

WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m

@@ -1181,6 +1181,9 @@ + (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat
             eventName = @"post_list_button_pressed";
             eventProperties = @{ TracksEventPropertyButtonKey : @"view" };
             break;
+        case WPAnalyticsStatPostListToggleButtonPressed:
+            eventName = @"post_list_toggle_button_pressed";
+            break;
         case WPAnalyticsStatPostRevisionsListViewed:
             eventName = @"revisions_list_viewed";
             break;

WordPress/Classes/Utility/WPContentSyncHelper.swift

@@ -5,6 +5,7 @@ import CocoaLumberjack
 @objc protocol WPContentSyncHelperDelegate: NSObjectProtocol {
     func syncHelper(_ syncHelper: WPContentSyncHelper, syncContentWithUserInteraction userInteraction: Bool, success: ((_ hasMore: Bool) -> Void)?, failure: ((_ error: NSError) -> Void)?)
     func syncHelper(_ syncHelper: WPContentSyncHelper, syncMoreWithSuccess success: ((_ hasMore: Bool) -> Void)?, failure: ((_ error: NSError) -> Void)?)
+    @objc optional func syncContentStart(_ syncHelper: WPContentSyncHelper)
     @objc optional func syncContentEnded(_ syncHelper: WPContentSyncHelper)
     @objc optional func syncContentFailed(_ syncHelper: WPContentSyncHelper)
     @objc optional func hasNoMoreContent(_ syncHelper: WPContentSyncHelper)
@@ -14,7 +15,13 @@ import CocoaLumberjack
 class WPContentSyncHelper: NSObject {
 
     @objc weak var delegate: WPContentSyncHelperDelegate?
-    @objc var isSyncing: Bool = false
+    @objc var isSyncing: Bool = false {
+        didSet {
+            if isSyncing {
+                delegate?.syncContentStart?(self)
+            }
+        }
+    }
     @objc var isLoadingMore: Bool = false
     @objc var hasMoreContent: Bool = true {
         didSet {

WordPress/Classes/ViewRelated/Pages/PageListSectionHeaderView.m

@@ -1,5 +1,5 @@
 #import "PageListSectionHeaderView.h"
-#import "WPStyleGuide+Posts.h"
+#import "WPStyleGuide+Pages.h"
 #import <WordPressShared/WPDeviceIdentification.h>
 
 @interface PageListSectionHeaderView()

WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m

@@ -1,5 +1,5 @@
 #import "PageListTableViewCell.h"
-#import "WPStyleGuide+Posts.h"
+#import "WPStyleGuide+Pages.h"
 #import "WordPress-Swift.h"
 
 @import Gridicons;

WordPress/Classes/ViewRelated/Pages/PageListViewController.swift

@@ -345,17 +345,17 @@ class PageListViewController: AbstractPostListViewController, UIViewControllerRe
         return Constant.Size.pageCellWithTagEstimatedRowHeight
     }
 
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView! {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         guard _tableViewHandler.groupResults else {
             return UIView(frame: .zero)
         }
 
         let sectionInfo = _tableViewHandler.resultsController.sections?[section]
         let nibName = String(describing: PageListSectionHeaderView.self)
-        let headerView = Bundle.main.loadNibNamed(nibName, owner: nil, options: nil)![0] as! PageListSectionHeaderView
+        let headerView = Bundle.main.loadNibNamed(nibName, owner: nil, options: nil)?.first as? PageListSectionHeaderView
 
-        if let sectionInfo = sectionInfo {
-            headerView.setTitle(sectionInfo.name)
+        if let sectionInfo = sectionInfo, let headerView = headerView {
+            headerView.setTitle(PostSearchHeader.title(forStatus: sectionInfo.name))
         }
 
         return headerView

WordPress/Classes/ViewRelated/Pages/RestorePageTableViewCell.m

@@ -1,5 +1,5 @@
 #import "RestorePageTableViewCell.h"
-#import "WPStyleGuide+Posts.h"
+#import "WPStyleGuide+Pages.h"
 
 @interface RestorePageTableViewCell()