Refactor URL opening with shared function for iOS and macOS

vtourraine · Jan 18, 2024 · 0d852b4 · 0d852b4
1 parent 836c562
commit 0d852b4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/Sources/AcknowList/AcknowListSwiftUI.swift b/Sources/AcknowList/AcknowListSwiftUI.swift
@@ -129,11 +129,7 @@ public struct AcknowListRowSwiftUIView: View {
         else if let repository = acknowledgement.repository,
                 canOpenRepository(for: repository) {
             Button(action: {
-#if os(macOS)
-                NSWorkspace.shared.open(repository)
-#elseif os(iOS)
-                UIApplication.shared.open(repository)
-#endif
+                repository.openWithDefaultBrowser()
             }) {
                 Text(acknowledgement.title)
                     .foregroundColor(.primary)

diff --git a/Sources/AcknowList/AcknowListViewController.swift b/Sources/AcknowList/AcknowListViewController.swift
@@ -217,11 +217,7 @@ open class AcknowListViewController: UITableViewController {
             return
         }
 
-        if #available(iOS 10.0, tvOS 10.0, *) {
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-        } else {
-            UIApplication.shared.openURL(url)
-        }
+        url.openWithDefaultBrowser()
     }
 
     /**
@@ -460,3 +456,18 @@ open class AcknowListViewController: UITableViewController {
 }
 
 #endif
+
+internal extension URL {
+    func openWithDefaultBrowser() {
+#if os(macOS)
+        NSWorkspace.shared.open(self)
+#elseif os(iOS)
+        if #available(iOS 10.0, *) {
+            UIApplication.shared.open(self)
+        }
+        else {
+            UIApplication.shared.openURL(self)
+        }
+#endif
+    }
+}
diff --git a/Sources/AcknowList/AcknowSwiftUI.swift b/Sources/AcknowList/AcknowSwiftUI.swift
@@ -69,9 +69,7 @@ public struct AcknowSwiftUIView: View {
                 acknowledgement = Acknow(title: acknowledgement.title, text: text, license: acknowledgement.license, repository: acknowledgement.repository)
 
             case .failure:
-#if os(iOS)
-                UIApplication.shared.open(repository)
-#endif
+                repository.openWithDefaultBrowser()
             }
         }
     }