Skip to content
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

[Woo POS] Hide cart images when the view is too narrow #15028

Merged
merged 9 commits into from
Feb 5, 2025
+53 −5
Merged

[Woo POS] Hide cart images when the view is too narrow #15028

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02d74ff
Only show cart item images when it’s wide enough
joshheald Jan 30, 2025
f049a8e
Cell padding when the cart item image is hidden
joshheald Jan 31, 2025
8caf60e
Show leading padding on cart items when no image
joshheald Jan 31, 2025
5c0b46a
Rely on HStack spacing between x button and text
joshheald Jan 31, 2025
fbe1867
Make image hiding more reliable by passing width
joshheald Jan 31, 2025
c846d96
Remove development log
joshheald Jan 31, 2025
5119757
Avoid secondary background changing in split view
joshheald Feb 5, 2025
75f3331
Merge branch 'trunk' into task/hide-cart-images-when-the-view-is-too-…
joshheald Feb 5, 2025
4dca723
Merge branch 'trunk' into task/hide-cart-images-when-the-view-is-too-…
joshheald Feb 5, 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
Prev Previous commit
Next Next commit
Rely on HStack spacing between x button and text
@joshheald
joshheald committed Jan 31, 2025
commit 5c0b46a7e18890385ce9d3f0ad23f428edba0bed
5 changes: 3 additions & 2 deletions WooCommerce/Classes/POS/Presentation/ItemRowView.swift
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ struct ItemRowView: View {
.font(Constants.itemPriceFont)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.leading, showProductImage ? 0 : Constants.horizontalElementSpacing)
.padding(.leading, showProductImage ? 0 : Constants.cardContentHorizontalPadding)
.accessibilityElement(children: .combine)

if let onItemRemoveTapped {
@@ -43,7 +43,7 @@ struct ItemRowView: View {
.font(.posBodyRegular)
})
.accessibilityLabel(Localization.removeFromCartAccessibilityLabel)
.padding()
.padding(.trailing, Constants.cardContentHorizontalPadding)
.foregroundColor(Color.posTertiaryText)
}
}
@@ -107,6 +107,7 @@ private extension ItemRowView {
static let cardOutlineWidth: CGFloat = 1
static let horizontalPadding: CGFloat = 16
static let horizontalElementSpacing: CGFloat = 16
static let cardContentHorizontalPadding: CGFloat = 16
static let itemTitleAndPriceSpacing: CGFloat = 4
static let itemTitleFont: POSFontStyle = .posDetailEmphasized
static let itemSubtitleFont: POSFontStyle = .posDetailLight