sheet finally complete

Aemi-Studio · Jul 14, 2024 · 8875972 · 8875972
1 parent ec4ce35
commit 8875972
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/Bilbary for iPhone/Viiews/BilbaryView.swift b/Bilbary for iPhone/Viiews/BilbaryView.swift
@@ -12,12 +12,6 @@ struct BilbaryView: View {
     @State
     private var coordinator = SheetCoordinator()
 
-    @State
-    private var tabBarShown: Bool = false
-
-    @State
-    private var sheetOffset: Double = 100
-
     var body: some View {
         ZStack {
             ZStack {
@@ -27,20 +21,10 @@ struct BilbaryView: View {
                     //                    Spacer()
                 }.padding()
                 .onTapGesture {
-                    tabBarShown.toggle()
-                    if tabBarShown {
-                        withAnimation(.easeInOut(duration: 0.2)) {
-                            sheetOffset = 0
-                        }
-                    } else {
-                        withAnimation(.easeInOut(duration: 0.2)) {
-                            sheetOffset = 100
-                        }
-                    }
+                    coordinator.tabBarShown.toggle()
                 }
             }
             CustomSheetView()
-                .offset(y: sheetOffset)
                 .environment(coordinator)
         }
     }

diff --git a/Bilbary for iPhone/Viiews/CustomSheetView.swift b/Bilbary for iPhone/Viiews/CustomSheetView.swift
@@ -89,6 +89,20 @@ struct CustomSheetView: View {
                 appUsageTracker.endSession(to: context)
             }
         }
+        .onChange(of: coordinator.tabBarShown) {
+            if coordinator.tabBarShown {
+
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    coordinator.offset = UIScreen.main.bounds.height * 0.85
+                }
+            } else {
+
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    coordinator.offset = UIScreen.main.bounds.height * 1.1
+
+                }
+            }
+        }
         .background(.ultraThinMaterial)
         .cornerRadius(20.0)
         .offset(y: coordinator.offset)

diff --git a/Bilbary for iPhone/iiPhone Models/SheetCoordinator.swift b/Bilbary for iPhone/iiPhone Models/SheetCoordinator.swift
@@ -17,9 +17,10 @@ class SheetCoordinator {
         case top
     }
 
+    var tabBarShown: Bool = false
     var sheetOffset: Double = 0
 
-    var offset: Double = UIScreen.main.bounds.height * 0.8
+    var offset: Double = UIScreen.main.bounds.height * 1.1
     var offsetAnchor: CGFloat?
 
     var deltaOffset: CGFloat = 0