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

Update for changes in Beta 3 of Xcode 12

This commit is contained in:
Maurice Parker 2020-07-22 17:55:15 -05:00
parent 48c721a468
commit f9cd15970f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiplatform/Shared/Sidebar/SidebarModel.swift
View File

@ -147,7 +147,7 @@ private extension SidebarModel {
$selectedFeedIdentifiers.map { [weak self] feedIDs in $selectedFeedIdentifiers.map { [weak self] feedIDs in
feedIDs.compactMap { self?.findFeed($0) } feedIDs.compactMap { self?.findFeed($0) }
} }
.assign(to: $selectedFeeds) .assign(to: &$selectedFeeds)
$selectedFeedIdentifier.compactMap { [weak self] feedID in $selectedFeedIdentifier.compactMap { [weak self] feedID in
if let feedID = feedID, let feed = self?.findFeed(feedID) { if let feedID = feedID, let feed = self?.findFeed(feedID) {
@ -156,7 +156,7 @@ private extension SidebarModel {
return nil return nil
} }
} }
.assign(to: $selectedFeeds) .assign(to: &$selectedFeeds)
} }
func subscribeToRebuildSidebarItemsEvents() { func subscribeToRebuildSidebarItemsEvents() {

6
Multiplatform/Shared/Timeline/TimelineModel.swift
View File

@ -147,7 +147,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner {
$selectedArticleIDs.map { [weak self] articleIDs in $selectedArticleIDs.map { [weak self] articleIDs in
return articleIDs.compactMap { self?.idToArticleDictionary[$0] } return articleIDs.compactMap { self?.idToArticleDictionary[$0] }
} }
.assign(to: $selectedArticles) .assign(to: &$selectedArticles)
$selectedArticleID.compactMap { [weak self] articleID in $selectedArticleID.compactMap { [weak self] articleID in
if let articleID = articleID, let article = self?.idToArticleDictionary[articleID] { if let articleID = articleID, let article = self?.idToArticleDictionary[articleID] {
@ -156,7 +156,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner {
return nil return nil
} }
} }
.assign(to: $selectedArticles) .assign(to: &$selectedArticles)
// Assign the selected timeline items // Assign the selected timeline items
$selectedArticles.compactMap { [weak self] selectedArticles in $selectedArticles.compactMap { [weak self] selectedArticles in
@ -166,7 +166,7 @@ class TimelineModel: ObservableObject, UndoableCommandRunner {
} }
return nil return nil
} }
}.assign(to: $selectedTimelineItems) }.assign(to: &$selectedTimelineItems)
// Automatically mark a selected record as read // Automatically mark a selected record as read
$selectedArticles $selectedArticles