Skip to content

[POS Settings] Feature flag and present settings view #16009

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
Aug 15, 2025
Merged

[POS Settings] Feature flag and present settings view #16009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf3bb02
add flag pointOfSaleSettingsi1
iamgabrielma Aug 14, 2025
87a9ef1
present settings view through CTA button
iamgabrielma Aug 14, 2025
fe941c1
extract view
iamgabrielma Aug 14, 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
2 changes: 2 additions & 0 deletions Modules/Sources/Experiments/DefaultFeatureFlagService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
return true
case .pointOfSaleBarcodeScanningi2:
return true
case .pointOfSaleSettingsi1:
return false
case .orderAddressMapSearch:
return true
default:
Expand Down
4 changes: 4 additions & 0 deletions Modules/Sources/Experiments/FeatureFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ public enum FeatureFlag: Int {
///
case pointOfSaleBarcodeScanningi2

/// Enables the entry point for Point of Sale Settings
///
case pointOfSaleSettingsi1

/// Enables the CTA to search for an address in the map in order details > shipping address.
///
case orderAddressMapSearch
Expand Down
36 changes: 32 additions & 4 deletions WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ struct POSFloatingControlView: View {
@Binding private var showExitPOSModal: Bool
@Binding private var showSupport: Bool
@Binding private var showDocumentation: Bool
@Binding private var showSettings: Bool
@State private var showProductRestrictionsModal: Bool = false
@State private var showBarcodeScanningModal: Bool = false

init(showExitPOSModal: Binding<Bool>,
showSupport: Binding<Bool>,
showDocumentation: Binding<Bool>) {
showDocumentation: Binding<Bool>,
showSettings: Binding<Bool>) {
self._showExitPOSModal = showExitPOSModal
self._showSupport = showSupport
self._showDocumentation = showDocumentation
self._showSettings = showSettings
}

var body: some View {
Expand Down Expand Up @@ -73,6 +76,16 @@ struct POSFloatingControlView: View {
icon: { Image(systemName: "barcode.viewfinder") })
}
}
if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleSettingsi1) {
Button {
showSettings = true
} label: {
Label(
title: { Text(Localization.settings) },
icon: { Image(systemName: "gearshape") }
)
}
}
} label: {
VStack {
Spacer()
Expand Down Expand Up @@ -185,14 +198,23 @@ private extension POSFloatingControlView {
value: "Initial barcode scanner setup",
comment: "The title of the menu button to start a barcode scanner setup flow."
)

static let settings = NSLocalizedString(
"pointOfSale.floatingButtons.settings.button.title",
value: "Settings",
comment: "The title of the menu button to access Point of Sale settings."
)
}
}

#if DEBUG

@available(iOS 17.0, *)
#Preview("Reader Disconnected") {
POSFloatingControlView(showExitPOSModal: .constant(false), showSupport: .constant(false), showDocumentation: .constant(false))
POSFloatingControlView(showExitPOSModal: .constant(false),
showSupport: .constant(false),
showDocumentation: .constant(false),
showSettings: .constant(false))
.environment(\.posBackgroundAppearance, .primary)
.environment(POSPreviewHelpers.makePreviewAggregateModel())
}
Expand All @@ -204,14 +226,20 @@ private extension POSFloatingControlView {
let posModel = POSPreviewHelpers.makePreviewAggregateModel(
cardPresentPaymentService: paymentService
)
return POSFloatingControlView(showExitPOSModal: .constant(false), showSupport: .constant(false), showDocumentation: .constant(false))
return POSFloatingControlView(showExitPOSModal: .constant(false),
showSupport: .constant(false),
showDocumentation: .constant(false),
showSettings: .constant(false))
.environment(\.posBackgroundAppearance, .primary)
.environment(posModel)
}

