Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1712 from omnivore-app/fix/ios-labels-view

Browse Source 
Use same UI for LabelsView as Apply Labels View
This commit is contained in:
Jackson Harper
2023-01-26 13:13:18 +08:00
committed by GitHub
parent 4c71332aed 409ca5ce6d
commit 68fcbae6dc
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift
View File

@ -11,17 +11,24 @@ struct LabelsView: View {
@State private var labelToRemove: LinkedItemLabel?
var body: some View {
Group {
#if os(iOS)
Form {
innerBody
List {
ForEach(viewModel.labels, id: \.id) { label in
HStack {
TextChip(feedItemLabel: label).allowsHitTesting(false)
Spacer()
Button(
action: {
labelToRemove = label
showDeleteConfirmation = true
},
label: { Image(systemName: "trash") }
)
}
#elseif os(macOS)
List {
innerBody
}
#endif
}
createLabelButton
}
.listStyle(PlainListStyle())
.navigationTitle(LocalText.labelsGeneric)
.alert("Are you sure you want to delete this label?", isPresented: $showDeleteConfirmation) {
Button("Delete Label", role: .destructive) {
if let label = labelToRemove {
@ -43,41 +50,26 @@ struct LabelsView: View {
.task { await viewModel.loadLabels(dataService: dataService, item: nil) }
}
private var innerBody: some View {
Group {
Section(footer: Text(LocalText.labelsPurposeDescription)) {
Button(
action: { viewModel.showCreateLabelModal = true },
label: {
HStack {
Image(systemName: "plus.circle.fill").foregroundColor(.green)
Text(LocalText.createLabelMessage).foregroundColor(.appGrayTextContrast)
Spacer()
}
}
)
.disabled(viewModel.isLoading)
}
if !viewModel.labels.isEmpty {
Section(header: Text(LocalText.labelsGeneric)) {
ForEach(viewModel.labels, id: \.id) { label in
HStack {
TextChip(feedItemLabel: label).allowsHitTesting(false)
Spacer()
Button(
action: {
labelToRemove = label
showDeleteConfirmation = true
},
label: { Image(systemName: "trash") }
)
}
}
var createLabelButton: some View {
Button(
action: { viewModel.showCreateLabelModal = true },
label: {
HStack {
Image(systemName: "tag").foregroundColor(.blue)
Text(
viewModel.labelSearchFilter.count > 0 ?
"Create: \"\(viewModel.labelSearchFilter)\" label" :
LocalText.createLabelMessage
).foregroundColor(.blue)
.font(Font.system(size: 14))
Spacer()
}
}
}
.navigationTitle(LocalText.labelsGeneric)
)
.buttonStyle(PlainButtonStyle())
.disabled(viewModel.isLoading)
.listRowSeparator(.hidden, edges: .bottom)
.padding(.vertical, 10)
}
}