Add animation of showing filter fields

swiftyfinch · May 3, 2024 · 67214e6 · 67214e6
1 parent bdf1060
commit 67214e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/XTree/XTree/Modules/Main/MainView.swift b/XTree/XTree/Modules/Main/MainView.swift
@@ -15,13 +15,15 @@ struct MainView: View {
 
     var body: some View {
         VStack(spacing: 0) {
+            Color(.background).frame(height: 40).zIndex(2)
             if state.toolbar.isFiltersBlockShown {
                 FiltersView(
                     filtersState: $state.filters,
                     focusState: _focusState,
                     onSubmit: update
                 )
                 .padding(.horizontal, 12)
+                .transition(.move(edge: .top).combined(with: .blurReplace))
             }
             ZStack {
                 Color.clear
@@ -36,6 +38,7 @@ struct MainView: View {
                 .opacity(!state.toolbar.isProcessing && (state.isInDropArea || state.tree == nil) ? 1 : 0)
             }
         }
+        .ignoresSafeArea()
         .toolbar {
             ToolBarView(
                 state: $state.toolbar,

diff --git a/XTree/XTree/Modules/Main/ToolBarView.swift b/XTree/XTree/Modules/Main/ToolBarView.swift
@@ -18,8 +18,11 @@ struct ToolBarView: View {
     var body: some View {
         Button(action: {
             if focusState != nil { restore = focusState }
-            state.isFiltersBlockShown.toggle()
-            if focusState == nil { focusState = restore ?? .roots }
+            withAnimation(.easeInOut(duration: 0.3), {
+                state.isFiltersBlockShown.toggle()
+            }, completion: {
+                if focusState == nil { focusState = restore ?? .roots }
+            })
         }, label: {
             Image(systemName: "magnifyingglass.circle.fill")
                 .imageScale(.large)