Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add trending to custom menu items

This commit is contained in:
Marcin Czachurski 2023-10-23 07:56:32 +02:00
parent 9703d26656
commit 5aed65cb4d
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Vernissage/ViewModifiers/NavigationMenuButtons.swift
View File

@ -29,15 +29,6 @@ private struct NavigationMenuButtons: ViewModifier {
private let onViewModeIconTap: (MainView.ViewMode) -> Void private let onViewModeIconTap: (MainView.ViewMode) -> Void
private let imageFontSize = 20.0 private let imageFontSize = 20.0
private let customMenuItems: [MainView.ViewMode] = [
.home,
.local,
.federated,
.search,
.profile,
.notifications
]
@State private var displayedCustomMenuItems = [ @State private var displayedCustomMenuItems = [
SelectedMenuItemDetails(position: 1, viewMode: .home), SelectedMenuItemDetails(position: 1, viewMode: .home),
SelectedMenuItemDetails(position: 2, viewMode: .local), SelectedMenuItemDetails(position: 2, viewMode: .local),
@ -141,6 +132,7 @@ private struct NavigationMenuButtons: ViewModifier {
.padding(.vertical, 10) .padding(.vertical, 10)
.padding(.horizontal, 8) .padding(.horizontal, 8)
} }
.environment(\.menuOrder, .fixed)
} }
@ViewBuilder @ViewBuilder
@ -175,38 +167,25 @@ private struct NavigationMenuButtons: ViewModifier {
.padding(.vertical, 10) .padding(.vertical, 10)
.padding(.horizontal, 8) .padding(.horizontal, 8)
}.contextMenu { }.contextMenu {
self.listOfIconsView(displayedCustomMenuItem) MainNavigationOptions(hiddenMenuItems: Binding.constant([])) { viewMode in
}
}
@ViewBuilder
private func listOfIconsView(_ displayedCustomMenuItem: SelectedMenuItemDetails) -> some View {
ForEach(self.customMenuItems) { item in
Button {
withAnimation { withAnimation {
displayedCustomMenuItem.viewMode = item displayedCustomMenuItem.viewMode = viewMode
} }
// Saving in database. // Saving in database.
switch displayedCustomMenuItem.position { switch displayedCustomMenuItem.position {
case 1: case 1:
ApplicationSettingsHandler.shared.set(customNavigationMenuItem1: item.rawValue, modelContext: modelContext) ApplicationSettingsHandler.shared.set(customNavigationMenuItem1: viewMode.rawValue, modelContext: modelContext)
case 2: case 2:
ApplicationSettingsHandler.shared.set(customNavigationMenuItem2: item.rawValue, modelContext: modelContext) ApplicationSettingsHandler.shared.set(customNavigationMenuItem2: viewMode.rawValue, modelContext: modelContext)
case 3: case 3:
ApplicationSettingsHandler.shared.set(customNavigationMenuItem3: item.rawValue, modelContext: modelContext) ApplicationSettingsHandler.shared.set(customNavigationMenuItem3: viewMode.rawValue, modelContext: modelContext)
default: default:
break break
} }
self.hiddenMenuItems = self.displayedCustomMenuItems.map({ $0.viewMode }) self.hiddenMenuItems = self.displayedCustomMenuItems.map({ $0.viewMode })
MenuCustomizableTip().invalidate(reason: .actionPerformed) MenuCustomizableTip().invalidate(reason: .actionPerformed)
} label: {
Label {
Text(item.title, comment: "Menu item")
} icon: {
item.getImage(applicationState: applicationState)
}
} }
} }
} }
@ -222,9 +201,8 @@ private struct NavigationMenuButtons: ViewModifier {
} }
private func setCustomMenuItem(position: Int, viewMode: MainView.ViewMode) { private func setCustomMenuItem(position: Int, viewMode: MainView.ViewMode) {
if let displayedCustomMenuItem = self.displayedCustomMenuItems.first(where: { $0.position == position }), if let displayedCustomMenuItem = self.displayedCustomMenuItems.first(where: { $0.position == position }) {
let customMenuItem = self.customMenuItems.first(where: { $0 == viewMode }) { displayedCustomMenuItem.viewMode = viewMode
displayedCustomMenuItem.viewMode = customMenuItem
} }
} }
} }