iPad sheet alignment and side padding options

README.md

@@ -208,6 +208,10 @@ The ViewModifiers are used to customise the look and feel of the BottomSheet.
 
 `.enableFloatingIPadSheet(Bool)`: Makes it possible to make the sheet appear like on iPhone.
 
+`.iPadSheetAlignment(Alignment)`: Allows for different alignments of the sheet on iPad when enableFloatingIPadSheet is disabled.
+
+`.sheetSidePadding(CGFloat)`: Gives the bottom sheet horizontal padding on iPad when enableFloatingIPadSheet is disabled.
+
 `.onDismiss(() -> Void)`: A action that will be performed when the BottomSheet is dismissed.
 -  Please note that when you dismiss the BottomSheet yourself, by setting the bottomSheetPosition to .hidden, the action will not be called.
 

Sources/BottomSheet/BottomSheet+ViewModifiers/BottomSheet+SheetSidePadding.swift

@@ -0,0 +1,22 @@
+//
+//  BottomSheet+SheetSidePadding.swift
+//
+//  Created by Lucas Zischka.
+//  Copyright © 2022 Lucas Zischka. All rights reserved.
+//
+
+import Foundation
+
+public extension BottomSheet {
+
+    /// Gives horizontal padding to the sheet
+    ///
+    /// - Parameters:
+    ///   - padding: The padding to use for the bottom sheet.
+    ///
+    /// - Returns: A BottomSheet with the configured padding.
+    func sheetSidePadding(_ padding: CGFloat = 0.0) -> BottomSheet {
+        self.configuration.sheetSidePadding = padding
+        return self
+    }
+}

Sources/BottomSheet/BottomSheet+ViewModifiers/BottomSheet+iPadSheetAlignment.swift

@@ -0,0 +1,23 @@
+//
+//  BottomSheet+iPadSheetAlignment.swift
+//
+//  Created by Lucas Zischka.
+//  Copyright © 2022 Lucas Zischka. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+
+public extension BottomSheet {
+
+    /// Makes it possible to align the sheet at different places on iPad if floating sheet is disabled
+    ///
+    /// - Parameters:
+    ///   - alignment: An alignment for the bottom sheet
+    ///
+    /// - Returns: A BottomSheet that will align to what's specified
+    func iPadSheetAlignment(_ alignment: Alignment = .bottomLeading) -> BottomSheet {
+        self.configuration.iPadSheetAlignment = alignment
+        return self
+    }
+}

Sources/BottomSheet/BottomSheetView/BottomSheetView+HelperViews.swift

@@ -74,6 +74,11 @@
             .top,
             self.topPadding
         )
+        // Add side padding
+        .padding(
+            .horizontal,
+            self.configuration.sheetSidePadding
+        )
         // Make the BottomSheet transition via move
         .transition(.move(
             edge: self.isIPadFloatingOrMac ? .top : .bottom
@@ -181,7 +186,7 @@
                 // Main content
                 self.mainContent
                 // Make the main content drag-able if content drag is enabled
                 // highPriorityGesture is required to make dragging the bottom sheet work even when user starts dragging on buttons or other pressable items
                     .highPriorityGesture(
                         self.configuration.isContentDragEnabled && self.configuration.isResizable ?
                         self.dragGesture(with: geometry) : nil
@@ -402,4 +407,4 @@
             return 0
         }
     }
 }

Sources/BottomSheet/BottomSheetView/BottomSheetView.swift

@@ -51,7 +51,7 @@ internal struct BottomSheetView<HContent: View, MContent: View>: View {
                 // On iPad floating and Mac the BottomSheet is aligned to the top left
                 // On iPhone and iPad not floating it is aligned to the bottom center,
                 // in horizontal mode to the bottom left
-                alignment: self.isIPadFloatingOrMac ? .topLeading : .bottomLeading
+                alignment: self.isIPadFloatingOrMac ? .topLeading : self.configuration.iPadSheetAlignment
             ) {
                 // Hide everything when the BottomSheet is hidden
                 if !self.bottomSheetPosition.isHidden {

Sources/BottomSheet/Models/BottomSheetConfiguration.swift

@@ -28,7 +28,9 @@ internal class BottomSheetConfiguration: Equatable {
         lhs.isTapToDismissEnabled == rhs.isTapToDismissEnabled &&
         lhs.iPadFloatingSheet == rhs.iPadFloatingSheet &&
         lhs.sheetWidth == rhs.sheetWidth &&
-        lhs.accountForKeyboardHeight == rhs.accountForKeyboardHeight
+        lhs.accountForKeyboardHeight == rhs.accountForKeyboardHeight &&
+        lhs.iPadSheetAlignment == rhs.iPadSheetAlignment &&
+        lhs.sheetSidePadding == rhs.sheetSidePadding
     }
 
     var animation: Animation? = .spring(
@@ -61,4 +63,6 @@ internal class BottomSheetConfiguration: Equatable {
     var iPadFloatingSheet: Bool = true
     var sheetWidth: BottomSheetWidth = .platformDefault
     var accountForKeyboardHeight: Bool = false
+    var iPadSheetAlignment: Alignment = .bottomLeading
+    var sheetSidePadding: CGFloat = 0.0
 }