Merge pull request #2 from ActuallyTaylor/pull-out-ui

Moved UI out of the main package

Package.swift

@@ -6,13 +6,15 @@ import PackageDescription
 let package = Package(
     name: "HydrogenReporter",
     platforms: [
-        .iOS(.v16)
+        .iOS(.v15),
+        .macOS(.v11)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "HydrogenReporter",
             targets: ["HydrogenReporter"]),
+        .library(name: "HydrogenUI", targets: ["HydrogenUI"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -21,9 +23,8 @@ let package = Package(
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
-            name: "HydrogenReporter",
-            dependencies: []),
+        .target(name: "HydrogenReporter", dependencies: []),
+        .target(name: "HydrogenUI", dependencies: ["HydrogenReporter"]),
         .testTarget(
             name: "HydrogenReporterTests",
             dependencies: ["HydrogenReporter"]),

Sources/HydrogenReporter/Backbone/Logger.swift → Sources/HydrogenReporter/Logger.swift

@@ -102,7 +102,7 @@ public class Logger: ObservableObject {
         let separator: String
         let terminator: String
 
-        let level: LogLevel
+        public let level: LogLevel
         let complexity: LogComplexity
 
         let file: String
@@ -145,7 +145,7 @@ public class Logger: ObservableObject {
 
     private var config: LoggerConfig = .defaultConfig
 
-    @Published var logs: [LogItem] = []
+    @Published public var logs: [LogItem] = []
 
     // MARK: Console Intercepting
     internal var originalSTDOUTDescriptor: Int32
@@ -157,9 +157,9 @@ public class Logger: ObservableObject {
     internal let stderrInputPipe = Pipe()
     internal let stderrOutputPipe = Pipe()
 
-    @Published var consoleOutput: String = ""
-    @Published var stdout: String = ""
-    @Published var stderr: String = ""
+    @Published public var consoleOutput: String = ""
+    @Published public var stdout: String = ""
+    @Published public var stderr: String = ""
 
     var isInterceptingConsoleOutput: Bool = false
 
@@ -351,8 +351,6 @@ extension Logger {
     }
 }
 
-
-
 // /MARK: Log Function
 public func LOG(_ items: Any...,
                 separator: String = " ",

Sources/HydrogenReporter/Backbone/Config.swift → Sources/HydrogenUI/Backbone/Config.swift

@@ -57,12 +57,29 @@ public struct Config {
     }
 
     static var appAppearance: AppAppearance {
+        #if canImport(UIKit)
         if UITraitCollection.current.userInterfaceStyle == .dark {
             return .dark
         } else if UITraitCollection.current.userInterfaceStyle == .light {
             return .light
         } else {
             return .light
         }
+        #elseif canImport(AppKit)
+        return NSApplication.shared.isDarkmode() ? .dark : .light
+        #endif
+    }
+}
+
+#if canImport(AppKit)
+extension NSApplication {
+    func isDarkmode() -> Bool {
+        let type = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") ?? "Light"
+        return type == "Dark"
     }
 }
+
+extension Notification.Name {
+    static let AppleInterfaceThemeChangedNotification = Notification.Name("AppleInterfaceThemeChangedNotification")
+}
+#endif

Sources/HydrogenReporter/Backbone/UIDevice.swift → Sources/HydrogenUI/Backbone/UIDevice.swift

@@ -2,6 +2,7 @@
 import Foundation
 import UIKit
 import MachO
+import HydrogenReporter
 
 public extension UIDevice {
 

Sources/HydrogenReporter/SampleView.swift → Sources/HydrogenUI/SampleView.swift

@@ -6,13 +6,15 @@
 //
 
 import SwiftUI
+import HydrogenReporter
 
 class SampleViewModel: ObservableObject, Debuggable {
     var swiftyDebugDescription: String = "Hello"
 
     @Published var test: String = "Hello Publisher"
 }
 
+@available(macOS 12.0, *)
 struct SampleView: View {
     @StateObject var viewModel: SampleViewModel = SampleViewModel()
     @State var string: String = "Hello World"
@@ -57,6 +59,7 @@ struct SampleView: View {
     }
 }
 
+@available(macOS 12.0, *)
 struct SampleView_Previews: PreviewProvider {
     static var previews: some View {
         SampleView()

Sources/HydrogenReporter/Views/HydrogenReporter/Console.swift → Sources/HydrogenUI/Views/HydrogenReporter/Console.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import HydrogenReporter
 
 struct Console: View {
     enum OutputMode {

Sources/HydrogenReporter/Views/HydrogenReporter/DebugView.swift → Sources/HydrogenUI/Views/HydrogenReporter/DebugView.swift

@@ -6,8 +6,10 @@
 //
 
 import SwiftUI
+import HydrogenReporter
 
 // MARK: Swifty Debug
+@available(macOS 12.0, *)
 struct DebugView: View {
     @StateObject var debugHandler: DebugHandler = .shared
     @StateObject var logger: Logger = .shared
@@ -229,7 +231,7 @@ struct DebugView: View {
 
 }
 
-
+@available(macOS 12.0, *)
 struct DebugView_Previews: PreviewProvider {
     static var previews: some View {
         DebugView()

Sources/HydrogenReporter/Views/HydrogenReporter/LoggerView.swift → Sources/HydrogenUI/Views/HydrogenReporter/LoggerView.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import HydrogenReporter
 
 struct LoggerView: View {
     @EnvironmentObject var logger: Logger

Sources/HydrogenReporter/Views/Modifiers/HydrogenModifiers.swift → Sources/HydrogenUI/Views/Modifiers/HydrogenModifiers.swift

@@ -7,12 +7,14 @@
 
 import SwiftUI
 
+@available(macOS 12.0, *)
 struct HydrogenReporterModifier: ViewModifier {
     func body(content: Content) -> some View {
         content.overlay(DebugView())
     }
 }
 
+@available(macOS 12.0, *)
 public extension View {
     func hydrogenReporter() -> some View {
         return self.modifier(HydrogenReporterModifier())