refactor: remove VStack from button, add button styling

Author: russellwheatley

FirebaseSwiftUI/FirebaseEmailAuthSwiftUI/Sources/FirebaseEmailAuthSwiftUI/Views/EmailAuth.swift

@@ -10,20 +10,17 @@ class EmailUtils {
   }
 }
 
-public struct EmailAuth<
-  StackStyle: FUIVStackStyle
->: View {
-  private var emailAuthButton: EmailAuthButton<StackStyle>?
-
-  public init(emailAuthButton: EmailAuthButton<StackStyle>? = nil) {
+public struct EmailAuth<EmailButtonStyle: ButtonStyle>: View {
+  private var emailAuthButton: EmailAuthButton<EmailButtonStyle>?
+  public init(emailAuthButton: EmailAuthButton<EmailButtonStyle>? = nil) {
     self.emailAuthButton = emailAuthButton
   }
 
   public var body: some View {
     if let emailAuthButton = emailAuthButton {
       emailAuthButton
     } else {
-      EmailAuthButton<DefaultVStackStyle>()
+      EmailAuthButton<DefaultEmailAuthButtonStyle>(buttonStyle: DefaultEmailAuthButtonStyle())
     }
   }
 }

FirebaseSwiftUI/FirebaseEmailAuthSwiftUI/Sources/FirebaseEmailAuthSwiftUI/Views/EmailAuthButton.swift

@@ -1,30 +1,23 @@
 import SwiftUI
 
-public protocol FUIVStackStyle {
-  associatedtype Body: View
-
-  @ViewBuilder func body(content: VStack<Button<Text>>) -> Body
-}
-
-public struct DefaultVStackStyle: FUIVStackStyle {
-  public init() {}
-
-  public func body(content: VStack<Button<Text>>) -> some View {
-    content
+public struct DefaultEmailAuthButtonStyle: ButtonStyle {
+  public func makeBody(configuration: Configuration) -> some View {
+    configuration.label
       .padding()
-      .background(Color.gray.opacity(0.2))
+      .background(Color.blue)
+      .foregroundColor(.white)
       .cornerRadius(10)
   }
 }
 
-public struct EmailAuthButton<StackStyle: FUIVStackStyle>: View {
+public struct EmailAuthButton<ButtonStyleType: ButtonStyle>: View {
   @State private var emailAuthView = false
   private var buttonText: String
-  private var vStackStyle: StackStyle?
+  private var buttonStyle: ButtonStyleType
 
-  public init(buttonText: String = "Sign in with email", vStackStyle: StackStyle? = nil) {
+  public init(buttonText: String = "Sign in with email", buttonStyle: ButtonStyleType) {
     self.buttonText = buttonText
-    self.vStackStyle = vStackStyle
+    self.buttonStyle = buttonStyle
   }
 
   public var body: some View {
@@ -36,14 +29,6 @@ public struct EmailAuthButton<StackStyle: FUIVStackStyle>: View {
       textView
     }
 
-    let vStackView = VStack {
-      buttonView
-    }
-
-    if let vStackStyle = vStackStyle {
-      vStackStyle.body(content: vStackView)
-    } else {
-      DefaultVStackStyle().body(content: vStackView)
-    }
+    buttonView.buttonStyle(buttonStyle)
   }
 }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExampleApp.swift

@@ -39,7 +39,7 @@ struct FirebaseSwiftUIExampleApp: App {
           }) {
             VStack {
               // method 2 of setting view modifier
-              EmailAuth<DefaultVStackStyle>()
+              EmailAuth<DefaultEmailAuthButtonStyle>()
             }
           }
         )