diff --git a/Multiplatform/Shared/Sidebar/SidebarToolbarModel.swift b/Multiplatform/Shared/Sidebar/SidebarToolbarModel.swift index d2fe4cea2..d5b3ad00d 100644 --- a/Multiplatform/Shared/Sidebar/SidebarToolbarModel.swift +++ b/Multiplatform/Shared/Sidebar/SidebarToolbarModel.swift @@ -20,7 +20,6 @@ class SidebarToolbarModel: ObservableObject { sheetToShow != .none ? (showSheet = true) : (showSheet = false) } } - @Published var showActionSheet: Bool = false @Published var showAddSheet: Bool = false } diff --git a/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift b/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift index c66ce0ed1..9d604c2a5 100644 --- a/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift +++ b/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift @@ -68,21 +68,14 @@ struct SidebarToolbarModifier: ViewModifier { } ToolbarItem(placement: .bottomBar, content: { - Button { - viewModel.showActionSheet = true - } label: { + Menu(content: { + Button { viewModel.sheetToShow = .web } label: { Text("Add Web Feed") } + Button { viewModel.sheetToShow = .twitter } label: { Text("Add Twitter Feed") } + Button { viewModel.sheetToShow = .reddit } label: { Text("Add Reddit Feed") } + Button { viewModel.sheetToShow = .folder } label: { Text("Add Folder") } + }, label: { AppAssets.addMenuImage.font(.title3) - } - .help("Add") - .actionSheet(isPresented: $viewModel.showActionSheet) { - ActionSheet(title: Text("Add"), buttons: [ - .cancel(), - .default(Text("Add Web Feed"), action: { viewModel.sheetToShow = .web }), - .default(Text("Add Twitter Feed")), - .default(Text("Add Reddit Feed")), - .default(Text("Add Folder"), action: { viewModel.sheetToShow = .folder }) - ]) - } + }) }) }