diff --git a/Account/Sources/Account/Account.swift b/Account/Sources/Account/Account.swift index a69121385..b3f7ccad8 100644 --- a/Account/Sources/Account/Account.swift +++ b/Account/Sources/Account/Account.swift @@ -635,6 +635,10 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, delegate.restoreFolder(for: self, folder: folder, completion: completion) } + public func mark(articles: Set
, statusKey: ArticleStatus.Key, flag: Bool, completion: @escaping (Result) -> Void) { + delegate.markArticles(for: self, articles: articles, statusKey: statusKey, flag: flag, completion: completion) + } + func clearWebFeedMetadata(_ feed: WebFeed) { webFeedMetadata[feed.url] = nil } @@ -829,11 +833,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, } } - public func mark(articles: Set
, statusKey: ArticleStatus.Key, flag: Bool, completion: @escaping (Result) -> Void) { - delegate.markArticles(for: self, articles: articles, statusKey: statusKey, flag: flag, completion: completion) - } - - /// Mark articleIDs statuses based on statusKey and flag. /// Will create statuses in the database and in memory as needed. Sends a .StatusesDidChange notification. func mark(articleIDs: Set, statusKey: ArticleStatus.Key, flag: Bool, completion: DatabaseCompletionBlock? = nil) { diff --git a/Shared/Importers/DefaultFeeds.opml b/Shared/Importers/DefaultFeeds.opml index 91bd0b5a6..f0581edaf 100644 --- a/Shared/Importers/DefaultFeeds.opml +++ b/Shared/Importers/DefaultFeeds.opml @@ -5,12 +5,12 @@ - + diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index 6a8d827ce..fba9e6a22 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,6 +1,32 @@ # iOS Release Notes +### 6.1 Release build 6110 - 9 Nov 2022 + +Changes since 6.0.1… + +Article themes. Several themes ship with the app, and you can create your own. You can change the theme in Preferences. +Fixed a bug that could prevent BazQux syncing when an article may not contain all the info we expect +Fixed a bug that could prevent Feedly syncing when marking a large number of articles as read +Disallow creation of iCloud account in the app if iCloud and iCloud Drive aren’t both enabled +Added links to iCloud Syncing Limitations & Solutions on iCloud Account Management UI +Copy URLs using repaired, rather than raw, feed links +Fixed bug showing quote tweets that only included an image +Video autoplay is now disallowed +Article view now supports RTL layout +Fixed a few crashing bugs +Fixed a layout bug that could happen on returning to the Feeds list +Fixed a bug where go-to-feed might not properly expand disclosure triangles +Prevented the Delete option from showing in the Edit menu on the Article View +Fixed Widget article icon lookup bug + + +### 6.1 TestFlight build 6109 - 31 Oct 2022 + +Enhanced Widget integration to make counts more accurate +Enhanced Widget integration to make make it more efficient and save on battery life + ### 6.1 TestFlight build 6108 - 28 Oct 2022 + Fixed a bug that could prevent BazQux syncing when an article may not contain all the info we expect Fixed a bug that could prevent Feedly syncing when marking a large number of articles as read Prevent Widget integration from running while in the background to remove some crashes diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index 7353a356c..0a90fb07f 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -1,9 +1,7 @@ // High Level Settings common to both the iOS application and any extensions we bundle with it MARKETING_VERSION = 6.1 -CURRENT_PROJECT_VERSION = 6108 -MARKETING_VERSION = 6.0.2 -CURRENT_PROJECT_VERSION = 610 +CURRENT_PROJECT_VERSION = 6110 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon