refactor: Remove Spacer() from BottomBarView (#1515)

Infomaniak · Aug 26, 2024 · 4cb6872 · 4cb6872
2 parents 2c322b5 + ddc13b5
commit 4cb6872
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 75 deletions.
diff --git a/Mail/Views/Search/SearchModifiers.swift b/Mail/Views/Search/SearchModifiers.swift
@@ -103,41 +103,39 @@ struct SearchToolbar: ViewModifier {
                 }
             }
             .bottomBar(isVisible: multipleSelectionViewModel.isEnabled) {
-                HStack(spacing: 0) {
-                    ForEach(multipleSelectionViewModel.toolbarActions) { action in
-                        ToolbarButton(
-                            text: action.shortTitle ?? action.title,
-                            icon: action.icon
-                        ) {
-                            let allMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
-                            multipleSelectionViewModel.disable()
-                            Task {
-                                matomo.trackBulkEvent(
-                                    eventWithCategory: .threadActions,
-                                    name: action.matomoName.capitalized,
-                                    numberOfItems: multipleSelectionViewModel.selectedItems.count
-                                )
-
-                                try await actionsManager.performAction(
-                                    target: allMessages,
-                                    action: action,
-                                    origin: .multipleSelection(
-                                        originFolder: viewModel.frozenSearchFolder,
-                                        nearestMessagesToMoveSheet: $messagesToMove
-                                    )
+                ForEach(multipleSelectionViewModel.toolbarActions) { action in
+                    ToolbarButton(
+                        text: action.shortTitle ?? action.title,
+                        icon: action.icon
+                    ) {
+                        let allMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
+                        multipleSelectionViewModel.disable()
+                        Task {
+                            matomo.trackBulkEvent(
+                                eventWithCategory: .threadActions,
+                                name: action.matomoName.capitalized,
+                                numberOfItems: multipleSelectionViewModel.selectedItems.count
+                            )
+
+                            try await actionsManager.performAction(
+                                target: allMessages,
+                                action: action,
+                                origin: .multipleSelection(
+                                    originFolder: viewModel.frozenSearchFolder,
+                                    nearestMessagesToMoveSheet: $messagesToMove
                                 )
+                            )
 
-                                viewModel.refreshSearchIfNeeded(action: action)
-                            }
+                            viewModel.refreshSearchIfNeeded(action: action)
                         }
                     }
+                }
 
-                    ToolbarButton(
-                        text: MailResourcesStrings.Localizable.buttonMore,
-                        icon: MailResourcesAsset.plusActions.swiftUIImage
-                    ) {
-                        multipleSelectedMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
-                    }
+                ToolbarButton(
+                    text: MailResourcesStrings.Localizable.buttonMore,
+                    icon: MailResourcesAsset.plusActions.swiftUIImage
+                ) {
+                    multipleSelectedMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
                 }
             }
             .actionsPanel(

diff --git a/Mail/Views/Thread List/ThreadListModifiers.swift b/Mail/Views/Thread List/ThreadListModifiers.swift
@@ -112,46 +112,44 @@ struct ThreadListToolbar: ViewModifier {
                     }
                 }
                 .bottomBar(isVisible: multipleSelectionViewModel.isEnabled) {
-                    HStack(spacing: 0) {
-                        ForEach(multipleSelectionViewModel.toolbarActions) { action in
-                            ToolbarButton(
-                                text: action.shortTitle ?? action.title,
-                                icon: action.icon
-                            ) {
-                                let allMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
-                                multipleSelectionViewModel.disable()
-                                let originFolder = viewModel.frozenFolder
-                                Task {
-                                    matomo.trackBulkEvent(
-                                        eventWithCategory: .threadActions,
-                                        name: action.matomoName.capitalized,
-                                        numberOfItems: multipleSelectionViewModel.selectedItems.count
-                                    )
-
-                                    try await actionsManager.performAction(
-                                        target: allMessages,
-                                        action: action,
-                                        origin: .multipleSelection(
-                                            originFolder: originFolder,
-                                            nearestFlushAlert: $flushAlert,
-                                            nearestMessagesToMoveSheet: $messagesToMove
-                                        )
-                                    )
-                                }
-                            }
-                            .accessibilityLabel(action.title)
-                            .accessibilityAddTraits(.isButton)
-                        }
-
+                    ForEach(multipleSelectionViewModel.toolbarActions) { action in
                         ToolbarButton(
-                            text: MailResourcesStrings.Localizable.buttonMore,
-                            icon: MailResourcesAsset.plusActions.swiftUIImage
+                            text: action.shortTitle ?? action.title,
+                            icon: action.icon
                         ) {
-                            multipleSelectedMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
+                            let allMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
+                            multipleSelectionViewModel.disable()
+                            let originFolder = viewModel.frozenFolder
+                            Task {
+                                matomo.trackBulkEvent(
+                                    eventWithCategory: .threadActions,
+                                    name: action.matomoName.capitalized,
+                                    numberOfItems: multipleSelectionViewModel.selectedItems.count
+                                )
+
+                                try await actionsManager.performAction(
+                                    target: allMessages,
+                                    action: action,
+                                    origin: .multipleSelection(
+                                        originFolder: originFolder,
+                                        nearestFlushAlert: $flushAlert,
+                                        nearestMessagesToMoveSheet: $messagesToMove
+                                    )
+                                )
+                            }
                         }
-                        .accessibilityLabel(MailResourcesStrings.Localizable.buttonMore)
+                        .accessibilityLabel(action.title)
                         .accessibilityAddTraits(.isButton)
                     }
+
+                    ToolbarButton(
+                        text: MailResourcesStrings.Localizable.buttonMore,
+                        icon: MailResourcesAsset.plusActions.swiftUIImage
+                    ) {
+                        multipleSelectedMessages = multipleSelectionViewModel.selectedItems.threads.flatMap(\.messages)
+                    }
+                    .accessibilityLabel(MailResourcesStrings.Localizable.buttonMore)
+                    .accessibilityAddTraits(.isButton)
                 }
                 .actionsPanel(
                     messages: $multipleSelectedMessages,

diff --git a/Mail/Views/Thread/ThreadView.swift b/Mail/Views/Thread/ThreadView.swift
@@ -166,13 +166,11 @@ struct ThreadView: View {
                             .sheetViewStyle()
                     }
                 }
-                Spacer()
             }
             ActionsPanelButton(messages: thread.messages.toArray(), originFolder: thread.folder, panelSource: .messageList) {
                 ToolbarButtonLabel(text: MailResourcesStrings.Localizable.buttonMore,
                                    icon: MailResourcesAsset.plusActions.swiftUIImage)
             }
-            .frame(maxWidth: .infinity)
         }
         .customAlert(item: $nearestFlushAlert) { item in
             FlushFolderAlertView(flushAlert: item)

diff --git a/MailCoreUI/Components/BottomBarView.swift b/MailCoreUI/Components/BottomBarView.swift
@@ -47,23 +47,23 @@ public struct BottomBarView<Items: View>: View {
     @State private var hasBottomSafeArea: Bool
     @State private var snackBarAwareModifier: SnackBarAwareModifier
 
-    @ViewBuilder let items: () -> Items
+    private let items: Items
 
     public init(
         hasBottomSafeArea: Bool = true,
         snackBarAwareModifier: SnackBarAwareModifier = SnackBarAwareModifier(inset: 0),
-        items: @escaping () -> Items
+        items: () -> Items
     ) {
         self.hasBottomSafeArea = hasBottomSafeArea
         self.snackBarAwareModifier = snackBarAwareModifier
-        self.items = items
+        self.items = items()
     }
 
     public var body: some View {
         HStack {
-            Spacer(minLength: IKPadding.small)
-            items()
-            Spacer(minLength: IKPadding.small)
+            items
+                .padding(.horizontal, value: .small)
+                .frame(maxWidth: .infinity)
         }
         .modifier(snackBarAwareModifier)
         .padding(.top, value: .small)
@@ -91,7 +91,10 @@ public struct BottomBarView<Items: View>: View {
         }
         .navigationTitle("Title")
         .bottomBar {
-            Text("Coucou")
+            Text("C1")
+            Text("C2")
+            Text("C3")
+            Text("C4")
         }
     }
 }
diff --git a/MailCoreUI/Components/ToolbarButton.swift b/MailCoreUI/Components/ToolbarButton.swift
@@ -61,7 +61,6 @@ public struct ToolbarButton: View {
         Button(action: action) {
             ToolbarButtonLabel(text: text, icon: icon)
         }
-        .frame(maxWidth: .infinity)
     }
 }