Remove ConsoleConfiguration

kean · Aug 3, 2024 · 939d295 · 939d295
1 parent bb0ba1b
commit 939d295
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 37 deletions.
diff --git a/Sources/PulseUI/Features/Console/ConsoleConfiguration.swift b/Sources/PulseUI/Features/Console/ConsoleConfiguration.swift
diff --git a/Sources/PulseUI/Features/Console/ConsoleEnvironment.swift b/Sources/PulseUI/Features/Console/ConsoleEnvironment.swift
@@ -24,7 +24,6 @@ final class ConsoleEnvironment: ObservableObject {
 
     let initialMode: ConsoleMode
     let delegate: ConsoleViewDelegate
-    let configuration: ConsoleConfiguration
 
     @Published var mode: ConsoleMode
     @Published var listOptions: ConsoleListOptions = .init()
@@ -39,7 +38,7 @@ final class ConsoleEnvironment: ObservableObject {
 
     private var cancellables: [AnyCancellable] = []
 
-    init(store: LoggerStore, mode: ConsoleMode = .all, configuration: ConsoleConfiguration = .default, delegate: ConsoleViewDelegate = DefaultConsoleViewDelegate()) {
+    init(store: LoggerStore, mode: ConsoleMode = .all, delegate: ConsoleViewDelegate = DefaultConsoleViewDelegate()) {
         self.store = store
         switch mode {
         case .all: self.title = "Console"
@@ -55,7 +54,6 @@ final class ConsoleEnvironment: ObservableObject {
         }
 
         self.delegate = delegate
-        self.configuration = configuration
 
         func makeDefaultOptions() -> ConsoleDataSource.PredicateOptions {
             var options = ConsoleDataSource.PredicateOptions()

diff --git a/Sources/PulseUI/Features/Console/ConsoleView.swift b/Sources/PulseUI/Features/Console/ConsoleView.swift
@@ -15,15 +15,13 @@ extension ConsoleView {
     ///   - mode: The initial console mode. By default, ``ConsoleMode/all``. If you change
     ///   the mode to ``ConsoleMode/network``, the console will display the
     ///   network messages up on appearance.
-    ///   - configuration: Configuration options to alter the UI behavior and settings.
     ///   - delegate: The delegate that allows you to customize multiple aspects
     ///   of the console view.
     public init(
         store: LoggerStore = .shared,
         mode: ConsoleMode = .all,
-        configuration: ConsoleConfiguration = .default,
         delegate: ConsoleViewDelegate? = nil
     ) {
-        self.init(environment: .init(store: store, mode: mode, configuration: configuration, delegate: delegate ?? DefaultConsoleViewDelegate()))
+        self.init(environment: .init(store: store, mode: mode, delegate: delegate ?? DefaultConsoleViewDelegate()))
     }
 }
diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleRouterView.swift b/Sources/PulseUI/Features/Console/Views/ConsoleRouterView.swift
@@ -130,7 +130,7 @@ extension ConsoleRouterView {
 
     private var destinationSettings: some View {
         SettingsView()
-            .frame(width: 320, height: environment.configuration.allowRemoteLogging ? 420 : 175)
+            .frame(width: 320, height: UserSettings.shared.isRemoteLoggingHidden ? 175 : 420)
             .navigationTitle("Settings")
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) {

diff --git a/Sources/PulseUI/Features/Settings/SettingsView-ios.swift b/Sources/PulseUI/Features/Settings/SettingsView-ios.swift
@@ -21,7 +21,8 @@ public struct SettingsView: View {
 
     public var body: some View {
         Form {
-            if store === RemoteLogger.shared.store {
+            if !UserSettings.shared.isRemoteLoggingHidden,
+               store === RemoteLogger.shared.store {
                 RemoteLoggerSettingsView(viewModel: .shared)
             }
             Section {

diff --git a/Sources/PulseUI/Features/Settings/SettingsView-macos.swift b/Sources/PulseUI/Features/Settings/SettingsView-macos.swift
@@ -17,7 +17,7 @@ struct SettingsView: View {
 
     var body: some View {
         List {
-            if environment.configuration.allowRemoteLogging {
+            if !UserSettings.shared.isRemoteLoggingHidden {
                 if store === RemoteLogger.shared.store {
                     RemoteLoggerSettingsView(viewModel: .shared)
                 } else {

diff --git a/Sources/PulseUI/Features/Settings/SettingsView-tvos.swift b/Sources/PulseUI/Features/Settings/SettingsView-tvos.swift
@@ -16,7 +16,8 @@ public struct SettingsView: View {
 
     public var body: some View {
         Form {
-            if store === RemoteLogger.shared.store {
+            if !UserSettings.shared.isRemoteLoggingHidden,
+                store === RemoteLogger.shared.store {
                 RemoteLoggerSettingsView(viewModel: .shared)
             }
             Section {

diff --git a/Sources/PulseUI/Features/Settings/SettingsView-watchos.swift b/Sources/PulseUI/Features/Settings/SettingsView-watchos.swift
@@ -19,7 +19,8 @@ public struct SettingsView: View {
     public var body: some View {
         Form {
             Section {
-                if store === RemoteLogger.shared.store {
+                if !UserSettings.shared.isRemoteLoggingHidden,
+                   store === RemoteLogger.shared.store {
 #if targetEnvironment(simulator)
                     RemoteLoggerSettingsView(viewModel: .shared)
 #else

diff --git a/Sources/PulseUI/Features/Settings/UserSettings.swift b/Sources/PulseUI/Features/Settings/UserSettings.swift
@@ -60,4 +60,8 @@ public final class UserSettings: ObservableObject {
 
     @AppStorage("com.github.kean.pulse.allowedShareStoreOutputs")
     var rawAllowedShareStoreOutputs: String = "[]"
+
+    /// If enabled, the console stops showing the remote logging option.
+    @AppStorage("com.github.kean.pulse.isRemoteLoggingAllowed")
+    public var isRemoteLoggingHidden = false
 }