Drop tvOS, watchOS support and support 'navigationDestination' modifi…

…er in iOS15. (#42) * drop tvOS and watchOS support add swiftui-navigation dependency * fix tests for macOS * add '.navigationDestination' modifier for iOS15. * update copyright Co-authored-by: Oguz Yuksel <[email protected]>
teufelaudio · Jan 26, 2023 · 2aad724 · 2aad724
1 parent ed3555d
commit 2aad724
Show file tree

Hide file tree

Showing 45 changed files with 329 additions and 243 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Lautsprecher Teufel GmbH
+Copyright (c) 2023 Lautsprecher Teufel GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Package.resolved b/Package.resolved
@@ -28,6 +28,24 @@
           "version": "6.2.0"
         }
       },
+      {
+        "package": "swift-case-paths",
+        "repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
+        "state": {
+          "branch": null,
+          "revision": "c3a42e8d1a76ff557cf565ed6d8b0aee0e6e75af",
+          "version": "0.11.0"
+        }
+      },
+      {
+        "package": "swift-custom-dump",
+        "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
+        "state": {
+          "branch": null,
+          "revision": "ead7d30cc224c3642c150b546f4f1080d1c411a8",
+          "version": "0.6.1"
+        }
+      },
       {
         "package": "SnapshotTesting",
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
@@ -46,6 +64,15 @@
           "version": "0.8.9"
         }
       },
+      {
+        "package": "swiftui-navigation",
+        "repositoryURL": "https://github.com/pointfreeco/swiftui-navigation.git",
+        "state": {
+          "branch": null,
+          "revision": "bf0fb9d53019cbde1a1e0cf290b560a0a0411282",
+          "version": "0.6.0"
+        }
+      },
       {
         "package": "TestingExtensions",
         "repositoryURL": "https://github.com/SwiftRex/TestingExtensions.git",
@@ -54,6 +81,15 @@
           "revision": "a756fadb92e1871a26f24369b7b00435c050aa14",
           "version": "0.2.11"
         }
+      },
+      {
+        "package": "xctest-dynamic-overlay",
+        "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
+        "state": {
+          "branch": null,
+          "revision": "16b23a295fa322eb957af98037f86791449de60f",
+          "version": "0.8.1"
+        }
       }
     ]
   },

