From d28b36d15ae34ee806b5f00e368a35e7a68fdab1 Mon Sep 17 00:00:00 2001
From: Joe Heck <heckj@mac.com>
Date: Fri, 22 Mar 2024 11:35:04 -0700
Subject: [PATCH] updating based on PR feedback

---
 Core/Sources/Core/RSImage.swift            |  8 +++++++
 Core/Sources/Core/RSScreen.swift           | 25 ----------------------
 Mac/ErrorHandler.swift                     |  3 +++
 Shared/Extensions/RSImage-Extensions.swift |  2 +-
 4 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 Core/Sources/Core/RSScreen.swift

diff --git a/Core/Sources/Core/RSImage.swift b/Core/Sources/Core/RSImage.swift
index 6549f02a1..4e190e53f 100644
--- a/Core/Sources/Core/RSImage.swift
+++ b/Core/Sources/Core/RSImage.swift
@@ -20,6 +20,14 @@ public typealias RSImage = UIImage
 
 public extension RSImage {
 
+#if os(macOS)
+    static let maxScreenScale = CGFloat(2)
+#endif
+
+#if os(iOS)
+    static let maxScreenScale = CGFloat(3)
+#endif
+
 	/// Create a colored image from the source image using a specified color.
 	///
 	/// - Parameter color: The color with which to fill the mask image.
diff --git a/Core/Sources/Core/RSScreen.swift b/Core/Sources/Core/RSScreen.swift
deleted file mode 100644
index 78fd8faed..000000000
--- a/Core/Sources/Core/RSScreen.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  RSScreen.swift
-//  RSCore
-//
-//  Created by Maurice Parker on 4/11/19.
-//  Copyright © 2019 Ranchero Software. All rights reserved.
-//
-
-#if os(macOS)
-import AppKit
-
-public class RSScreen {
-	public static let maxScreenScale = CGFloat(2)
-}
-
-#endif
-
-#if os(iOS)
-import UIKit
-
-public class RSScreen {
-	public static let maxScreenScale = CGFloat(3)
-}
-
-#endif
diff --git a/Mac/ErrorHandler.swift b/Mac/ErrorHandler.swift
index 33ff42275..a4dee6929 100644
--- a/Mac/ErrorHandler.swift
+++ b/Mac/ErrorHandler.swift
@@ -13,6 +13,9 @@ 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)
+#if swift(>=6.0)
+	#warning("Reevaluate whether this Sendable decoration is still needed for OSLog.")
+#endif
 extension OSLog: @unchecked Sendable { }
 
 struct ErrorHandler {
diff --git a/Shared/Extensions/RSImage-Extensions.swift b/Shared/Extensions/RSImage-Extensions.swift
index c45067c89..fae8d6291 100644
--- a/Shared/Extensions/RSImage-Extensions.swift
+++ b/Shared/Extensions/RSImage-Extensions.swift
@@ -22,7 +22,7 @@ extension RSImage {
 	}
 
 	static func scaledForIcon(_ data: Data) -> RSImage? {
-		let scaledMaxPixelSize = Int(ceil(CGFloat(RSImage.maxIconSize) * RSScreen.maxScreenScale))
+		let scaledMaxPixelSize = Int(ceil(CGFloat(RSImage.maxIconSize) * maxScreenScale))
 		guard var cgImage = RSImage.scaleImage(data, maxPixelSize: scaledMaxPixelSize) else {
 			return nil
 		}