Inventory screen selection mode update
This commit is contained in:
@@ -28,13 +28,25 @@ final class InventoryViewModel {
|
|||||||
errorMessage = "Failed to delete"
|
errorMessage = "Failed to delete"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func deleteSelected(ids: Set<String>) async {
|
||||||
|
for id in ids {
|
||||||
|
guard let chemical = chemicals.first(where: { $0.id == id }) else { continue }
|
||||||
|
do {
|
||||||
|
try await client.delete(id: chemical.id)
|
||||||
|
chemicals.removeAll { $0.id == id }
|
||||||
|
} catch {
|
||||||
|
errorMessage = "Failed to delete some items"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct InventoryView: View {
|
struct InventoryView: View {
|
||||||
@State private var viewModel = InventoryViewModel()
|
@State private var viewModel = InventoryViewModel()
|
||||||
@State private var showAddSheet = false
|
|
||||||
@State private var showScanSheet = false
|
|
||||||
@State private var addMode: AddMode?
|
@State private var addMode: AddMode?
|
||||||
|
@State private var isSelectMode = false
|
||||||
|
@State private var selectedIDs: Set<String> = []
|
||||||
|
|
||||||
enum AddMode: String, Identifiable {
|
enum AddMode: String, Identifiable {
|
||||||
case manual, scan
|
case manual, scan
|
||||||
@@ -56,38 +68,94 @@ struct InventoryView: View {
|
|||||||
} else {
|
} else {
|
||||||
List {
|
List {
|
||||||
ForEach(viewModel.chemicals) { chemical in
|
ForEach(viewModel.chemicals) { chemical in
|
||||||
NavigationLink(destination: ChemicalDetailView(chemical: chemical)) {
|
if isSelectMode {
|
||||||
ChemicalRowView(chemical: chemical)
|
Button {
|
||||||
|
if selectedIDs.contains(chemical.id) {
|
||||||
|
selectedIDs.remove(chemical.id)
|
||||||
|
} else {
|
||||||
|
selectedIDs.insert(chemical.id)
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
Image(systemName: selectedIDs.contains(chemical.id) ? "checkmark.circle.fill" : "circle")
|
||||||
|
.foregroundStyle(selectedIDs.contains(chemical.id) ? .blue : .secondary)
|
||||||
|
.font(.title3)
|
||||||
|
.animation(.easeInOut(duration: 0.15), value: selectedIDs.contains(chemical.id))
|
||||||
|
ChemicalRowView(chemical: chemical)
|
||||||
|
}
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.contentShape(Rectangle())
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
} else {
|
||||||
|
NavigationLink(destination: ChemicalDetailView(chemical: chemical)) {
|
||||||
|
ChemicalRowView(chemical: chemical)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading) // 📍 Force it to fill the row
|
||||||
|
.contentShape(Rectangle()) // 📍 Make the transparent space tappable
|
||||||
|
}
|
||||||
|
.simultaneousGesture(
|
||||||
|
LongPressGesture(minimumDuration: 0.5).onEnded { _ in
|
||||||
|
withAnimation {
|
||||||
|
isSelectMode = true
|
||||||
|
selectedIDs = [chemical.id]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onDelete { indexSet in
|
.onDelete(perform: isSelectMode ? nil : { indexSet in
|
||||||
for index in indexSet {
|
for index in indexSet {
|
||||||
let chemical = viewModel.chemicals[index]
|
let chemical = viewModel.chemicals[index]
|
||||||
Task { await viewModel.delete(chemical: chemical) }
|
Task { await viewModel.delete(chemical: chemical) }
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
}
|
}
|
||||||
.refreshable {
|
.refreshable {
|
||||||
await viewModel.loadChemicals()
|
await viewModel.loadChemicals()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Inventory")
|
.navigationTitle(isSelectMode ? "\(selectedIDs.count) Selected" : "Inventory")
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .topBarTrailing) {
|
if isSelectMode {
|
||||||
Menu {
|
ToolbarItem(placement: .topBarLeading) {
|
||||||
Button {
|
Button("Cancel") {
|
||||||
addMode = .scan
|
withAnimation {
|
||||||
} label: {
|
isSelectMode = false
|
||||||
Label("Scan Label", systemImage: "camera.fill")
|
selectedIDs = []
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Button {
|
}
|
||||||
addMode = .manual
|
ToolbarItem(placement: .topBarTrailing) {
|
||||||
|
Button(role: .destructive) {
|
||||||
|
Task {
|
||||||
|
await viewModel.deleteSelected(ids: selectedIDs)
|
||||||
|
withAnimation {
|
||||||
|
isSelectMode = false
|
||||||
|
selectedIDs = []
|
||||||
|
}
|
||||||
|
}
|
||||||
} label: {
|
} label: {
|
||||||
Label("Manual Entry", systemImage: "square.and.pencil")
|
Text("Delete (\(selectedIDs.count))")
|
||||||
|
}
|
||||||
|
.disabled(selectedIDs.isEmpty)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ToolbarItem(placement: .topBarTrailing) {
|
||||||
|
Menu {
|
||||||
|
Button {
|
||||||
|
addMode = .scan
|
||||||
|
} label: {
|
||||||
|
Label("Scan Label", systemImage: "camera.fill")
|
||||||
|
}
|
||||||
|
Button {
|
||||||
|
addMode = .manual
|
||||||
|
} label: {
|
||||||
|
Label("Manual Entry", systemImage: "square.and.pencil")
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
Image(systemName: "plus")
|
||||||
}
|
}
|
||||||
} label: {
|
|
||||||
Image(systemName: "plus")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user