stripped some more of the code to make it more dynamic

josephjoeljo · Jun 8, 2024 · 5e8363e · 5e8363e
1 parent b0cb489
commit 5e8363e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 91 deletions.
diff --git a/Sources/SwiftToast/ToastView.swift b/Sources/SwiftToast/ToastView.swift
diff --git a/Sources/SwiftToast/ToastViewModifier.swift b/Sources/SwiftToast/ToastViewModifier.swift
@@ -11,20 +11,21 @@ import Foundation
 public struct ToastViewModifier: ViewModifier {
 
     @Binding var isPresented: Bool
-    var position: DisplayPosition
+    @Binding var position: DisplayPosition
+    @Binding var toastContent: () -> any View
 
     public func body(content: Content) -> some View {
         switch position {
         case .top:
             return content
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .overlay(alignment: .top) {
-                    ToastViewer()
+                    AnyView(toastContent())
                         .onChange(of: isPresented) { newValue in
                             guard newValue == true else {
                                 return
                             }
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 5) {
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
                                 withAnimation(.easeInOut) {
                                     isPresented = false
                                 }
@@ -35,12 +36,12 @@ public struct ToastViewModifier: ViewModifier {
             return content
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .overlay(alignment: .bottom) {
-                    ToastViewer()
+                    AnyView(toastContent())
                         .onChange(of: isPresented) { newValue in
                             guard newValue == true else {
                                 return
                             }
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 5) {
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
                                 withAnimation(.easeInOut) {
                                     isPresented = false
                                 }
@@ -49,49 +50,11 @@ public struct ToastViewModifier: ViewModifier {
                 }
         }
     }
-
-    @ViewBuilder func ToastViewer() -> some View {
-        if isPresented {
-            switch position {
-            case .top:
-                withAnimation {
-                    ToastView {
-                        HStack {
-                            Image(systemName: "exclamationmark.triangle")
-                                .foregroundColor(.white)
-                            Text("Message")
-                                .foregroundColor(.white)
-                        }
-                        .lineLimit(2)
-                        .fixedSize(horizontal: false, vertical: true)
-                    }
-                    .offset(y: 15)
-                    .transition(.offset(y: -1000))
-                }
-            case .bottom:
-                withAnimation {
-                    ToastView {
-                        HStack {
-                            Image(systemName: "exclamationmark.triangle")
-                                .foregroundColor(.white)
-                            Text("Message")
-                                .foregroundColor(.white)
-                        }
-                        .lineLimit(2)
-                        .fixedSize(horizontal: false, vertical: true)
-                    }
-                    .offset(y: -20)
-                    .transition(.offset(y: 1000))
-                }
-            }
-        }
-    }
-
 }
 
 extension View {
 
-    public func toast(isPresented: Binding<Bool>, position: DisplayPosition) -> some View {
-        self.modifier(ToastViewModifier(isPresented: isPresented, position: position))
+    public func toast(isPresented: Binding<Bool>, position: Binding<DisplayPosition>, content: Binding<() -> any View>) -> some View {
+        self.modifier(ToastViewModifier(isPresented: isPresented, position: position, toastContent: content))
     }
 }