FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 12:06:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change all 10.16 version checks to be 11.0

Browse Source
This commit is contained in:
Maurice Parker 2020-08-10 11:43:18 -05:00
parent 7a7784eb75
commit c652486663
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Mac/AppAssets.swift
View File

@ -40,7 +40,7 @@ struct AppAssets {
return RSImage(named: "accountNewsBlur") return RSImage(named: "accountNewsBlur")
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var addNewSidebarItemImage: RSImage = { static var addNewSidebarItemImage: RSImage = {
return NSImage(systemSymbolName: "plus", accessibilityDescription: nil)! return NSImage(systemSymbolName: "plus", accessibilityDescription: nil)!
}() }()
@ -77,7 +77,7 @@ struct AppAssets {
return RSImage(named: "articleExtractorProgress4") return RSImage(named: "articleExtractorProgress4")
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var cleanUpImage: RSImage = { static var cleanUpImage: RSImage = {
return NSImage(systemSymbolName: "wind", accessibilityDescription: nil)! return NSImage(systemSymbolName: "wind", accessibilityDescription: nil)!
}() }()
@ -119,7 +119,7 @@ struct AppAssets {
}() }()
static var masterFolderImage: IconImage = { static var masterFolderImage: IconImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)! let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
let coloredImage = image.tinted(with: NSColor(named: "AccentColor")!) let coloredImage = image.tinted(with: NSColor(named: "AccentColor")!)
return IconImage(coloredImage, isSymbol: true) return IconImage(coloredImage, isSymbol: true)
@ -132,18 +132,18 @@ struct AppAssets {
return RSImage(named: "markAllAsRead")! return RSImage(named: "markAllAsRead")!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var nextUnreadImage: RSImage = { static var nextUnreadImage: RSImage = {
return NSImage(systemSymbolName: "chevron.down.circle", accessibilityDescription: nil)! return NSImage(systemSymbolName: "chevron.down.circle", accessibilityDescription: nil)!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var openInBrowserImage: RSImage = { static var openInBrowserImage: RSImage = {
return NSImage(systemSymbolName: "safari", accessibilityDescription: nil)! return NSImage(systemSymbolName: "safari", accessibilityDescription: nil)!
}() }()
static var preferencesToolbarAccountsImage: RSImage = { static var preferencesToolbarAccountsImage: RSImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return NSImage(systemSymbolName: "at", accessibilityDescription: nil)! return NSImage(systemSymbolName: "at", accessibilityDescription: nil)!
} else { } else {
return NSImage(named: NSImage.userAccountsName)! return NSImage(named: NSImage.userAccountsName)!
@ -151,7 +151,7 @@ struct AppAssets {
}() }()
static var preferencesToolbarExtensionsImage: RSImage = { static var preferencesToolbarExtensionsImage: RSImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return NSImage(named: "preferencesToolbarExtensions")! return NSImage(named: "preferencesToolbarExtensions")!
} else { } else {
return NSImage(contentsOfFile: "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns")! return NSImage(contentsOfFile: "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns")!
@ -159,7 +159,7 @@ struct AppAssets {
}() }()
static var preferencesToolbarGeneralImage: RSImage = { static var preferencesToolbarGeneralImage: RSImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)! return NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
} else { } else {
return NSImage(named: NSImage.preferencesGeneralName)! return NSImage(named: NSImage.preferencesGeneralName)!
@ -167,24 +167,24 @@ struct AppAssets {
}() }()
static var preferencesToolbarAdvancedImage: RSImage = { static var preferencesToolbarAdvancedImage: RSImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return NSImage(systemSymbolName: "gearshape.2", accessibilityDescription: nil)! return NSImage(systemSymbolName: "gearshape.2", accessibilityDescription: nil)!
} else { } else {
return NSImage(named: NSImage.advancedName)! return NSImage(named: NSImage.advancedName)!
} }
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var readClosedImage: RSImage = { static var readClosedImage: RSImage = {
return NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)! return NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var readOpenImage: RSImage = { static var readOpenImage: RSImage = {
return NSImage(systemSymbolName: "circle", accessibilityDescription: nil)! return NSImage(systemSymbolName: "circle", accessibilityDescription: nil)!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var refreshImage: RSImage = { static var refreshImage: RSImage = {
return NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)! return NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)!
}() }()
@ -193,23 +193,23 @@ struct AppAssets {
return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true) return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true)
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var shareImage: RSImage = { static var shareImage: RSImage = {
return NSImage(systemSymbolName: "square.and.arrow.up", accessibilityDescription: nil)! return NSImage(systemSymbolName: "square.and.arrow.up", accessibilityDescription: nil)!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var starClosedImage: RSImage = { static var starClosedImage: RSImage = {
return NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)! return NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
}() }()
@available(macOS 10.16, *) @available(macOS 11.0, *)
static var starOpenImage: RSImage = { static var starOpenImage: RSImage = {
return NSImage(systemSymbolName: "star", accessibilityDescription: nil)! return NSImage(systemSymbolName: "star", accessibilityDescription: nil)!
}() }()
static var starredFeedImage: IconImage = { static var starredFeedImage: IconImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)! let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
let coloredImage = image.tinted(with: NSColor(named: "StarColor")!) let coloredImage = image.tinted(with: NSColor(named: "StarColor")!)
return IconImage(coloredImage, isSymbol: true) return IconImage(coloredImage, isSymbol: true)
@ -219,7 +219,7 @@ struct AppAssets {
}() }()
static var timelineStar: RSImage! = { static var timelineStar: RSImage! = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)! let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
let coloredImage = image.tinted(with: NSColor(named: "StarColor")!) let coloredImage = image.tinted(with: NSColor(named: "StarColor")!)
return coloredImage return coloredImage
@ -229,7 +229,7 @@ struct AppAssets {
}() }()
static var todayFeedImage: IconImage = { static var todayFeedImage: IconImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)! let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)!
let coloredImage = image.tinted(with: .orange) let coloredImage = image.tinted(with: .orange)
return IconImage(coloredImage, isSymbol: true) return IconImage(coloredImage, isSymbol: true)
@ -239,7 +239,7 @@ struct AppAssets {
}() }()
static var unreadFeedImage: IconImage = { static var unreadFeedImage: IconImage = {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)! let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
let coloredImage = image.tinted(with: NSColor(named: "AccentColor")!) let coloredImage = image.tinted(with: NSColor(named: "AccentColor")!)
return IconImage(coloredImage, isSymbol: true) return IconImage(coloredImage, isSymbol: true)

2
Mac/AppDelegate.swift
View File

@ -351,7 +351,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
func createMainWindowController() -> MainWindowController { func createMainWindowController() -> MainWindowController {
let controller: MainWindowController let controller: MainWindowController
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let storyboard = NSStoryboard(name: NSStoryboard.Name("MainWindow"), bundle: nil) let storyboard = NSStoryboard(name: NSStoryboard.Name("MainWindow"), bundle: nil)
controller = storyboard.instantiateController(withIdentifier: "UnifiedWindowController") as! MainWindowController controller = storyboard.instantiateController(withIdentifier: "UnifiedWindowController") as! MainWindowController
} else { } else {

18
Mac/MainWindow/MainWindowController.swift
View File

@ -61,7 +61,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
sharingServicePickerDelegate = SharingServicePickerDelegate(self.window) sharingServicePickerDelegate = SharingServicePickerDelegate(self.window)
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
DispatchQueue.main.async { DispatchQueue.main.async {
let toolbar = NSToolbar(identifier: "MainWindowToolbar") let toolbar = NSToolbar(identifier: "MainWindowToolbar")
toolbar.allowsUserCustomization = true toolbar.allowsUserCustomization = true
@ -714,7 +714,7 @@ extension NSToolbarItem.Identifier {
extension MainWindowController: NSToolbarDelegate { extension MainWindowController: NSToolbarDelegate {
func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? { func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
switch itemIdentifier { switch itemIdentifier {
@ -779,7 +779,7 @@ extension MainWindowController: NSToolbarDelegate {
} }
func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] { func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return [ return [
.refresh, .refresh,
.newSidebarItemMenu, .newSidebarItemMenu,
@ -816,7 +816,7 @@ extension MainWindowController: NSToolbarDelegate {
} }
func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] { func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
return [ return [
.refresh, .refresh,
.newSidebarItemMenu, .newSidebarItemMenu,
@ -860,7 +860,7 @@ extension MainWindowController: NSToolbarDelegate {
button.sendAction(on: .leftMouseDown) button.sendAction(on: .leftMouseDown)
} }
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem { if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
searchItem.searchField.delegate = self searchItem.searchField.delegate = self
searchItem.searchField.target = self searchItem.searchField.target = self
@ -882,7 +882,7 @@ extension MainWindowController: NSToolbarDelegate {
return return
} }
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem { if item.itemIdentifier == .search, let searchItem = item as? NSSearchToolbarItem {
searchItem.searchField.delegate = nil searchItem.searchField.delegate = nil
searchItem.searchField.target = nil searchItem.searchField.target = nil
@ -1007,7 +1007,7 @@ private extension MainWindowController {
menuItem.title = commandName menuItem.title = commandName
} }
if #available(macOS 10.16, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton { if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
button.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage button.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage
} }
@ -1094,7 +1094,7 @@ private extension MainWindowController {
menuItem.title = commandName menuItem.title = commandName
} }
if #available(macOS 10.16, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton { if #available(macOS 11.0, *), let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
button.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage button.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage
} }
@ -1168,7 +1168,7 @@ private extension MainWindowController {
if displayName != nil { if displayName != nil {
window?.title = displayName! window?.title = displayName!
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
window?.subtitle = "\(unreadCount ?? 0) unread" window?.subtitle = "\(unreadCount ?? 0) unread"
} }
} else { } else {

2
Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift
View File

@ -23,7 +23,7 @@ struct SidebarCellAppearance: Equatable {
textFieldFontSize = 11 textFieldFontSize = 11
case .large: case .large:
imageSize = CGSize(width: 24, height: 24) imageSize = CGSize(width: 24, height: 24)
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
textFieldFontSize = 15 textFieldFontSize = 15
} else { } else {
textFieldFontSize = 13 textFieldFontSize = 13

2
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -266,7 +266,7 @@ private extension ArticleRenderer {
func styleSubstitutions() -> [String: String] { func styleSubstitutions() -> [String: String] {
var d = [String: String]() var d = [String: String]()
if #available(macOS 10.16, *) { if #available(macOS 11.0, *) {
let bodyFont = NSFont.preferredFont(forTextStyle: .body) let bodyFont = NSFont.preferredFont(forTextStyle: .body)
d["font-size"] = String(describing: Int(round(bodyFont.pointSize * 1.33))) d["font-size"] = String(describing: Int(round(bodyFont.pointSize * 1.33)))
} }