Skip to content

Commit 2cb584a

Browse files
authored
Split summery text to multiple lines for better readability. (#16409)
2 parents 4823242 + 81ddd0c commit 2cb584a

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

WooCommerce/Classes/Bookings/BookingList/BookingListView.swift

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,28 @@ private extension BookingListView {
143143
}
144144

145145
func bookingItem(_ booking: Booking) -> some View {
146-
VStack(alignment: .leading) {
147-
Text(booking.startDate.toString(dateStyle: .short,
148-
timeStyle: .short,
149-
timeZone: BookingListTab.utcTimeZone))
146+
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummaryBadgeSpacing) {
147+
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummarySpacing) {
148+
Text(booking.startDate.toString(dateStyle: .short,
149+
timeStyle: .short,
150+
timeZone: BookingListTab.utcTimeZone))
150151
.font(.body)
151152
.fontWeight(.medium)
152153
.frame(maxWidth: .infinity, alignment: .leading)
153154
.foregroundStyle(Color.primary)
154155

155-
Text(booking.summaryText)
156-
.font(.footnote)
157-
.fontWeight(.medium)
158-
.foregroundStyle(Color.secondary)
156+
if let productName = booking.productName {
157+
Text(productName)
158+
.font(.footnote)
159+
.fontWeight(.medium)
160+
.foregroundStyle(Color.secondary)
161+
}
162+
163+
Text(booking.customerName)
164+
.font(.footnote)
165+
.fontWeight(.medium)
166+
.foregroundStyle(Color.secondary)
167+
}
159168

160169
HStack {
161170
BookingBadgeView(booking.attendanceStatus)
@@ -249,6 +258,8 @@ fileprivate enum BookingListViewLayout {
249258
static let emptyStateImageWidth: CGFloat = 67
250259
static let cornerRadius: CGFloat = 8
251260
static let defaultHeaderHeight: CGFloat = 98
261+
static let bookingSummarySpacing: CGFloat = 2
262+
static let bookingSummaryBadgeSpacing: CGFloat = 8
252263
}
253264

254265
fileprivate enum BookingListViewLocalization {

WooCommerce/Classes/Extensions/Booking+Helpers.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ extension Booking {
1313
return name.isEmpty ? Localization.guest : name
1414
}
1515

16-
var summaryText: String {
17-
return [productName, customerName]
18-
.compactMap { $0 }
19-
.joined(separator: "")
20-
}
21-
2216
var isEligibleForMarkAsPaid: Bool {
2317
bookingStatus == .unpaid
2418
}

0 commit comments

Comments
 (0)