Merge pull request #7 from SchwarzIT/upgrade-network-debugger

Upgrade network debugger

Author: artesmichael

NetworkDebugger.podspec

@@ -5,7 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "NetworkDebugger",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v16)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(

Package.swift

@@ -20,12 +20,6 @@
 ### Swift Package Manager
 Install through the Swift Package Manager using Xcode.
 
-### Cocoa Pods
-Add to your `podfile` and install using `pod install`.
-```ruby
-pod 'NetworkDebugger', '1.0.2'
-```
-
 ## Setup
 In order for the package to work properly, you need to call `start()` as the first method in your `AppDelegate`! (For SwiftUI apps you need to use `@UIApplicationDelegateAdaptor`)
 **Note:** It is highly encouraged to only call `start()` in debug or testing environments and **not** in production.

README.md

@@ -22,17 +22,10 @@ import UIKit
 
 extension UIApplication {
     var ndKeyWindow: UIWindow? {
-        if #available(iOS 15.0, *) {
-            return connectedScenes
-                .sorted { $0.sceneOrder < $1.sceneOrder }
-                .compactMap { $0 as? UIWindowScene }
-                .compactMap { $0.keyWindow }
-                .first
-        }
-        return connectedScenes
+        connectedScenes
             .sorted { $0.sceneOrder < $1.sceneOrder }
             .compactMap { $0 as? UIWindowScene }
-            .compactMap { $0.windows.first { $0.isKeyWindow }}
+            .compactMap { $0.keyWindow }
             .first
     }
 }

Sources/NetworkDebugger/Extensions/UIApplication+NetworkDebugger.swift

@@ -22,18 +22,10 @@ import Foundation
 
 extension URL {
     var ndHost: String {
-        if #available(iOS 16.0, *) {
-            return host(percentEncoded: false) ?? "N/A"
-        } else {
-            return host ?? "N/A"
-        }
+        host(percentEncoded: false) ?? "N/A"
     }
 
     var ndPath: String {
-        if #available(iOS 16.0, *) {
-            return path(percentEncoded: false)
-        } else {
-            return path
-        }
+        path(percentEncoded: false)
     }
 }

Sources/NetworkDebugger/Extensions/URL+NetworkDebugger.swift

@@ -46,7 +46,6 @@ struct ModelView: View {
             currentPage
             Spacer()
         }
-        .ensureNavigationBarVisible()
     }
 
     @ViewBuilder

Sources/NetworkDebugger/Extensions/View+NavigationBarVisible.swift

@@ -50,57 +50,44 @@ public struct NetworkDebuggerView: View {
                     }
                 }
                 .sheet(isPresented: $isStatisticsPresented) {
-                    if #available(iOS 16.0, *) {
-                        NavigationStack {
-                            StatisticsView()
-                                .navigationTitle("Statistics")
-                                .navigationBarTitleDisplayMode(.inline)
-                                .toolbar {
-                                    ToolbarItem(placement: .primaryAction) {
-                                        Button("Done") {
-                                            isStatisticsPresented = false
-                                        }
+                    NavigationStack {
+                        StatisticsView()
+                            .navigationTitle("Statistics")
+                            .navigationBarTitleDisplayMode(.inline)
+                            .toolbar {
+                                ToolbarItem(placement: .primaryAction) {
+                                    Button("Done") {
+                                        isStatisticsPresented = false
                                     }
                                 }
-                        }
+                            }
                     }
                 }
                 .toolbar {
                     isSettingsPresented = true
                 } statistics: {
                     isStatisticsPresented = true
                 }
-                .ensureNavigationBarVisible()
         }
         .environmentObject(modelsService)
         .environmentObject(settingsService)
         .environmentObject(statisticsService)
-        .searchable(searchText: $searchText)
+        .searchable(text: $searchText)
     }
 }
 
 private extension View {
     func toolbar(settings: @escaping () -> Void, statistics: @escaping () -> Void) -> some View {
-        if #available(iOS 16.0, *) {
-            return self.toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Button("Settings") {
-                        settings()
-                    }
-                }
-                ToolbarItem(placement: .cancellationAction) {
-                    Button("Statistics") {
-                        statistics()
-                        
-                    }
+        toolbar {
+            ToolbarItem(placement: .primaryAction) {
+                Button("Settings") {
+                    settings()
                 }
             }
-        } else {
-            return self.toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Button("Settings") {
-                        settings()
-                    }
+            ToolbarItem(placement: .cancellationAction) {
+                Button("Statistics") {
+                    statistics()
+                    
                 }
             }
         }