Fix requested changes

Rename background to backgroundColor Remove new option in the deprecated initializer
joogps · May 18, 2022 · cad72b9 · cad72b9
1 parent 7559134
commit cad72b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Sources/SlideOverCard/Modifiers.swift b/Sources/SlideOverCard/Modifiers.swift
@@ -8,21 +8,21 @@
 import SwiftUI
 
 extension View {
-    public func slideOverCard<Content: View>(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], background: Color = Color(.systemGray6), @ViewBuilder content: @escaping () -> Content) -> some View {
+    public func slideOverCard<Content: View>(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], backgroundColor: Color = Color(.systemGray6), @ViewBuilder content: @escaping () -> Content) -> some View {
         return ZStack {
             self
             SlideOverCard(isPresented: isPresented,
                           onDismiss: onDismiss,
                           options: options,
-                          background: background) {
+                          backgroundColor: backgroundColor) {
                 content()
             }
         }
     }
 
-    public func slideOverCard<Item: Identifiable, Content: View>(item: Binding<Item?>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], background: Color = Color(.systemGray6), @ViewBuilder content: @escaping (Item) -> Content) -> some View {
+    public func slideOverCard<Item: Identifiable, Content: View>(item: Binding<Item?>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], backgroundColor: Color = Color(.systemGray6), @ViewBuilder content: @escaping (Item) -> Content) -> some View {
         let binding = Binding(get: { item.wrappedValue != nil }, set: { if !$0 { item.wrappedValue = nil } })
-        return self.slideOverCard(isPresented: binding, onDismiss: onDismiss, options: options, background: background, content: {
+        return self.slideOverCard(isPresented: binding, onDismiss: onDismiss, options: options, backgroundColor: backgroundColor, content: {
             if let item = item.wrappedValue {
                 content(item)
             }

diff --git a/Sources/SlideOverCard/SlideOverCard.swift b/Sources/SlideOverCard/SlideOverCard.swift
@@ -12,18 +12,18 @@ public struct SlideOverCard<Content: View>: View {
     let onDismiss: (() -> Void)?
     var options: SOCOptions
     let content: Content
-    let background: Color
+    let backgroundColor: Color
 
-    public init(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], background: Color = Color(.systemGray6), content: @escaping () -> Content) {
+    public init(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, options: SOCOptions = [], backgroundColor: Color = Color(.systemGray6), content: @escaping () -> Content) {
         self.isPresented = isPresented
         self.onDismiss = onDismiss
         self.options = options
-        self.background = background
+        self.backgroundColor = backgroundColor
         self.content = content()
     }
 
     @available(*, deprecated, message: "Replace option parameters with the new option set.")
-    public init(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, dragEnabled: Binding<Bool> = .constant(true), dragToDismiss: Binding<Bool> = .constant(true), displayExitButton: Binding<Bool> = .constant(true), background: Color = Color(.systemGray6), content: @escaping () -> Content) {
+    public init(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, dragEnabled: Binding<Bool> = .constant(true), dragToDismiss: Binding<Bool> = .constant(true), displayExitButton: Binding<Bool> = .constant(true), content: @escaping () -> Content) {
         self.isPresented = isPresented
         self.onDismiss = onDismiss
 
@@ -33,7 +33,7 @@ public struct SlideOverCard<Content: View>: View {
         if !displayExitButton.wrappedValue { options.insert(.hideExitButton) }
 
         self.options = options
-        self.background = background
+        self.backgroundColor = Color(.systemGray6)
         self.content = content()
     }
 
@@ -90,7 +90,7 @@ public struct SlideOverCard<Content: View>: View {
                 .padding([.horizontal, options.contains(.hideExitButton) ? .vertical : .bottom], 14)
         }.padding(20)
         .background(RoundedRectangle(cornerRadius: 38.5, style: .continuous)
-                        .fill(background))
+                        .fill(backgroundColor))
         .clipShape(RoundedRectangle(cornerRadius: 38.5, style: .continuous))
         .offset(x: 0, y: viewOffset/pow(2, abs(viewOffset)/500+1))
         .gesture(