Merge pull request #798 from Infomaniak/toolbar-keyboard

fix(BottomBar): Ignore keyboard safe area
Infomaniak · Jun 13, 2023 · 0e09228 · 0e09228
2 parents 56d22b0 + a7e6382
commit 0e09228
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 25 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-core",
       "state" : {
-        "revision" : "cf001ba55dbf5f152353d66b55cd46350bd4b895"
+        "revision" : "e5fe8e03aa06375f20c8e40f4fae3a6af6e4d75e"
       }
     },
     {

diff --git a/Mail/Components/BottomBarView.swift b/Mail/Components/BottomBarView.swift
@@ -25,13 +25,14 @@ struct BottomBar<Items: View>: ViewModifier {
     @ViewBuilder var items: () -> Items
 
     func body(content: Content) -> some View {
-        content
-            .safeAreaInset(edge: .bottom) {
-                if isVisible {
-                    BottomBarView(items: items)
-                        .transition(.opacity)
-                }
+        VStack(spacing: 0) {
+            content
+            Spacer(minLength: 0)
+            if isVisible {
+                BottomBarView(items: items)
             }
+        }
+        .ignoresSafeArea(.keyboard, edges: .bottom)
     }
 }
 

diff --git a/Mail/Views/Thread List/ThreadListCell.swift b/Mail/Views/Thread List/ThreadListCell.swift
@@ -83,15 +83,13 @@ struct ThreadListCell: View {
     }
 
     private func didLongPressCell() {
-        withAnimation {
-            multipleSelectionViewModel.feedbackGenerator.prepare()
-            multipleSelectionViewModel.isEnabled.toggle()
-            if multipleSelectionViewModel.isEnabled {
-                @InjectService var matomo: MatomoUtils
-                matomo.track(eventWithCategory: .multiSelection, action: .longPress, name: "enable")
-                multipleSelectionViewModel.feedbackGenerator.impactOccurred()
-                multipleSelectionViewModel.toggleSelection(of: thread)
-            }
+        multipleSelectionViewModel.feedbackGenerator.prepare()
+        multipleSelectionViewModel.isEnabled.toggle()
+        if multipleSelectionViewModel.isEnabled {
+            @InjectService var matomo: MatomoUtils
+            matomo.track(eventWithCategory: .multiSelection, action: .longPress, name: "enable")
+            multipleSelectionViewModel.feedbackGenerator.impactOccurred()
+            multipleSelectionViewModel.toggleSelection(of: thread)
         }
     }
 }

diff --git a/Mail/Views/Thread List/ThreadListModifiers.swift b/Mail/Views/Thread List/ThreadListModifiers.swift
@@ -76,9 +76,7 @@ struct ThreadListToolbar: ViewModifier {
                     if multipleSelectionViewModel.isEnabled {
                         Button(MailResourcesStrings.Localizable.buttonCancel) {
                             matomo.track(eventWithCategory: .multiSelection, name: "cancel")
-                            withAnimation {
-                                multipleSelectionViewModel.isEnabled = false
-                            }
+                            multipleSelectionViewModel.isEnabled = false
                         }
                     } else {
                         if isCompactWindow {
@@ -160,9 +158,7 @@ struct ThreadListToolbar: ViewModifier {
                 .disabled(multipleSelectionViewModel.selectedItems.isEmpty)
             }
             .actionsPanel(actionsTarget: $multipleSelectionActionsTarget) {
-                withAnimation {
-                    multipleSelectionViewModel.isEnabled = false
-                }
+                multipleSelectionViewModel.isEnabled = false
             }
             .navigationTitle(
                 multipleSelectionViewModel.isEnabled

diff --git a/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift b/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift
@@ -100,9 +100,7 @@ import SwiftUI
         default:
             break
         }
-        withAnimation {
-            isEnabled = false
-        }
+        isEnabled = false
     }
 
     private func setActions() {