From f8667be32b804e0b50b55f8bd8be9fa08b50fa8b Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 7 Apr 2020 12:02:07 -0500 Subject: [PATCH] Change preference pane to Extensions for demo purposes. --- Frameworks/FeedProvider/FeedProvider.swift | 4 +++- Mac/AppAssets.swift | 18 +++++++++++++----- .../FeedProvidersAddViewController.swift | 10 ++++++++-- .../PreferencesWindowController.swift | 2 +- .../adapterMarsEdit.imageset/Contents.json | 15 +++++++++++++++ .../adapterMarsEdit.imageset/marsedit.pdf | Bin 0 -> 4453 bytes .../micro-dot-blog.pdf | Bin 0 -> 4190 bytes .../Contents.json | 0 .../twitter.pdf | Bin 9 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json create mode 100644 Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf create mode 100644 Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf rename Mac/Resources/Assets.xcassets/{feedProviderTwitter.imageset => adapterTwitter.imageset}/Contents.json (100%) rename Mac/Resources/Assets.xcassets/{feedProviderTwitter.imageset => adapterTwitter.imageset}/twitter.pdf (100%) diff --git a/Frameworks/FeedProvider/FeedProvider.swift b/Frameworks/FeedProvider/FeedProvider.swift index 8ce988d1e..8f2247cfa 100644 --- a/Frameworks/FeedProvider/FeedProvider.swift +++ b/Frameworks/FeedProvider/FeedProvider.swift @@ -11,7 +11,9 @@ import RSCore public enum FeedProviderType: Int, Codable { // Raw values should not change since they’re stored. - case twitter = 1 + case marsEdit = 1 + case microblog = 2 + case twitter = 3 } diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 101174152..c19d809c2 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -45,6 +45,18 @@ struct AppAssets { return RSImage(named: "accountNewsBlur") }() + static var adapterMarsEdit: RSImage = { + return RSImage(named: "adapterMarsEdit")! + }() + + static var adapterMicroblog: RSImage = { + return RSImage(named: "adapterMicroblog")! + }() + + static var adapterTwitter: RSImage = { + return RSImage(named: "adapterTwitter")! + }() + static var articleExtractor: RSImage! = { return RSImage(named: "articleExtractor") }() @@ -78,7 +90,7 @@ struct AppAssets { }() static var bookmarkImage: RSImage? = { - let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns" + let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns" let image = RSImage(contentsOfFile: path) return image }() @@ -87,10 +99,6 @@ struct AppAssets { return RSImage(named: "faviconTemplateImage")! }() - static var feedProviderTwitter: RSImage = { - return RSImage(named: "feedProviderTwitter")! - }() - static var filterActive: RSImage = { return RSImage(named: "filterActive")! }() diff --git a/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift b/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift index 426037d96..e0721c0d3 100644 --- a/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift +++ b/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift @@ -16,7 +16,7 @@ class FeedProvidersAddViewController: NSViewController { private var accountsAddWindowController: NSWindowController? #if DEBUG - private var addableFeedProviderTypes: [FeedProviderType] = [.twitter] + private var addableFeedProviderTypes: [FeedProviderType] = [.marsEdit, .microblog, .twitter] #else private var addableFeedProviderTypes: [FeedProviderType] = [.twitter] #endif @@ -60,9 +60,15 @@ extension FeedProvidersAddViewController: NSTableViewDelegate { if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? FeedProvidersAddTableCellView { switch addableFeedProviderTypes[row] { + case .marsEdit: + cell.feedProviderNameLabel?.stringValue = NSLocalizedString("MarsEdit", comment: "MarsEdit") + cell.feedProviderImageView?.image = AppAssets.adapterMarsEdit + case .microblog: + cell.feedProviderNameLabel?.stringValue = NSLocalizedString("Micro.blog", comment: "Micro.blog") + cell.feedProviderImageView?.image = AppAssets.adapterMicroblog case .twitter: cell.feedProviderNameLabel?.stringValue = NSLocalizedString("Twitter", comment: "Twitter") - cell.feedProviderImageView?.image = AppAssets.feedProviderTwitter + cell.feedProviderImageView?.image = AppAssets.adapterTwitter } return cell } diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index e6d225914..9679aa9a3 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/Mac/Preferences/PreferencesWindowController.swift @@ -41,7 +41,7 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { name: NSLocalizedString("Accounts", comment: "Preferences"), image: NSImage(named: NSImage.userAccountsName))] specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.FeedProvider, - name: NSLocalizedString("Integrations", comment: "Preferences"), + name: NSLocalizedString("Extensions", comment: "Preferences"), image: AppAssets.bookmarkImage)] // Omit the Advanced Preferences for now because the Software Update related functionality is diff --git a/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json new file mode 100644 index 000000000..44cd99384 --- /dev/null +++ b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "marsedit.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf new file mode 100644 index 0000000000000000000000000000000000000000..732eb701c397d9adbf0242ba329154a2a1b18456 GIT binary patch literal 4453 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 literal 0 HcmV?d00001 diff --git a/Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf b/Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ad66dd377a345b3b05272209b53879a86dee7994 GIT binary patch literal 4190 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 T{ISu}axmK82?CmiTHyZx7I;X| literal 0 HcmV?d00001 diff --git a/Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/Contents.json b/Mac/Resources/Assets.xcassets/adapterTwitter.imageset/Contents.json similarity index 100% rename from Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/Contents.json rename to Mac/Resources/Assets.xcassets/adapterTwitter.imageset/Contents.json diff --git a/Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/twitter.pdf b/Mac/Resources/Assets.xcassets/adapterTwitter.imageset/twitter.pdf similarity index 100% rename from Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/twitter.pdf rename to Mac/Resources/Assets.xcassets/adapterTwitter.imageset/twitter.pdf