@available(iOS 17.0, *)
#Preview("Secondary/disabled Background") {
POSFloatingControlView(showExitPOSModal: .constant(false), showSupport: .constant(false), showDocumentation: .constant(false))
POSFloatingControlView(showExitPOSModal: .constant(false),
showSupport: .constant(false),
showDocumentation: .constant(false),
showSettings: .constant(false))
.environment(\.posBackgroundAppearance, .secondary)
.environment(POSPreviewHelpers.makePreviewAggregateModel())
}
Expand Down
7 changes: 6 additions & 1 deletion WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ struct PointOfSaleDashboardView: View {
@State private var showExitPOSModal: Bool = false
@State private var showSupport: Bool = false
@State private var showDocumentation: Bool = false
@State private var showSettings: Bool = false
@State private var waitingTimeTracker: WaitingTimeTracker?

@State private var floatingSize: CGSize = .zero
Expand Down Expand Up @@ -90,7 +91,8 @@ struct PointOfSaleDashboardView: View {

POSFloatingControlView(showExitPOSModal: $showExitPOSModal,
showSupport: $showSupport,
showDocumentation: $showDocumentation)
showDocumentation: $showDocumentation,
showSettings: $showSettings)
.offset(x: Constants.floatingControlHorizontalOffset, y: -Constants.floatingControlVerticalOffset)
.padding(.bottom, Constants.floatingControlBottomPadding)
.trackSize(size: $floatingSize)
Expand Down Expand Up @@ -130,6 +132,9 @@ struct PointOfSaleDashboardView: View {
.posSheet(isPresented: $showDocumentation) {
documentationView
}
.posFullScreenCover(isPresented: $showSettings) {
PointOfSaleSettingsView()
}
.onChange(of: posModel.entryPointController.eligibilityState) { oldValue, newValue in
guard newValue == .eligible else { return }
Task { @MainActor in
Expand Down
21 changes: 21 additions & 0 deletions WooCommerce/Classes/POS/Presentation/PointOfSaleSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import SwiftUI

struct PointOfSaleSettingsView: View {
@Environment(\.dismiss) private var dismiss
var body: some View {
NavigationView {
Copy link
Contributor

@jaclync jaclync Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As NavigationView is deprecated, can we replace it with NavigationStack or NavigationSplitView?

Copy link
Contributor Author

@iamgabrielma iamgabrielma Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I used the NavigationView just temporarily. I'm experimenting now with both Stack or SplitView to see what would make more sense here, as well as with a custom view like we do Itemlist/Cart depending how much flexibility the new APIs offer 👍

Text("Settings")
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button("Done") {
Comment on lines +7 to +10
Copy link
Contributor

@jaclync jaclync Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume these strings are just for the dummy view and will be replaced or localized later?

Copy link
Contributor Author

@iamgabrielma iamgabrielma Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!

dismiss()
}
}
}
}
}
}

#Preview {
PointOfSaleSettingsView()
}
4 changes: 4 additions & 0 deletions WooCommerce/WooCommerce.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,7 @@
683988A72C7D82E70084B85A /* POSHeaderLayoutConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683988A62C7D82E60084B85A /* POSHeaderLayoutConstants.swift */; };
683AA9D62A303CB70099F7BA /* UpgradesViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683AA9D52A303CB70099F7BA /* UpgradesViewModelTests.swift */; };
683AC4AC2CEF019A00FF0A5E /* POSSendReceiptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683AC4AB2CEF019700FF0A5E /* POSSendReceiptView.swift */; };
683D41182E4D9B570024CFE4 /* PointOfSaleSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683D41172E4D9B570024CFE4 /* PointOfSaleSettingsView.swift */; };
683DF5FF2C6AF46500A5CDC6 /* POSHeaderTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683DF5FE2C6AF46500A5CDC6 /* POSHeaderTitleView.swift */; };
684AB83A2870677F003DFDD1 /* CardReaderManualsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684AB8392870677F003DFDD1 /* CardReaderManualsView.swift */; };
684AB83C2873DF04003DFDD1 /* CardReaderManualsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684AB83B2873DF04003DFDD1 /* CardReaderManualsViewModel.swift */; };
Expand Down Expand Up @@ -4753,6 +4754,7 @@
683988A62C7D82E60084B85A /* POSHeaderLayoutConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSHeaderLayoutConstants.swift; sourceTree = "<group>"; };
683AA9D52A303CB70099F7BA /* UpgradesViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradesViewModelTests.swift; sourceTree = "<group>"; };
683AC4AB2CEF019700FF0A5E /* POSSendReceiptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSSendReceiptView.swift; sourceTree = "<group>"; };
683D41172E4D9B570024CFE4 /* PointOfSaleSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleSettingsView.swift; sourceTree = "<group>"; };
683DF5FE2C6AF46500A5CDC6 /* POSHeaderTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSHeaderTitleView.swift; sourceTree = "<group>"; };
684AB8392870677F003DFDD1 /* CardReaderManualsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardReaderManualsView.swift; sourceTree = "<group>"; };
684AB83B2873DF04003DFDD1 /* CardReaderManualsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardReaderManualsViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7177,6 +7179,7 @@
68A345632D029E09002EE324 /* PaymentButtons.swift */,
026826A52BF59DF60036F959 /* PointOfSaleDashboardView.swift */,
68E141DA2D13107200A70D5B /* PointOfSaleCollectCashView.swift */,
683D41172E4D9B570024CFE4 /* PointOfSaleSettingsView.swift */,
DA013F502C65125100D9A391 /* PointOfSaleExitPosAlertView.swift */,
DA0DBE2E2C4FC61D00DF14C0 /* POSFloatingControlView.swift */,
20D3D42A2C64D7CC004CE6E3 /* SimpleProductsOnlyInformation.swift */,
Expand Down Expand Up @@ -15330,6 +15333,7 @@
01BE94042DDCC7670063541C /* PointOfSaleEmptyErrorStateViewLayout.swift in Sources */,
029106C02BE3349500C2248B /* OrderCustomerSectionViewModel.swift in Sources */,
74460D4022289B7600D7316A /* Coordinator.swift in Sources */,
683D41182E4D9B570024CFE4 /* PointOfSaleSettingsView.swift in Sources */,
205E79422C1CA6E3001BA266 /* PointOfSaleCardPresentPaymentEventPresentationStyle.swift in Sources */,
EE4C45842C381BAA001A3D94 /* PackagePhotoView.swift in Sources */,
B57C743D20F5493300EEFC87 /* AccountHeaderView.swift in Sources */,
Expand Down