diff --git a/Package.swift b/Package.swift
@@ -4,23 +4,30 @@ import PackageDescription
 
 let package = Package(
     name: "UIExtensions",
-    platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
+    platforms: [.macOS(.v10_15), .iOS(.v13)],
     products: [
         .library(name: "UIExtensions", targets: ["UIExtensions"]),
         .library(name: "UIExtensionsDynamic", type: .dynamic, targets: ["UIExtensions"]),
     ],
     dependencies: [
         .package(url: "https://github.com/teufelaudio/FoundationExtensions.git", .exact("0.1.20")),
-        .package(url: "https://github.com/SwiftRex/TestingExtensions.git", .upToNextMajor(from: "0.2.7"))
+        .package(url: "https://github.com/SwiftRex/TestingExtensions.git", .upToNextMajor(from: "0.2.7")),
+        .package(url: "https://github.com/pointfreeco/swiftui-navigation.git", .upToNextMajor(from: "0.6.0"))
     ],
     targets: [
         .target(
             name: "UIExtensions",
-            dependencies: [.product(name: "FoundationExtensions", package: "FoundationExtensions")]
+            dependencies: [
+                .product(name: "FoundationExtensions", package: "FoundationExtensions"),
+                .product(name: "SwiftUINavigation", package: "swiftui-navigation"),
+            ]
         ),
         .target(
             name: "UIExtensionsDynamic",
-            dependencies: [.product(name: "FoundationExtensionsDynamic", package: "FoundationExtensions")]
+            dependencies: [
+                .product(name: "FoundationExtensionsDynamic", package: "FoundationExtensions"),
+                .product(name: "SwiftUINavigation", package: "swiftui-navigation"),
+            ]
         ),
         .testTarget(name: "UIExtensionsTests", dependencies: ["TestingExtensions", "UIExtensions"]),
     ]

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/CircledNumber.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/CircledNumber.swift
@@ -1,4 +1,4 @@
-// Copyright © 2021 Lautsprecher Teufel GmbH. All rights reserved.
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/ConditionalSizeView.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/ConditionalSizeView.swift
@@ -1,4 +1,4 @@
-//  Copyright © 2021 Lautsprecher Teufel GmbH. All rights reserved.
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/ConditionalSizeViewState.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/ConditionalSizeViewState.swift
@@ -1,4 +1,4 @@
-//  Copyright © 2021 Lautsprecher Teufel GmbH. All rights reserved.
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import CoreGraphics
 import Foundation

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/GeometryPreferenceReporter.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/GeometryPreferenceReporter.swift
@@ -1,10 +1,4 @@
-//
-//  GeometryPreferenceReporter.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 01.10.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/HorizontalSizeClassView.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/HorizontalSizeClassView.swift
@@ -1,10 +1,4 @@
-//
-//  HorizontalSizeClassView.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 22.05.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/MultipleSpacer.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/MultipleSpacer.swift
@@ -1,10 +1,4 @@
-//
-//  MultipleSpacer.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 15.04.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/NavigationStack.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/NavigationStack.swift
@@ -0,0 +1,28 @@
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
+
+import SwiftUI
+
+struct NavigationStack<Content: View>: View {
+    private let content: () -> Content
+
+    init(@ViewBuilder _ content: @escaping () -> Content) {
+        self.content = content
+    }
+
+    var body: some View {
+        if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {
+            SwiftUI.NavigationStack {
+                content()
+            }
+        } else {
+            // FIXME: If you deeplink more than two level, navigation will stay at the second level.
+            // This is a known `NavigationLink` bug.
+            NavigationView {
+                content()
+            }
+            #if os(iOS)
+            .navigationViewStyle(.stack)
+            #endif
+        }
+    }
+}
diff --git a/Sources/UIExtensions/Components/SwiftUI/Pure/PageControlDotsView.swift b/Sources/UIExtensions/Components/SwiftUI/Pure/PageControlDotsView.swift
@@ -1,10 +1,4 @@
-//
-//  PageControlDotsView.swift
-//  UIExtensions
-//
-//  Created by Thomas Mellenthin on 29.03.21.
-//  Copyright © 2021 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/AttributedText.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/AttributedText.swift
@@ -1,10 +1,4 @@
-//
-//  AttributedText.swift
-//  UIExtensions
-//
-//  Created by Luiz Barbosa on 25.11.19.
-//  Copyright © 2019 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import SwiftUI

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PageControlView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PageControlView.swift
@@ -1,10 +1,4 @@
-//
-//  PageControlView.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 10.06.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import SwiftUI

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PageView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PageView.swift
@@ -1,10 +1,4 @@
-//
-//  PageView.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 20.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import FoundationExtensions

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PagingScrollView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/PagingScrollView.swift
@@ -1,10 +1,4 @@
-//
-//  PagingScrollView.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 21.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import FoundationExtensions

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/SafariView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/SafariView.swift
@@ -1,10 +1,4 @@
-//
-//  SafariView.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 14.02.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit) && canImport(SafariServices)
 import SafariServices

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/ScrollableView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/ScrollableView.swift
@@ -1,10 +1,4 @@
-//
-//  ScrollableView.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 24.03.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import SwiftUI

diff --git a/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/ShareSheetView.swift b/Sources/UIExtensions/Components/SwiftUI/UIKit Wrappers/ShareSheetView.swift
@@ -1,10 +1,4 @@
-//
-//  ShareSheetView.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 08.12.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import SwiftUI

diff --git a/Sources/UIExtensions/Environment/DisableAnimations.swift b/Sources/UIExtensions/Environment/DisableAnimations.swift
@@ -1,10 +1,4 @@
-//
-//  DisableAnimations.swift
-//  Components
-//
-//  Created by Luiz Barbosa on 09.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import Foundation
 import SwiftUI

diff --git a/Sources/UIExtensions/Environment/DisableKerning.swift b/Sources/UIExtensions/Environment/DisableKerning.swift
@@ -1,10 +1,4 @@
-//
-//  DisableKerning.swift
-//  Components
-//
-//  Created by Luis Reisewitz on 06.05.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Extensions/Binding+Debug.swift b/Sources/UIExtensions/Extensions/Binding+Debug.swift
@@ -1,10 +1,4 @@
-//
-//  Binding+Debug.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 11.12.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 // The following additions are only to be used in Debug mode.
 #if DEBUG && canImport(SwiftUI)

diff --git a/Sources/UIExtensions/Extensions/Binding+Optional.swift b/Sources/UIExtensions/Extensions/Binding+Optional.swift
@@ -1,10 +1,4 @@
-//
-//  Binding+ToOptional.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 14.09.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Extensions/CGPoint+SwiftUI.swift b/Sources/UIExtensions/Extensions/CGPoint+SwiftUI.swift
@@ -1,10 +1,5 @@
-//
-//  CGPoint+SwiftUI.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 29.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
+
 #if canImport(SwiftUI)
 
 import CoreGraphics

diff --git a/Sources/UIExtensions/Extensions/CGSize+Extensions.swift b/Sources/UIExtensions/Extensions/CGSize+Extensions.swift
@@ -1,10 +1,4 @@
-//
-//  CGSize+Extensions.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 22.06.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import CoreGraphics
 

diff --git a/Sources/UIExtensions/Extensions/GeometryProxy+Extensions.swift b/Sources/UIExtensions/Extensions/GeometryProxy+Extensions.swift
@@ -1,10 +1,4 @@
-//
-//  GeometryProxy+Extensions.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 22.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import SwiftUI
 

diff --git a/Sources/UIExtensions/Extensions/Spacer+Extensions.swift b/Sources/UIExtensions/Extensions/Spacer+Extensions.swift
@@ -1,10 +1,4 @@
-//
-//  Spacer+Extensions.swift
-//  UIExtensions
-//
-//  Created by Luiz Rodrigo Martins Barbosa on 29.04.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 import Foundation
 import SwiftUI

diff --git a/Sources/UIExtensions/Extensions/UIRectCorner+Extensions.swift b/Sources/UIExtensions/Extensions/UIRectCorner+Extensions.swift
@@ -1,10 +1,4 @@
-//
-//  UIRectCorner+Extensions.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 16.01.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 #if canImport(UIKit)
 import UIKit

diff --git a/Sources/UIExtensions/Extensions/View+Debug.swift b/Sources/UIExtensions/Extensions/View+Debug.swift
@@ -1,10 +1,4 @@
-//
-//  View+Debug.swift
-//  UIExtensions
-//
-//  Created by Luis Reisewitz on 11.12.20.
-//  Copyright © 2020 Lautsprecher Teufel GmbH. All rights reserved.
-//
+// Copyright © 2023 Lautsprecher Teufel GmbH. All rights reserved.
 
 // The following additions are only to be used in Debug mode.
 #if DEBUG && canImport(SwiftUI)