Skip to content

Commit 6198704

Browse files
[Bookungs] Update booking details container color and frame (#16341)
2 parents d7ca39c + bf5f29b commit 6198704

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import SwiftUI
2+
3+
private enum Layout {
4+
static let color: Color = .gray.opacity(0.3)
5+
static let width: CGFloat = 0.5
6+
}
7+
8+
struct VerticalHairlineBorders: ViewModifier {
9+
10+
func body(content: Content) -> some View {
11+
content
12+
.overlay(
13+
HStack {
14+
Rectangle()
15+
.fill(Layout.color)
16+
.frame(width: Layout.width)
17+
Spacer()
18+
Rectangle()
19+
.fill(Layout.color)
20+
.frame(width: Layout.width)
21+
}
22+
)
23+
}
24+
}
25+
26+
extension View {
27+
func verticalHairlineBorders() -> some View {
28+
self.modifier(VerticalHairlineBorders())
29+
}
30+
}

WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ struct BookingDetailsView: View {
2020
static let headerBadgesAdditionalTopPadding: CGFloat = 6
2121
static let sectionFooterTextVerticalPadding: CGFloat = 8
2222
static let rowTextVerticalPadding: CGFloat = 11
23+
static let contentContainerMaxWidth: CGFloat = 525
2324
}
2425

2526
enum TextFont {
@@ -45,6 +46,8 @@ struct BookingDetailsView: View {
4546
}
4647
}
4748
}
49+
.verticalHairlineBorders()
50+
.frame(maxWidth: Layout.contentContainerMaxWidth)
4851
.refreshable {
4952
await viewModel.syncData()
5053
}
@@ -131,7 +134,7 @@ private extension BookingDetailsView {
131134

132135
sectionContentView(section.content)
133136
.padding(.horizontal, Layout.contentSidePadding)
134-
.background(Color(.systemBackground))
137+
.background(Color(.listForeground(modal: false)))
135138
.addingTopAndBottomDividers()
136139

137140
if let footerText = section.footerText {

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,6 +1005,7 @@
10051005
2DA7D58C2EA6722A007B0F48 /* BookingAttendanceStatus+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DA7D58B2EA6722A007B0F48 /* BookingAttendanceStatus+Localization.swift */; };
10061006
2DAC25202E82A02C008521AF /* BookingDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DAC251F2E82A02C008521AF /* BookingDetailsViewModel.swift */; };
10071007
2DAC2C992E82A185008521AF /* BookingDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DAC2C972E82A185008521AF /* BookingDetailsView.swift */; };
1008+
2DB442942EC3696A00838D88 /* View+HairlineBorders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB442932EC3696300838D88 /* View+HairlineBorders.swift */; };
10081009
2DB877522E25466C0001B175 /* ShippingItemRowAccessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB877512E25466B0001B175 /* ShippingItemRowAccessibility.swift */; };
10091010
2DB88DA42E27DD8D0001B175 /* MarkOrderAsReadUseCase+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB88DA32E27DD790001B175 /* MarkOrderAsReadUseCase+Woo.swift */; };
10101011
2DB891662E27F0830001B175 /* Address+Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB891652E27F07E0001B175 /* Address+Shared.swift */; };
@@ -3891,6 +3892,7 @@
38913892
2DA7D58B2EA6722A007B0F48 /* BookingAttendanceStatus+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BookingAttendanceStatus+Localization.swift"; sourceTree = "<group>"; };
38923893
2DAC251F2E82A02C008521AF /* BookingDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookingDetailsViewModel.swift; sourceTree = "<group>"; };
38933894
2DAC2C972E82A185008521AF /* BookingDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookingDetailsView.swift; sourceTree = "<group>"; };
3895+
2DB442932EC3696300838D88 /* View+HairlineBorders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+HairlineBorders.swift"; sourceTree = "<group>"; };
38943896
2DB877512E25466B0001B175 /* ShippingItemRowAccessibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingItemRowAccessibility.swift; sourceTree = "<group>"; };
38953897
2DB88DA32E27DD790001B175 /* MarkOrderAsReadUseCase+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MarkOrderAsReadUseCase+Woo.swift"; sourceTree = "<group>"; };
38963898
2DB891652E27F07E0001B175 /* Address+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Address+Shared.swift"; sourceTree = "<group>"; };
@@ -7440,6 +7442,7 @@
74407442
262A097F2628A8BF0033AD20 /* View Modifiers */ = {
74417443
isa = PBXGroup;
74427444
children = (
7445+
2DB442932EC3696300838D88 /* View+HairlineBorders.swift */,
74437446
2D05F70F2E8BE91E004111FD /* View+Tappable.swift */,
74447447
DE4B3B5526A68DD000EEF2D8 /* View+InsetPaddings.swift */,
74457448
26281775278F0B0100C836D3 /* View+NoticesModifier.swift */,
@@ -14353,6 +14356,7 @@
1435314356
0286B27D23C7051F003D784B /* ProductImagesViewController.swift in Sources */,
1435414357
68D1BEDB28FFEDC20074A29E /* OrderCustomerListView.swift in Sources */,
1435514358
4569317F2653E82B009ED69D /* ShippingLabelCarriers.swift in Sources */,
14359+
2DB442942EC3696A00838D88 /* View+HairlineBorders.swift in Sources */,
1435614360
EE2A57D729E399CC009F61E1 /* CaseIterable+Helpers.swift in Sources */,
1435714361
024DF30B23742297006658FE /* AztecFormatBarCommand.swift in Sources */,
1435814362
02CE43022768CBF60006EAEF /* ProducBarcodeScannerCoordinator.swift in Sources */,

0 commit comments

Comments
 (0)