From 1f0f3e3596a5d5017c22d7f9fe87adc029f4c338 Mon Sep 17 00:00:00 2001 From: mfvarani Date: Fri, 24 May 2024 16:21:24 -0300 Subject: [PATCH 1/4] Add expiration date early return for Image Recommendation announcement --- Wikipedia/Code/ExploreViewController.swift | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Wikipedia/Code/ExploreViewController.swift b/Wikipedia/Code/ExploreViewController.swift index 8e334f1915..529f49040b 100644 --- a/Wikipedia/Code/ExploreViewController.swift +++ b/Wikipedia/Code/ExploreViewController.swift @@ -866,8 +866,13 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo var addArticlesToReadingListVCDidDisappear: (() -> Void)? = nil + // TODO: - Remove after expiry date (5 Aug, 2024) private func presentImageRecommendationsFeatureAnnouncementIfNeeded() { + guard ImageRecommendationsFeatureAnnouncementExpiration.isAnnouncementActive() else { + return + } + guard let fetchedResultsController, let groups = fetchedResultsController.fetchedObjects else { return @@ -919,6 +924,26 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo } } +// MARK: - Image Recommendations Announcement expiration +// TODO: - Remove after expiry date (5 Aug, 2024) +struct ImageRecommendationsFeatureAnnouncementExpiration { + static let expiryDate: Date? = { + var expiryDateComponents = DateComponents() + expiryDateComponents.year = 2024 + expiryDateComponents.month = 8 + expiryDateComponents.day = 5 + return Calendar.current.date(from: expiryDateComponents) + }() + + static func isAnnouncementActive() -> Bool { + guard let expiryDate else { + return false + } + let currentDate = Date() + return currentDate <= expiryDate + } +} + // MARK: - Analytics extension ExploreViewController { private func logArticleSavedStateChange(_ wasArticleSaved: Bool, saveButton: SaveButton?, article: WMFArticle, userInfo: Any?) { From 03d4ec82a6d4d1474350cdee277fdc768cc02a9f Mon Sep 17 00:00:00 2001 From: mfvarani Date: Fri, 24 May 2024 16:22:28 -0300 Subject: [PATCH 2/4] Add Marcos Varani to contributor's list --- Wikipedia/Code/AboutViewController.plist | 1 + 1 file changed, 1 insertion(+) diff --git a/Wikipedia/Code/AboutViewController.plist b/Wikipedia/Code/AboutViewController.plist index 068cb413e4..0cd33a9e0f 100644 --- a/Wikipedia/Code/AboutViewController.plist +++ b/Wikipedia/Code/AboutViewController.plist @@ -81,6 +81,7 @@ Logan Keller Luiggi Minaya Salcedo MagikCow + Marcos Varani Maryana Pinchuk Marina Azevedo Matt Cleinman From 92a1ea8ae691026e57a9c710bae391866904ae98 Mon Sep 17 00:00:00 2001 From: mfvarani Date: Fri, 24 May 2024 16:38:06 -0300 Subject: [PATCH 3/4] Improved struct naming --- Wikipedia/Code/ExploreViewController.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Wikipedia/Code/ExploreViewController.swift b/Wikipedia/Code/ExploreViewController.swift index 529f49040b..e8db38ab0e 100644 --- a/Wikipedia/Code/ExploreViewController.swift +++ b/Wikipedia/Code/ExploreViewController.swift @@ -869,7 +869,7 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo // TODO: - Remove after expiry date (5 Aug, 2024) private func presentImageRecommendationsFeatureAnnouncementIfNeeded() { - guard ImageRecommendationsFeatureAnnouncementExpiration.isAnnouncementActive() else { + guard ImageRecommendationsFeatureAnnouncementTimeBox.isAnnouncementActive() else { return } @@ -924,9 +924,9 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo } } -// MARK: - Image Recommendations Announcement expiration +// MARK: - Image Recommendations Announcement Time-box // TODO: - Remove after expiry date (5 Aug, 2024) -struct ImageRecommendationsFeatureAnnouncementExpiration { +struct ImageRecommendationsFeatureAnnouncementTimeBox { static let expiryDate: Date? = { var expiryDateComponents = DateComponents() expiryDateComponents.year = 2024 From d46611ef266ed59294ebd59512440c7f842d110a Mon Sep 17 00:00:00 2001 From: marcos <34898507+mfvarani@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:44:06 -0300 Subject: [PATCH 4/4] Update expiry date --- Wikipedia/Code/ExploreViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Wikipedia/Code/ExploreViewController.swift b/Wikipedia/Code/ExploreViewController.swift index e8db38ab0e..6546f93bef 100644 --- a/Wikipedia/Code/ExploreViewController.swift +++ b/Wikipedia/Code/ExploreViewController.swift @@ -866,7 +866,7 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo var addArticlesToReadingListVCDidDisappear: (() -> Void)? = nil - // TODO: - Remove after expiry date (5 Aug, 2024) + // TODO: - Remove after expiry date (4 Oct, 2024) private func presentImageRecommendationsFeatureAnnouncementIfNeeded() { guard ImageRecommendationsFeatureAnnouncementTimeBox.isAnnouncementActive() else { @@ -925,13 +925,13 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo } // MARK: - Image Recommendations Announcement Time-box -// TODO: - Remove after expiry date (5 Aug, 2024) +// TODO: - Remove after expiry date (4 Oct, 2024) struct ImageRecommendationsFeatureAnnouncementTimeBox { static let expiryDate: Date? = { var expiryDateComponents = DateComponents() expiryDateComponents.year = 2024 - expiryDateComponents.month = 8 - expiryDateComponents.day = 5 + expiryDateComponents.month = 10 + expiryDateComponents.day = 4 return Calendar.current.date(from: expiryDateComponents) }()