Skip to content

Shipping Label: Edit and remove HAZMAT category #15405

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
merged 3 commits into from
Mar 25, 2025
Merged

Shipping Label: Edit and remove HAZMAT category #15405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4af2754
Show category detail if there exists one
itsmeichigo Mar 24, 2025
18591fd
Clear select category upon disable hazmat
itsmeichigo Mar 24, 2025
f1ddaf0
Add save button for confirm disabling hazmat
itsmeichigo Mar 24, 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
58 changes: 54 additions & 4 deletions ...pping Create Shipping Labels/WooShipping Hazmat Section/WooShippingHazmatDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,38 @@ struct WooShippingHazmatDetailView: View {
}
.tint(Color.accentColor)

Button(Localization.selectCategory) {
isShowingCategoryList = true
if isHazardous {
if let selectedCategory {
HStack {
Text(Localization.category)
.headlineStyle()
Spacer()
Button {
isShowingCategoryList = true
} label: {
Image(systemName: "pencil")
}
.buttonStyle(.plain)
.font(.body)
.foregroundStyle(Color.accentColor)
}

Text(selectedCategory.localizedName)
.font(.body)
.frame(maxWidth: .infinity, alignment: .leading)
.multilineTextAlignment(.leading)
.padding(Constants.verticalSpacing)
.background(
Color(.quaternarySystemFill)
.clipShape(RoundedRectangle(cornerSize: Constants.cornerSize))
)
} else {
Button(Localization.selectCategory) {
isShowingCategoryList = true
}
.buttonStyle(PrimaryButtonStyle())
}
}
.buttonStyle(PrimaryButtonStyle())
.renderedIf(isHazardous)

Divider()

Expand Down Expand Up @@ -67,6 +94,18 @@ struct WooShippingHazmatDetailView: View {
}
.toolbarBackground(Color.clear, for: .navigationBar)
}
.safeAreaInset(edge: .bottom) {
VStack {
Button(Localization.save) {
selectionHandler(nil)
dismiss()
}
.buttonStyle(PrimaryButtonStyle())
.padding(Constants.verticalSpacing)
}
.background(Color(.systemBackground))
.renderedIf(selectedCategory != nil && isHazardous == false)
}
.sheet(isPresented: $isShowingCategoryList) {
WooShippingHazmatCategoryList(selectedItem: selectedCategory,
selectionHandler: { category in
Expand Down Expand Up @@ -128,6 +167,7 @@ private extension WooShippingHazmatDetailView {
private extension WooShippingHazmatDetailView {
enum Constants {
static let verticalSpacing: CGFloat = 16
static let cornerSize = CGSize(width: 8, height: 8)
static let hazmatURL = "https://www.usps.com/hazmat"
static let searchToolURL = "https://pe.usps.com/hazmat/index"
static let DHLExpressName = "DHL Express"
Expand All @@ -154,6 +194,16 @@ private extension WooShippingHazmatDetailView {
value: "Select Category",
comment: "Button to select hazardous material category on the HAZMAT detail view in the shipping label creation flow"
)
static let category = NSLocalizedString(
"wooShippingHazmatDetailView.category",
value: "Category",
comment: "Label for the existing category on the HAZMAT detail view in the shipping label creation flow"
)
static let save = NSLocalizedString(
"wooShippingHazmatDetailView.save",
value: "Save",
comment: "Button to confirm selection on the HAZMAT detail view in the shipping label creation flow"
)
static let detailLine1 = NSLocalizedString(
"wooShippingHazmatDetailView.detailLine1",
value: "Potentially hazardous material includes items such as batteries, dry ice, " +
Expand Down