renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename WebFeed type to just Feed.

Browse Source
This commit is contained in:
Brent Simmons
2023-07-05 10:02:53 -07:00
parent d5d57a7e30
commit 2f07f4ee16
50 changed files with 393 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iOS/Settings/New Article Notifications/NewArticleNotificationsView.swift
View File

@@ -18,9 +18,9 @@ struct NewArticleNotificationsView: View, Logging {
var body: some View {
List(activeAccounts, id: \.accountID) { account in
Section(header: Text(account.nameForDisplay)) {
ForEach(sortedWebFeedsForAccount(account), id: \.webFeedID) { feed in
ForEach(sortedWebFeedsForAccount(account), id: \.feedID) { feed in
WebFeedToggle(webfeed: feed)
.id(feed.webFeedID)
.id(feed.feedID)
}
}
.navigationTitle(Text("navigation.title.new-article-notifications", comment: "New Article Notifications"))
@@ -44,12 +44,12 @@ struct NewArticleNotificationsView: View, Logging {
}
})
.onReceive(NotificationCenter.default.publisher(for: .WebFeedIconDidBecomeAvailable), perform: { notification in
guard let webFeed = notification.userInfo?[UserInfoKey.webFeed] as? WebFeed else { return }
guard let webFeed = notification.userInfo?[UserInfoKey.webFeed] as? Feed else { return }
webFeed.objectWillChange.send()
})
}
private func sortedWebFeedsForAccount(_ account: Account) -> [WebFeed] {
private func sortedWebFeedsForAccount(_ account: Account) -> [Feed] {
return Array(account.flattenedFeeds()).sorted(by: { $0.nameForDisplay.caseInsensitiveCompare($1.nameForDisplay) == .orderedAscending })
}
@@ -58,7 +58,7 @@ struct NewArticleNotificationsView: View, Logging {
fileprivate struct WebFeedToggle: View {
@ObservedObject var webfeed: WebFeed
@ObservedObject var webfeed: Feed
var body: some View {
Toggle(isOn: Binding(
@@ -67,7 +67,7 @@ fileprivate struct WebFeedToggle: View {
Label {
Text(webfeed.nameForDisplay)
} icon: {
Image(uiImage: IconImageCache.shared.imageFor(webfeed.feedID!)!.image)
Image(uiImage: IconImageCache.shared.imageFor(webfeed.itemID!)!.image)
.resizable()
.frame(width: 25, height: 25)
.cornerRadius(4)