Skip to content

[POS Settings] Store section design updates #16070

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 5 commits into from
Sep 3, 2025
Merged

[POS Settings] Store section design updates #16070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58218d9
add posheader
iamgabrielma Sep 2, 2025
3772c3a
Move from list to scrollview
iamgabrielma Sep 2, 2025
7d68926
extract to smaller views
iamgabrielma Sep 2, 2025
3a41e00
make further smaller subviews
iamgabrielma Sep 2, 2025
7679fd1
update selected color in dark mode
iamgabrielma Sep 2, 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
165 changes: 82 additions & 83 deletions WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsStoreDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,94 +15,21 @@ struct PointOfSaleSettingsStoreDetailView: View {

var body: some View {
NavigationStack {
List {
Section {
VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.storeName)
.font(.posBodyMediumRegular())
Text(viewModel.storeName)
.font(.posBodyMediumRegular())
.foregroundStyle(.secondary)
}
.listRowSeparator(.hidden)

VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.address)
.font(.posBodyMediumRegular())
Text(viewModel.storeAddress)
.font(.posBodyMediumRegular())
.foregroundStyle(.secondary)
}
.listRowSeparator(.hidden)
} header: {
ZStack {
backgroundColor
Text(Localization.storeInformation)
.font(.posHeadingBold)
.foregroundColor(.posOnSurface)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, POSPadding.medium)
.padding(.vertical, POSPadding.small)
.textCase(nil)
}
.listRowInsets(EdgeInsets())
}

Section {
VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.receiptStoreName)
.font(.posBodyMediumRegular())
settingValueView(for: viewModel.receiptInformation.storeName)
}
.listRowSeparator(.hidden)
VStack(spacing: POSSpacing.none) {
POSPageHeaderView(title: Localization.storeTitle)
.foregroundColor(.posSurface)
.accessibilityAddTraits(.isHeader)

VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.physicalAddress)
.font(.posBodyMediumRegular())
settingValueView(for: viewModel.receiptInformation.storeAddress)
}
.listRowSeparator(.hidden)

VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.phoneNumber)
.font(.posBodyMediumRegular())
settingValueView(for: viewModel.receiptInformation.phone)
}
.listRowSeparator(.hidden)

VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.email)
.font(.posBodyMediumRegular())
settingValueView(for: viewModel.receiptInformation.email)
}
.listRowSeparator(.hidden)
ScrollView {
VStack(spacing: POSSpacing.medium) {
storeInformationView

VStack(alignment: .leading, spacing: POSPadding.small) {
Text(Localization.refundReturnsPolicy)
.font(.posBodyMediumRegular())
settingValueView(for: viewModel.receiptInformation.refundReturnsPolicy)
receiptInformationView
.renderedIf(viewModel.shouldShowReceiptInformation)
}
.listRowSeparator(.hidden)
} header: {
ZStack {
backgroundColor
Text(Localization.receiptInformation)
.font(.posHeadingBold)
.foregroundColor(.posOnSurface)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, POSPadding.medium)
.padding(.vertical, POSPadding.small)
.textCase(nil)
}
.listRowInsets(EdgeInsets())
}
.renderedIf(viewModel.shouldShowReceiptInformation)
.background(backgroundColor)
}
.listStyle(.plain)
.scrollContentBackground(.hidden)
.background(backgroundColor)
.listRowSeparator(.hidden)
.listSectionSeparator(.hidden)
.task {
isLoading = true
await viewModel.retrievePOSReceiptSettings()
Expand All @@ -111,6 +38,72 @@ struct PointOfSaleSettingsStoreDetailView: View {
}
}

@ViewBuilder
private var storeInformationView: some View {
VStack(spacing: POSSpacing.none) {
sectionHeaderView(title: Localization.storeInformation)

VStack(spacing: POSSpacing.medium) {
fieldRowView(label: Localization.storeName, value: viewModel.storeName)
fieldRowView(label: Localization.address, value: viewModel.storeAddress)
}
.padding(.bottom, POSPadding.medium)
}
}

@ViewBuilder
private var receiptInformationView: some View {
VStack(spacing: POSSpacing.none) {
sectionHeaderView(title: Localization.receiptInformation)

VStack(spacing: POSSpacing.medium) {
receiptFieldRowView(label: Localization.receiptStoreName, value: viewModel.receiptInformation.storeName)
receiptFieldRowView(label: Localization.physicalAddress, value: viewModel.receiptInformation.storeAddress)
receiptFieldRowView(label: Localization.phoneNumber, value: viewModel.receiptInformation.phone)
receiptFieldRowView(label: Localization.email, value: viewModel.receiptInformation.email)
receiptFieldRowView(label: Localization.refundReturnsPolicy, value: viewModel.receiptInformation.refundReturnsPolicy)
}
.padding(.bottom, POSPadding.medium)
}
}

@ViewBuilder
private func sectionHeaderView(title: String) -> some View {
ZStack {
backgroundColor
Text(title)
.font(.posBodyLargeBold)
.foregroundColor(.posOnSurface)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, POSPadding.medium)
.padding(.vertical, POSPadding.small)
}
}

@ViewBuilder
private func fieldRowView(label: String, value: String) -> some View {
VStack(alignment: .leading, spacing: POSPadding.small) {
Text(label)
.font(.posBodyMediumRegular())
Text(value)
.font(.posBodyMediumRegular())
.foregroundStyle(.secondary)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, POSPadding.medium)
}

@ViewBuilder
private func receiptFieldRowView(label: String, value: String?) -> some View {
VStack(alignment: .leading, spacing: POSPadding.small) {
Text(label)
.font(.posBodyMediumRegular())
settingValueView(for: value)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, POSPadding.medium)
}

@ViewBuilder
private func settingValueView(for value: String?) -> some View {
if isLoading {
Expand All @@ -135,6 +128,12 @@ private extension PointOfSaleSettingsStoreDetailView {
}

enum Localization {
static let storeTitle = NSLocalizedString(
"pointOfSaleSettingsStoreDetailView.storeTitle",
value: "Store",
comment: "Navigation title for the store details in POS settings."
)

static let notSet = NSLocalizedString(
"pointOfSaleSettingsStoreDetailView.notSet",
value: "Not set",
Expand Down
8 changes: 7 additions & 1 deletion WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,17 @@ extension PointOfSaleSettingsView {

struct PointOfSaleSettingsCard: View {
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
@Environment(\.colorScheme) private var colorScheme

let item: PointOfSaleSettingsView.SidebarNavigation
let isSelected: Bool
let onTap: () -> Void

private var selectionBackgroundColor: Color {
guard isSelected else { return Color.clear }
return colorScheme == .dark ? Color.posPrimary : Color.posSecondary
}

var body: some View {
Button(action: onTap) {
HStack(spacing: POSSpacing.medium) {
Expand Down Expand Up @@ -126,7 +132,7 @@ struct PointOfSaleSettingsCard: View {
.accessibilityAddTraits(.isButton)
.background(
RoundedRectangle(cornerRadius: POSCornerRadiusStyle.small.value, style: .continuous)
.fill(isSelected ? Color.posSecondary : Color.clear)
.fill(selectionBackgroundColor)
)
}
}
Expand Down