FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

widget and unread badge counts are correct 

also - counts in the widget revert back to using data available in the SmartFeedsController.
This commit is contained in:
Stuart Breckenridge 2021-03-26 11:36:20 +08:00
parent 3c2c17df0d
commit 1ca0df67a4
No known key found for this signature in database
GPG Key ID: ED2F112EEA9EF8A5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shared/Widget/WidgetDataEncoder.swift
View File

@ -49,7 +49,6 @@ public final class WidgetDataEncoder {
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished?.description ?? "") pubDate: article.datePublished?.description ?? "")
unread.append(latestArticle) unread.append(latestArticle)
if unread.count == 7 { break }
} }
for article in starredArticles { for article in starredArticles {
@ -60,7 +59,6 @@ public final class WidgetDataEncoder {
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished?.description ?? "") pubDate: article.datePublished?.description ?? "")
starred.append(latestArticle) starred.append(latestArticle)
if starred.count == 7 { break }
} }
for article in todayArticles { for article in todayArticles {
@ -71,12 +69,11 @@ public final class WidgetDataEncoder {
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished?.description ?? "") pubDate: article.datePublished?.description ?? "")
today.append(latestArticle) today.append(latestArticle)
if today.count == 7 { break }
} }
let latestData = WidgetData(currentUnreadCount: try! AccountManager.shared.fetchArticles(.unread()).count, let latestData = WidgetData(currentUnreadCount: SmartFeedsController.shared.unreadFeed.unreadCount,
currentTodayCount: try! AccountManager.shared.fetchArticles(.today()).count, currentTodayCount: SmartFeedsController.shared.todayFeed.unreadCount,
currentStarredCount: try! AccountManager.shared.fetchArticles(.starred()).count, currentStarredCount: try! SmartFeedsController.shared.starredFeed.fetchArticles().count,
unreadArticles: unread, unreadArticles: unread,
starredArticles: starred, starredArticles: starred,
todayArticles:today, todayArticles:today,