From 34d4b81fe86633ecda13bb39cc9b8b75fb6a92b4 Mon Sep 17 00:00:00 2001 From: Maxime Marinel Date: Sat, 21 Oct 2023 22:19:23 +0200 Subject: [PATCH] Fix bottom bar entry --- App/Features/Entry/EntryView.swift | 32 ++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/App/Features/Entry/EntryView.swift b/App/Features/Entry/EntryView.swift index 7fe5117c..e15b413a 100644 --- a/App/Features/Entry/EntryView.swift +++ b/App/Features/Entry/EntryView.swift @@ -37,23 +37,16 @@ struct EntryView: View { } .toolbar { ToolbarItem(placement: toolbarPlacement) { - HStack { - FontSizeSelectorView() - .buttonStyle(.plain) - #if os(iOS) - Spacer() - #endif - Menu(content: { - bottomBarButton - }, label: { - Label("Entry option", systemImage: "filemenu.and.selection") - .foregroundColor(.primary) - .labelStyle(.iconOnly) - }) - .accessibilityLabel("Entry option") - .frame(width: 28, height: 28) - .contentShape(Rectangle()) - } + Menu(content: { + bottomBarButton + }, label: { + Label("Entry option", systemImage: "filemenu.and.selection") + .foregroundColor(.primary) + .labelStyle(.iconOnly) + }) + .accessibilityLabel("Entry option") + .frame(width: 28, height: 28) + .contentShape(Rectangle()) .actionSheet(isPresented: $showDeleteConfirm) { ActionSheet( title: Text("Confirm delete?"), @@ -67,6 +60,11 @@ struct EntryView: View { ) } } + + ToolbarItem(placement: toolbarPlacement) { + FontSizeSelectorView() + .buttonStyle(.plain) + } } .sheet(isPresented: $showTag) { TagListFor(tagsForEntry: TagsForEntryPublisher(entry: entry))