Merge remote-tracking branch 'origin/trunk' into feature/18375-prompts-core-data

Author: dvdchr

Gemfile.lock

@@ -1,3 +1,23 @@
+GIT
+  remote: git@github.com:wordpress-mobile/release-toolkit
+  revision: 329effd14e4176817d28ff5b97f35ea84a19c69e
+  branch: trunk
+  specs:
+    fastlane-plugin-wpmreleasetoolkit (4.1.0)
+      activesupport (~> 5)
+      bigdecimal (~> 1.4)
+      buildkit (~> 1.5)
+      chroma (= 0.2.0)
+      diffy (~> 3.3)
+      git (~> 1.3)
+      jsonlint (~> 0.3)
+      nokogiri (~> 1.11)
+      octokit (~> 4.18)
+      parallel (~> 1.14)
+      progress_bar (~> 1.3)
+      rake (>= 12.3, < 14.0)
+      rake-compiler (~> 1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -163,20 +183,6 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.11.0)
-    fastlane-plugin-wpmreleasetoolkit (4.1.0)
-      activesupport (~> 5)
-      bigdecimal (~> 1.4)
-      buildkit (~> 1.5)
-      chroma (= 0.2.0)
-      diffy (~> 3.3)
-      git (~> 1.3)
-      jsonlint (~> 0.3)
-      nokogiri (~> 1.11)
-      octokit (~> 4.18)
-      parallel (~> 1.14)
-      progress_bar (~> 1.3)
-      rake (>= 12.3, < 14.0)
-      rake-compiler (~> 1.0)
     ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -245,7 +251,7 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
@@ -334,7 +340,7 @@ DEPENDENCIES
   fastlane (~> 2.174)
   fastlane-plugin-appcenter (~> 1.8)
   fastlane-plugin-sentry
-  fastlane-plugin-wpmreleasetoolkit (~> 4.1)
+  fastlane-plugin-wpmreleasetoolkit!
   octokit (~> 4.0)
   rake
   rmagick (~> 3.2.0)

Podfile

@@ -47,7 +47,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.52.0-beta'
+    pod 'WordPressKit', '~> 4.52.0-beta.4'
     # 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

@@ -487,7 +487,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.52.0-beta.3):
+  - WordPressKit (4.52.0-beta.4):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -591,7 +591,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.8)
   - WordPressAuthenticator (~> 2.0.0)
-  - WordPressKit (~> 4.52.0-beta)
+  - WordPressKit (~> 4.52.0-beta.4)
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.1)
   - WordPressUI (~> 1.12.5)
@@ -853,7 +853,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
   WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
-  WordPressKit: 0defd60331a0b66f09e8892179582814cecb9fdc
+  WordPressKit: 450022923efc0108b12ea9ce7a346e51f58bfe15
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -869,6 +869,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: f114ad2ae700db1d36f4ea61c36386723da3e644
+PODFILE CHECKSUM: 24bc8372e70618119eac614105c8ee8d21a93c77
 
 COCOAPODS: 1.11.2

WordPress/Classes/Stores/StatsStore+Cache.swift

@@ -14,6 +14,8 @@ extension StatsStoreCacheable {
 extension StatsInsightsStore: StatsStoreCacheable {
     func containsCachedData(for type: InsightType) -> Bool {
         switch type {
+        case .viewsVisitors:
+            return true
         case .latestPostSummary:
             return state.lastPostInsight != nil
         case .allTimeStats, .growAudience:

WordPress/Classes/Utility/AccountHelper.swift

@@ -84,6 +84,9 @@ import Foundation
 
         service.removeDefaultWordPressComAccount()
 
+        // Delete saved dashboard states
+        BlogDashboardState.resetAllStates()
+
         // Delete local notification on logout
         PushNotificationsManager.shared.deletePendingLocalNotifications()
 
@@ -94,8 +97,6 @@ import Foundation
         StatsDataHelper.clearWidgetsData()
 
         // Delete donated user activities (e.g., for Siri Shortcuts)
-        if #available(iOS 12.0, *) {
-            NSUserActivity.deleteAllSavedUserActivities {}
-        }
+        NSUserActivity.deleteAllSavedUserActivities {}
     }
 }

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -109,6 +109,7 @@ import Foundation
     case statsReaderDiscoverNudgeTapped
     case statsReaderDiscoverNudgeDismissed
     case statsReaderDiscoverNudgeCompleted
+    case statsLineChartTapped
 
     // Stats - Insights
     case statsCustomizeInsightsShown
@@ -541,6 +542,8 @@ import Foundation
             return "stats_reader_discover_nudge_dismissed"
         case .statsReaderDiscoverNudgeCompleted:
             return "stats_reader_discover_nudge_completed"
+        case .statsLineChartTapped:
+            return "stats_line_chart_tapped"
 
         // Stats - Insights
         case .statsCustomizeInsightsShown:

WordPress/Classes/Utility/App Configuration/AppConfiguration.swift

@@ -12,6 +12,7 @@ import Foundation
     @objc static let allowSiteCreation: Bool = true
     @objc static let allowSignUp: Bool = true
     @objc static let allowsCustomAppIcons: Bool = true
+    @objc static let allowsDomainRegistration: Bool = false
     @objc static let showsReader: Bool = true
     @objc static let showsCreateButton: Bool = true
     @objc static let showAddSelfHostedSiteButton: Bool = true

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -64,7 +64,10 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .weeklyRoundupBGProcessingTask:
             return true
         case .domains:
-            return false
+            // Note: when used to control access to the domains feature, you should also check whether
+            // the current AppConfiguration and blog support domains.
+            // See BlogDetailsViewController.shouldShowDomainRegistration for an example.
+            return true
         case .timeZoneSuggester:
             return true
         case .aboutScreen:

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

@@ -56,6 +56,7 @@ class DashboardPostsListCardCell: UICollectionViewCell, Reusable {
 
     override func prepareForReuse() {
         super.prepareForReuse()
+        tableView.dataSource = nil
         viewModel?.stopObserving()
     }
 

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

@@ -8,7 +8,7 @@ protocol PostsCardView: AnyObject {
     func removeIfNeeded()
 }
 
-enum PostsListSection {
+enum PostsListSection: CaseIterable {
     case posts
     case error
     case loading
@@ -40,7 +40,7 @@ class PostsCardViewModel: NSObject {
         didSet {
             if oldValue != currentState {
                 forceReloadSnapshot()
-                trackCardDisaplyedIfNeeded()
+                trackCardDisplayedIfNeeded()
             }
         }
     }
@@ -259,7 +259,7 @@ private extension PostsCardViewModel {
         return false
     }
 
-    func trackCardDisaplyedIfNeeded() {
+    func trackCardDisplayedIfNeeded() {
         switch currentState {
         case .posts:
             BlogDashboardAnalytics.shared.track(.dashboardCardShown, properties: ["type": "post", "sub_type": status.rawValue])
@@ -336,12 +336,12 @@ extension PostsCardViewModel: NSFetchedResultsControllerDelegate {
 
     private func createSnapshot(currentSnapshot: Snapshot, postsSnapshot: PostsSnapshot) -> Snapshot {
         var snapshot = Snapshot()
+        snapshot.appendSections(PostsListSection.allCases)
         switch currentState {
         case .posts:
             var adjustedPostsSnapshot = postsSnapshot
             adjustedPostsSnapshot.deleteItems(adjustedPostsSnapshot.itemIdentifiers.enumerated().filter { $0.offset > fetchedResultsController.fetchRequest.fetchLimit - 1 }.map { $0.element })
             let postItems: [PostsListItem] = adjustedPostsSnapshot.itemIdentifiers.map { .post($0) }
-            snapshot.appendSections([.posts])
             snapshot.appendItems(postItems, toSection: .posts)
 
             let reloadIdentifiers: [PostsListItem] = snapshot.itemIdentifiers.compactMap { item in
@@ -358,21 +358,18 @@ extension PostsCardViewModel: NSFetchedResultsControllerDelegate {
             snapshot.reloadItems(reloadIdentifiers)
 
         case .error:
-            snapshot.appendSections([.error])
             snapshot.appendItems([.error], toSection: .error)
 
         case .loading:
             let items: [PostsListItem] = (0..<Constants.numberOfPosts).map { .ghost($0) }
-            snapshot.appendSections([.loading])
             snapshot.appendItems(items, toSection: .loading)
         }
         return snapshot
     }
 
     private func applySnapshot(_ snapshot: Snapshot, to dataSource: DataSource) {
-        let shouldAnimate = view?.tableView.numberOfSections != 0 && view?.tableView.numberOfRows(inSection: 0) != 0
         dataSource.defaultRowAnimation = .fade
-        dataSource.apply(snapshot, animatingDifferences: shouldAnimate, completion: nil)
+        dataSource.apply(snapshot, animatingDifferences: true, completion: nil)
         view?.tableView.allowsSelection = currentState == .posts
     }
 }