added presentationDetents and Radius to UIKitBackend

Author: MiaKoring

Examples/Sources/WindowingExample/WindowingApp.swift

@@ -87,7 +87,8 @@ struct SheetDemo: View {
         .sheet(isPresented: $isShortTermSheetPresented) {
             Text("I'm only here for 5s")
                 .padding(20)
-                .presentationCornerRadius(2)
+                .presentationDetents([.height(150), .medium, .large])
+                .presentationCornerRadius(10)
         }
     }
 
@@ -147,6 +148,7 @@ struct WindowingApp: App {
                     Divider()
 
                     SheetDemo()
+                        .padding(.bottom, 20)
                 }
                 .padding(20)
             }

Sources/AppKitBackend/AppKitBackend.swift

@@ -1734,10 +1734,6 @@ public final class AppKitBackend: AppBackend {
             NSApplication.shared.stopModal()
         }
     }
-
-    public func setPresentationCornerRadius(of sheet: NSCustomSheet, to radius: Int) {
-        print("setting Sheet Corner Radius is unavailable on macOS and will be ignored")
-    }
 }
 
 public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -641,8 +641,8 @@ public protocol AppBackend: Sendable {
     ///
     /// - Parameters:
     ///   - sheet: The sheet to apply the corner radius to.
-    ///   - radius: The corner radius in pixels.
-    func setPresentationCornerRadius(of sheet: Sheet, to radius: Int)
+    ///   - radius: The corner radius
+    func setPresentationCornerRadius(of sheet: Sheet, to radius: Double)
 
     /// Sets the available detents (heights) for a sheet presentation.
     ///
@@ -778,6 +778,12 @@ extension AppBackend {
         Foundation.exit(1)
     }
 
+    private func ignored(_ function: String = #function) {
+        print(
+            "\(type(of: self)): \(function) is being ignored\nConsult at the documentation for further information."
+        )
+    }
+
     // MARK: System
 
     public func openExternalURL(_ url: URL) throws {
@@ -1237,11 +1243,11 @@ extension AppBackend {
         todo()
     }
 
-    public func setPresentationCornerRadius(of sheet: Sheet, to radius: Int) {
-        todo()
+    public func setPresentationCornerRadius(of sheet: Sheet, to radius: Double) {
+        ignored()
     }
 
     public func setPresentationDetents(of sheet: Sheet, to detents: [PresentationDetent]) {
-        todo()
+        ignored()
     }
 }

Sources/SwiftCrossUI/Values/PresentationDetent.swift

@@ -7,10 +7,12 @@ public enum PresentationDetent: Sendable, Hashable {
     case large
 
     /// A detent at a custom fractional height of the available space.
+    /// falling back to medium on iOS 15
     /// - Parameter fraction: A value between 0 and 1 representing the fraction of available height.
     case fraction(Double)
 
     /// A detent at a specific fixed height in pixels.
-    /// - Parameter height: The height in pixels.
-    case height(Int)
+    /// falling back to medium on iOS 15
+    /// - Parameter height: The height
+    case height(Double)
 }

Sources/SwiftCrossUI/ViewGraph/PreferenceValues.swift

@@ -13,12 +13,12 @@ public struct PreferenceValues: Sendable {
     public var presentationDetents: [PresentationDetent]?
 
     /// The corner radius for a sheet presentation. Only applies to the top-level view in a sheet.
-    public var presentationCornerRadius: Int?
+    public var presentationCornerRadius: Double?
 
     public init(
         onOpenURL: (@Sendable @MainActor (URL) -> Void)?,
         presentationDetents: [PresentationDetent]? = nil,
-        presentationCornerRadius: Int? = nil
+        presentationCornerRadius: Double? = nil
     ) {
         self.onOpenURL = onOpenURL
         self.presentationDetents = presentationDetents

Sources/SwiftCrossUI/Views/Modifiers/Style/PresentationCornerRadiusModifier.swift

@@ -11,9 +11,12 @@ extension View {
     /// This modifier only affects the sheet presentation itself when applied to the
     /// top-level view within a sheet. It does not affect the content's corner radius.
     ///
+    /// supported platforms: iOS (ignored on unsupported platforms)
+    /// ignored on: older than iOS 15
+    ///
     /// - Parameter radius: The corner radius in pixels.
     /// - Returns: A view with the presentation corner radius preference set.
-    public func presentationCornerRadius(_ radius: Int) -> some View {
+    public func presentationCornerRadius(_ radius: Double) -> some View {
         preference(key: \.presentationCornerRadius, value: radius)
     }
 }

Sources/SwiftCrossUI/Views/Modifiers/Style/PresentationDetentsModifier.swift

@@ -5,6 +5,10 @@ extension View {
     /// top-level view within a sheet. It allows users to resize the sheet to different
     /// predefined heights.
     ///
+    /// supported platforms: iOS (ignored on unsupported platforms)
+    /// ignored on: older than iOS 15
+    /// fraction and height fall back to medium on iOS 15 and work as you'd expect on >=16
+    ///
     /// - Parameter detents: A set of detents that the sheet can be resized to.
     /// - Returns: A view with the presentation detents preference set.
     public func presentationDetents(_ detents: Set<PresentationDetent>) -> some View {

Sources/UIKitBackend/UIKitBackend+Sheet.swift

@@ -7,7 +7,6 @@ extension UIKitBackend {
     public func createSheet() -> CustomSheet {
         let sheet = CustomSheet()
         sheet.modalPresentationStyle = .formSheet
-        //sheet.transitioningDelegate = CustomSheetTransitioningDelegate()
 
         return sheet
     }
@@ -29,6 +28,59 @@ extension UIKitBackend {
     public func dismissSheet(_ sheet: CustomSheet, window: UIWindow?) {
         sheet.dismiss(animated: true)
     }
+
+    public func setPresentationDetents(of sheet: CustomSheet, to detents: [PresentationDetent]) {
+        if #available(iOS 15.0, *) {
+            if let sheetPresentation = sheet.sheetPresentationController {
+                sheetPresentation.detents = detents.map {
+                    switch $0 {
+                        case .medium: return .medium()
+                        case .large: return .large()
+                        case .fraction(let fraction):
+                            if #available(iOS 16.0, *) {
+                                return .custom(
+                                    identifier: .init("Fraction:\(fraction)"),
+                                    resolver: { context in
+                                        context.maximumDetentValue * fraction
+                                    })
+                            } else {
+                                return .medium()
+                            }
+                        case .height(let height):
+                            if #available(iOS 16.0, *) {
+                                return .custom(
+                                    identifier: .init("Height:\(height)"),
+                                    resolver: { context in
+                                        height
+                                    })
+                            } else {
+                                return .medium()
+                            }
+                    }
+                }
+            }
+        } else {
+            #if DEBUG
+                print(
+                    "your current OS Version doesn't support variable sheet heights.\n Setting presentationDetents is only available from iOS 15.0"
+                )
+            #endif
+        }
+    }
+
+    public func setPresentationCornerRadius(of sheet: CustomSheet, to radius: Double) {
+        if #available(iOS 15.0, *) {
+            if let sheetController = sheet.sheetPresentationController {
+                sheetController.preferredCornerRadius = radius
+            }
+        } else {
+            #if DEBUG
+                print(
+                    "your current OS Version doesn't support variable sheet corner radii.\n Setting them is only available from iOS 15.0"
+                )
+            #endif
+        }
+    }
 }
 
 public final class CustomSheet: UIViewController {