Added conditions.

sparrowcode · Nov 24, 2024 · eef6b64 · eef6b64
1 parent 32acaaa
commit eef6b64
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 5 deletions.
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ let package = Package(
     name: "SwiftUIExtension",
     platforms: [
         .iOS(.v15), 
-        .watchOS(.v6),
+        .watchOS(.v8),
         .macOS(.v10_15)
     ],
     products: [

diff --git a/Sources/SwiftUIExtension/Compability/TransitionBlurReplace.swift b/Sources/SwiftUIExtension/Compability/TransitionBlurReplace.swift
@@ -10,7 +10,7 @@ extension View {
 struct TransitionBlurReplace: ViewModifier {
 
     func body(content: Content) -> some View {
-        if #available(iOS 18.0, *) {
+        if #available(iOS 18.0, watchOS 10.0, *) {
             content
                 .transition(.blurReplace.combined(with: .opacity))
         } else {

diff --git a/Sources/SwiftUIExtension/Extensions/SafeArea.swift b/Sources/SwiftUIExtension/Extensions/SafeArea.swift
@@ -15,6 +15,7 @@ extension View {
 
 // MARK: - Environment
 
+#if os(iOS)
 extension EnvironmentValues {
 
     public var safeAreaInsets: EdgeInsets {
@@ -25,7 +26,8 @@ extension EnvironmentValues {
 private struct SafeAreaInsetsKey: EnvironmentKey {
 
     static var defaultValue: EdgeInsets {
-        (UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.safeAreaInsets ?? .zero).insets
+        (UIApplication.shared.rootController?.view.window?.safeAreaInsets ?? .zero).insets
+        //(UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.safeAreaInsets ?? .zero).insets
     }
 }
 
@@ -35,3 +37,4 @@ private extension UIEdgeInsets {
         EdgeInsets(top: top, leading: left, bottom: bottom, trailing: right)
     }
 }
+#endif
diff --git a/Sources/SwiftUIExtension/Views/CustomBlurView.swift b/Sources/SwiftUIExtension/Views/CustomBlurView.swift
@@ -1,3 +1,4 @@
+#if canImport(SwiftUI) && canImport(UIKit) && os(iOS)
 import UIKit
 import SwiftUI
 
@@ -207,3 +208,4 @@ private extension UIVisualEffect {
         }
     }
 }
+#endif
diff --git a/Sources/SwiftUIExtension/Views/Mimicrate/ModalSheet/ModalSheet.swift b/Sources/SwiftUIExtension/Views/Mimicrate/ModalSheet/ModalSheet.swift
@@ -1,3 +1,4 @@
+#if os(iOS)
 import SwiftUI
 
 extension View {
@@ -21,4 +22,4 @@ extension View {
         return self.modifier(sheet)
     }
 }
-
+#endif
diff --git a/Sources/SwiftUIExtension/Views/Mimicrate/ModalSheet/ModalSheetModifier.swift b/Sources/SwiftUIExtension/Views/Mimicrate/ModalSheet/ModalSheetModifier.swift
@@ -1,3 +1,4 @@
+#if os(iOS)
 import SwiftUI
 import SwiftBoost
 
@@ -129,3 +130,4 @@ struct ModalSheetModifier<ModalContent: View, Selection: Hashable>: ViewModifier
     private var cornerRadius: CGFloat { UIScreen.main.displayCornerRadius - padding }
     private var presentDimissDuration: TimeInterval { 0.41 }
 }
+#endif
diff --git a/Sources/SwiftUIExtension/Views/Mimicrate/NativeSection.swift b/Sources/SwiftUIExtension/Views/Mimicrate/NativeSection.swift
@@ -89,6 +89,8 @@ public struct NativeSection<Content: View, Detail: View>: View {
         return Spaces.default_less
         #elseif os(visionOS)
         return Spaces.step
+        #else
+        return 0
         #endif
     }
 }

diff --git a/Sources/SwiftUIExtension/Views/Mimicrate/NavigationBarCloseButton.swift b/Sources/SwiftUIExtension/Views/Mimicrate/NavigationBarCloseButton.swift
@@ -1,4 +1,6 @@
+#if canImport(SwiftUI) && canImport(UIKit) && os(iOS)
 import SwiftUI
+import UIKit
 
 public struct NavigationBarCloseButton: UIViewRepresentable {
 
@@ -41,4 +43,4 @@ public struct NavigationBarCloseButton: UIViewRepresentable {
         }
     }
 }
-
+#endif