From d67c9144f506be328068d9eb2ed2820f7fd06ccd Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 19 Sep 2019 19:49:11 -0500 Subject: [PATCH] Add Reader View is always on preference for Feeds --- Frameworks/Account/Feed.swift | 9 +++ Frameworks/Account/FeedMetadata.swift | 9 +++ Mac/Base.lproj/MainWindow.storyboard | 4 +- .../FeedInspectorViewController.swift | 26 ++++---- Mac/Inspector/Inspector.storyboard | 64 +++++++++++-------- 5 files changed, 74 insertions(+), 38 deletions(-) diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift index 058bafdfc..ab0661a55 100644 --- a/Frameworks/Account/Feed.swift +++ b/Frameworks/Account/Feed.swift @@ -134,6 +134,15 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha } } + public var isArticleExtractorAlwaysOn: Bool { + get { + return metadata.isArticleExtractorAlwaysOn + } + set { + metadata.isArticleExtractorAlwaysOn = newValue + } + } + public var subscriptionID: String? { get { return metadata.subscriptionID diff --git a/Frameworks/Account/FeedMetadata.swift b/Frameworks/Account/FeedMetadata.swift index cac1f4e6c..6536af3e9 100644 --- a/Frameworks/Account/FeedMetadata.swift +++ b/Frameworks/Account/FeedMetadata.swift @@ -25,6 +25,7 @@ final class FeedMetadata: Codable { case editedName case authors case contentHash + case isArticleExtractorAlwaysOn case conditionalGetInfo case subscriptionID case folderRelationship @@ -85,6 +86,14 @@ final class FeedMetadata: Codable { } } } + + var isArticleExtractorAlwaysOn = false { + didSet { + if isArticleExtractorAlwaysOn != oldValue { + valueDidChange(.contentHash) + } + } + } var authors: [Author]? { didSet { diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard index cec644190..495550c89 100644 --- a/Mac/Base.lproj/MainWindow.storyboard +++ b/Mac/Base.lproj/MainWindow.storyboard @@ -168,7 +168,7 @@ - + + + + @@ -111,25 +125,25 @@ Field - + - + - + @@ -152,7 +166,7 @@ Field Folder Name Field - + @@ -180,13 +194,13 @@ Field - + - + - + @@ -194,7 +208,7 @@ Field - + @@ -222,13 +236,13 @@ Field - + - + - + @@ -236,7 +250,7 @@ Field - +