Merge pull request #15616 from wordpress-mobile/15483-reinstate_unsee…

…n_count_ff Reimplement unseenPostCount feature flag.
wordpress-mobile · Jan 8, 2021 · 414fa64 · 414fa64
2 parents 6cf772d + 3f645f3
commit 414fa64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -8,7 +8,6 @@
 * [*] Invite People: add link to user roles definition web page. [#15530]
 * [***] Block Editor: Cross-post suggestions are now available by typing the + character (or long-pressing the toolbar button labelled with an @-symbol) in a post on a P2 site [#15139]
 * [**] Reader: Following now only shows non-P2 sites. [#15585]
-* [**] Reader site filter: unseen post count is displayed for each site. [#15581]
 * [**] Reader site filter: selected filters now persist while in app.[#15594]
 
 16.4

diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -19,6 +19,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
     case jetpackScan
     case activityLogFilters
     case jetpackBackupAndRestore
+    case unseenPostCount
 
     /// Returns a boolean indicating if the feature is enabled
     var enabled: Bool {
@@ -61,6 +62,8 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
             return BuildConfiguration.current == .localDeveloper
         case .jetpackBackupAndRestore:
             return BuildConfiguration.current == .localDeveloper
+        case .unseenPostCount:
+            return false
         }
     }
 
@@ -123,6 +126,8 @@ extension FeatureFlag {
             return "Jetpack's Activity Log Filters"
         case .jetpackBackupAndRestore:
             return "Jetpack Backup and Restore"
+        case .unseenPostCount:
+            return "Unseen Posts Count in Reader"
         }
     }
 

diff --git a/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift b/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift
@@ -148,7 +148,10 @@ extension ReaderSiteTopic {
                     return TableDataItem(topic: topic, configure: { cell in
                         cell.textLabel?.text = topic.title
                         cell.detailTextLabel?.text = topic.siteURL
-                        addUnseenPostCount(topic, with: cell)
+
+                        if FeatureFlag.unseenPostCount.enabled {
+                            addUnseenPostCount(topic, with: cell)
+                        }
                     })
                 }
             }