Skip to content

Release 2.5.0 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dev-Fabi merged 2 commits into from
Aug 27, 2025
Merged

Release 2.5.0 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da80d62
Fix product search loading
dev-Fabi Aug 27, 2025
ca10361
Fix deprecation warning
dev-Fabi Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions WaiterRobot/Features/Order/OrderScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ import WRCore
struct OrderScreen: View {
@EnvironmentObject var navigator: UIPilot<Screen>

@State private var showProductSearch: Bool
@State private var showProductSearch: Bool = false
@State private var showAbortOrderConfirmationDialog = false

@StateObject private var viewModel: ObservableOrderViewModel
private let table: shared.Table
private let initialItemId: KotlinLong?

init(table: shared.Table, initialItemId: KotlinLong?) {
self.table = table
_viewModel = StateObject(wrappedValue: ObservableOrderViewModel(table: table, initialItemId: initialItemId))
showProductSearch = initialItemId == nil ? true : false
self.initialItemId = initialItemId

UIToolbar.appearance().barTintColor = UIColor.systemBackground // Background color
UIToolbar.appearance().tintColor = UIColor.blue // Tint color of buttons
Expand Down Expand Up @@ -46,6 +47,9 @@ struct OrderScreen: View {
}
.animation(.default, value: viewModel.state.currentOrder)
.withViewModel(viewModel, navigator)
.onAppear {
showProductSearch = initialItemId == nil ? true : false
}
}

@ViewBuilder
Expand Down
2 changes: 1 addition & 1 deletion WaiterRobot/Features/Order/Search/ProductSearch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct ProductSearch: View {
}
)
.searchable(text: $search, placement: .navigationBarDrawer(displayMode: .always))
.onChange(of: search, perform: { viewModel.actual.filterProducts(filter: $0) })
.onChange(of: search) { viewModel.actual.filterProducts(filter: search) }
}
}
}
Expand Down