From 2de76222634e162b79c37fbbef2b30f4d25351ab Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 8 Jan 2021 14:50:49 -0700 Subject: [PATCH 1/2] Reimplement unseenPostCount feature flag. --- WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift | 5 +++++ .../Classes/ViewRelated/Reader/Filter/FilterProvider.swift | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift index c095c24b4c44..49823debade7 100644 --- 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 index 119530fdfae2..147747ef80fd 100644 --- 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) + } }) } } From 3f645f335435741b43a86369275ed3c4eeb64150 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 8 Jan 2021 14:53:32 -0700 Subject: [PATCH 2/2] Remove release note. --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 8e326ad769e4..d6189f09caac 100644 --- 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