Skip to content

Commit

Permalink
Update tags feature flag to be a remote flag
Browse files Browse the repository at this point in the history
  • Loading branch information
wargcm committed May 21, 2024
1 parent f46c4d9 commit eeac7c3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
5 changes: 0 additions & 5 deletions WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ enum FeatureFlag: Int, CaseIterable {
case compliancePopover
case googleDomainsCard
case newTabIcons
case readerTagsFeed
case syncPublishing
case autoSaveDrafts

Expand Down Expand Up @@ -40,8 +39,6 @@ enum FeatureFlag: Int, CaseIterable {
return false
case .newTabIcons:
return true
case .readerTagsFeed:
return false
case .syncPublishing:
return true
case .autoSaveDrafts:
Expand Down Expand Up @@ -86,8 +83,6 @@ extension FeatureFlag {
return "Google Domains Promotional Card"
case .newTabIcons:
return "New Tab Icons"
case .readerTagsFeed:
return "Reader Tags Feed"
case .syncPublishing:
return "Synchronous Publishing"
case .autoSaveDrafts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ enum RemoteFeatureFlag: Int, CaseIterable {
case readingPreferencesFeedback
case readerAnnouncementCard
case inAppUpdates
case readerTagsFeed

var defaultValue: Bool {
switch self {
Expand Down Expand Up @@ -98,6 +99,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest]
case .inAppUpdates:
return false
case .readerTagsFeed:
return false
}
}

Expand Down Expand Up @@ -166,6 +169,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
return "reader_announcement_card"
case .inAppUpdates:
return "in_app_updates"
case .readerTagsFeed:
return "reader_tags_feed"
}
}

Expand Down Expand Up @@ -233,6 +238,8 @@ enum RemoteFeatureFlag: Int, CaseIterable {
return "Reader Announcement Card"
case .inAppUpdates:
return "In-App Updates"
case .readerTagsFeed:
return "Reader Tags Feed"
}
}

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Reader/ReaderHelpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ extension ReaderHelpers {
let savedPosition = min(mutableItems.count, defaultSavedItemPosition)
mutableItems.insert(ReaderTabItem(ReaderContent(topic: nil, contentType: .saved)), at: savedPosition)

if FeatureFlag.readerTagsFeed.enabled {
if RemoteFeatureFlag.readerTagsFeed.enabled() {
mutableItems.append(ReaderTabItem(ReaderContent(topic: nil, contentType: .tags)))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct ReaderNavigationButton: View {
menuButton(for: item)
}
if group == menuItemGroups.last && viewModel.listItems.count > 0 {
if !FeatureFlag.readerTagsFeed.enabled {
if !RemoteFeatureFlag.readerTagsFeed.enabled() {
Divider()
}
listMenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct ReaderTabItem: FilterTabBarItem, Hashable {
&& content.type != .selfHostedFollowing
&& content.type != .tags
shouldHideSettingsButton = content.type == .selfHostedFollowing
shouldHideTagFilter = content.topicType == .organization || (content.type != .tags && FeatureFlag.readerTagsFeed.enabled)
shouldHideTagFilter = content.topicType == .organization || (content.type != .tags && RemoteFeatureFlag.readerTagsFeed.enabled())
shouldHideBlogFilter = content.type == .tags
}

Expand Down

0 comments on commit eeac7c3

Please sign in to comment.