From 8304b174bfc2f0c8859d60c1e4540dc3268377fa Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 25 Oct 2019 16:27:10 -0500 Subject: [PATCH] Change refresh label to use "Updated" instead of "Refreshed" --- iOS/MasterFeed/RefreshProgressView.swift | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/MasterFeed/RefreshProgressView.swift index a153ada73..683a24bc8 100644 --- a/iOS/MasterFeed/RefreshProgressView.swift +++ b/iOS/MasterFeed/RefreshProgressView.swift @@ -30,16 +30,21 @@ class RefreshProgressView: UIView { } func updateRefreshLabel() { - if let refreshDate = AppDefaults.lastRefresh { - let relativeDateTimeFormatter = RelativeDateTimeFormatter() - relativeDateTimeFormatter.dateTimeStyle = .named - let refreshed = relativeDateTimeFormatter.localizedString(for: refreshDate, relativeTo: Date()) - let localizedRefreshText = NSLocalizedString("Refreshed %@", comment: "Refreshed") - let refreshText = NSString.localizedStringWithFormat(localizedRefreshText as NSString, refreshed) as String - label.text = refreshText + if let lastRefresh = AppDefaults.lastRefresh { + if Date() > lastRefresh.addingTimeInterval(1) { + let relativeDateTimeFormatter = RelativeDateTimeFormatter() + relativeDateTimeFormatter.dateTimeStyle = .named + let refreshed = relativeDateTimeFormatter.localizedString(for: lastRefresh, relativeTo: Date()) + let localizedRefreshText = NSLocalizedString("Updated %@", comment: "Updated") + let refreshText = NSString.localizedStringWithFormat(localizedRefreshText as NSString, refreshed) as String + label.text = refreshText + } else { + label.text = NSLocalizedString("Updated just now", comment: "Updated Just Now") + } } } + @objc func progressDidChange(_ note: Notification) { let progress = AccountManager.shared.combinedRefreshProgress