Merge pull request #2 from 15joeybloom/main

Remove unnecessary force-unwrapping
changemin · Apr 2, 2021 · 5045668 · 5045668
2 parents 4f5ffbf + ce4264e
commit 5045668
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Sources/LoadingButton/LoadingButton.swift b/Sources/LoadingButton/LoadingButton.swift
@@ -2,7 +2,7 @@ import SwiftUI
 
 public struct LoadingButton<Content: View>: View{
     @Binding var isLoading: Bool
-    var style: LoadingButtonStyle? = LoadingButtonStyle()
+    var style: LoadingButtonStyle
     let content: Content
     var action: () -> () = {}
 
@@ -22,20 +22,20 @@ public struct LoadingButton<Content: View>: View{
         }) {
             ZStack {
                 Rectangle()
-                    .fill(isLoading ? style!.loadingBackgroundColor : style!.backgroundColor)
-                    .frame(width: isLoading ? style!.height : style!.width, height: style!.height)
-                    .cornerRadius(isLoading ? style!.height/2 : style!.cornerRadius)
+                    .fill(isLoading ? style.loadingBackgroundColor : style.backgroundColor)
+                    .frame(width: isLoading ? style.height : style.width, height: style.height)
+                    .cornerRadius(isLoading ? style.height/2 : style.cornerRadius)
                     .animation(.easeInOut)
                 if isLoading {
-                    CircleLoadingBar(style: style!)
+                    CircleLoadingBar(style: style)
                 }
                 else {
                     VStack {
                         content.animation(.easeInOut)
                     }
                 }
             }
-        }.frame(width: style!.width, height: style!.height)
+        }.frame(width: style.width, height: style.height)
     }
 }