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

a suite of small concurrency warning fixes

Browse Source
This commit is contained in:
Joe Heck 2024-03-22 10:11:40 -07:00
parent b3464a2aa5
commit 91ea6f28ee
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Sources/Core/RSScreen.swift
View File

@ -10,7 +10,7 @@
import AppKit
public class RSScreen {
public static var maxScreenScale = CGFloat(2)
public static let maxScreenScale = CGFloat(2)
}
#endif
@ -19,7 +19,7 @@ public class RSScreen {
import UIKit
public class RSScreen {
public static var maxScreenScale = CGFloat(3)
public static let maxScreenScale = CGFloat(3)
}
#endif

5
Mac/AppAssets.swift
View File

@ -71,6 +71,7 @@ struct AppAssets {
static let legacyArticleExtractorProgress4 = NSImage(named: "legacyArticleExtractorProgress4")
@MainActor
static let folderImage: IconImage = {
let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
let preferredColor = NSColor(named: "AccentColor")!
@ -96,6 +97,7 @@ struct AppAssets {
static let refreshImage = NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)!
@MainActor
static let searchFeedImage: IconImage = {
return IconImage(NSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true, isBackgroundSupressed: true)
}()
@ -108,6 +110,7 @@ struct AppAssets {
static let starOpenImage = NSImage(systemSymbolName: "star", accessibilityDescription: nil)!
@MainActor
static let starredFeedImage: IconImage = {
let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
let preferredColor = NSColor(named: "StarColor")!
@ -121,6 +124,7 @@ struct AppAssets {
static let timelineStarUnselected = NSImage(named: "timelineStar")?.tinted(with: starColor)
@MainActor
static let todayFeedImage: IconImage = {
let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)!
let preferredColor = NSColor.orange
@ -128,6 +132,7 @@ struct AppAssets {
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
}()
@MainActor
static let unreadFeedImage: IconImage = {
let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
let preferredColor = NSColor(named: "AccentColor")!

5
Mac/ErrorHandler.swift
View File

@ -10,6 +10,11 @@ import AppKit
import Account
import os.log
// asserts that OSLog is a sendable type
// @preconcurrency import os.log _should_ resolve the warning in this scenario, but does
// not due to a bug (in Swift 5.10)
extension OSLog: @unchecked Sendable { }
struct ErrorHandler {
private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Account")

2
Shared/ArticleStyles/ArticleTheme.swift
View File

@ -8,7 +8,7 @@
import Foundation
struct ArticleTheme: Equatable {
struct ArticleTheme: Equatable, Sendable {
static let defaultTheme = ArticleTheme()
static let nnwThemeSuffix = ".nnwtheme"

2
Shared/ArticleStyles/ArticleThemePlist.swift
View File

@ -8,7 +8,7 @@
import Foundation
public struct ArticleThemePlist: Codable, Equatable {
public struct ArticleThemePlist: Codable, Equatable, Sendable {
public var name: String
public var themeIdentifier: String
public var creatorHomePage: String

2
Shared/Extensions/RSImage-AppIcons.swift
View File

@ -27,7 +27,7 @@ extension RSImage {
}
extension IconImage {
static var appIcon: IconImage? = {
static let appIcon: IconImage? = {
if let image = RSImage.appIconImage {
return IconImage(image)
}