prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix edit title modal for macos

Browse source
This commit is contained in:
Satindar Dhillon 2022-06-27 21:34:14 -07:00
parent 1ea4b63f54
commit 776e35079b
2 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift
View file

@ -74,7 +74,7 @@ struct ApplyLabelsView: View {
}
)
#if os(macOS)
.buttonStyle(PlainButtonStyle())
.buttonStyle(PlainButtonStyle())
#endif
}
}

73
apple/OmnivoreKit/Sources/App/Views/LinkedItemTitleEditView.swift
View file

@ -63,30 +63,61 @@ struct LinkedItemTitleEditView: View {
}
var body: some View {
NavigationView {
editForm
.navigationTitle("Edit Title and Description")
Group {
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
iOSBody
#else
macOSBody
#endif
.toolbar {
ToolbarItem(placement: .barTrailing) {
Button(
action: {
viewModel.submit(dataService: dataService, item: item)
presentationMode.wrappedValue.dismiss()
},
label: { Text("Save").foregroundColor(.appGrayTextContrast) }
)
}
ToolbarItem(placement: .barLeading) {
Button(
action: { presentationMode.wrappedValue.dismiss() },
label: { Text("Cancel").foregroundColor(.appGrayTextContrast) }
)
}
}
}
.task { viewModel.load(item: item) }
}
#if os(iOS)
var iOSBody: some View {
NavigationView {
editForm
.navigationTitle("Edit Title and Description")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .barTrailing) {
Button(
action: {
viewModel.submit(dataService: dataService, item: item)
presentationMode.wrappedValue.dismiss()
},
label: { Text("Save").foregroundColor(.appGrayTextContrast) }
)
}
ToolbarItem(placement: .barLeading) {
Button(
action: { presentationMode.wrappedValue.dismiss() },
label: { Text("Cancel").foregroundColor(.appGrayTextContrast) }
)
}
}
}
}
#else
var macOSBody: some View {
editForm
.toolbar {
ToolbarItemGroup {
Button(
action: {
viewModel.submit(dataService: dataService, item: item)
presentationMode.wrappedValue.dismiss()
},
label: { Text("Save").foregroundColor(.appGrayTextContrast) }
)
Button(
action: { presentationMode.wrappedValue.dismiss() },
label: { Text("Cancel").foregroundColor(.appGrayTextContrast) }
)
}
}
.frame(minWidth: 400, minHeight: 400)
}
#endif
}