[Woo POS][Settings] i2: Reader connection modal flow (2) #16290
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import SwiftUI | ||
| import struct WooFoundation.SafariView | ||
|
|
||
| struct POSSettingsHardwareDetailView: View { | ||
| @Environment(PointOfSaleAggregateModel.self) private var posModel | ||
| @Environment(\.posFeatureFlags) private var featureFlags | ||
| @Environment(\.dynamicTypeSize) private var dynamicTypeSize | ||
| @Environment(\.posAnalytics) private var analytics | ||
|
|
||
| let settingsController: POSSettingsControllerProtocol | ||
|
|
||
| @State private var navigationPath: [NavigationDestination] = [] | ||
| @State private var showBarcodeScanningSetupModal: Bool = false | ||
|
|
@@ -36,6 +36,7 @@ struct PointOfSaleSettingsHardwareDetailView: View { | |
| } | ||
|
|
||
| var body: some View { | ||
| @Bindable var posModel = posModel | ||
| NavigationStack(path: $navigationPath) { | ||
| POSPageHeaderView(title: Localization.hardwareTitle) | ||
| .foregroundColor(.posSurface) | ||
|
|
@@ -81,25 +82,25 @@ struct PointOfSaleSettingsHardwareDetailView: View { | |
| scannersView | ||
| } | ||
| } | ||
| .posModal(item: $posModel.cardPresentPaymentAlertViewModel, onDismiss: { | ||
| posModel.cardPresentPaymentAlertViewModel?.onDismiss?() | ||
| }, content: { alertType in | ||
| PointOfSaleCardPresentPaymentAlert(alertType: alertType) | ||
| .posInteractiveDismissDisabled(alertType.isDismissDisabled) | ||
| }) | ||
| .posModal(isPresented: $showBarcodeScanningSetupModal) { | ||
| POSBarcodeScannerSetup(isPresented: $showBarcodeScanningSetupModal, analytics: analytics) | ||
| } | ||
| .posFullScreenCover(isPresented: $showBarcodeScanningDocumentationModal) { | ||
| SafariView(url: POSConstants.URLs.pointOfSaleBarcodeScannerDocumentation.asURL()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Views | ||
| private extension POSSettingsHardwareDetailView { | ||
| var legacyCardReadersView: some View { | ||
| VStack(spacing: POSSpacing.none) { | ||
| POSPageHeaderView( | ||
| title: Localization.cardReadersTitle, | ||
|
|
@@ -168,7 +169,7 @@ struct PointOfSaleSettingsHardwareDetailView: View { | |
| } | ||
| } | ||
|
|
||
| var cardReadersView: some View { | ||
| VStack(spacing: POSSpacing.none) { | ||
| POSPageHeaderView( | ||
| title: Localization.cardReadersTitle, | ||
|
|
@@ -224,7 +225,7 @@ struct PointOfSaleSettingsHardwareDetailView: View { | |
| } | ||
| } | ||
|
|
||
| var scannersView: some View { | ||
| VStack(spacing: POSSpacing.none) { | ||
| POSPageHeaderView( | ||
| title: Localization.scannersTitle, | ||
|
|
@@ -268,7 +269,7 @@ struct PointOfSaleSettingsHardwareDetailView: View { | |
| } | ||
|
|
||
| // MARK: - Navigation | ||
| private extension POSSettingsHardwareDetailView { | ||
| enum HardwareDestination: Identifiable, CaseIterable { | ||
| case cardReaders | ||
| case scanners | ||
|
|
@@ -340,9 +341,19 @@ private extension PointOfSaleSettingsHardwareDetailView { | |
| } | ||
| } | ||
| } | ||
|
|
||
| private func handleScannerDestination(_ destination: ScannerDestination) { | ||
| switch destination { | ||
| case .setup: | ||
| showBarcodeScanningSetupModal = true | ||
| case .documentation: | ||
| showBarcodeScanningDocumentationModal = true | ||
| } | ||
| } | ||
|
||
| } | ||
|
|
||
| // MARK: - Constants | ||
| private extension POSSettingsHardwareDetailView { | ||
| enum Localization { | ||
| static let readerModelTitle = NSLocalizedString( | ||
| "pointOfSaleSettingsHardwareDetailView.readerModelTitle", | ||
|
|
@@ -460,6 +471,6 @@ private extension PointOfSaleSettingsHardwareDetailView { | |
|
|
||
| #if DEBUG | ||
| #Preview { | ||
| POSSettingsHardwareDetailView(settingsController: POSSettingsPreviewController()) | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps there could be a shared definition of this somehow? Not if it's difficult; we're not going to use it in that many places, but it's essentially identical to
PointOfSaleDashboardView's use.I think it would have to be a view modifier, something like this:
Though perhaps it would be better named as POS specific, and have the posModal requirement more obvious than using the environment var directly. It might be interesting to try some options for a few minutes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That definitely looks cleaner, thanks! I'll play with this separately and merge this PR for now.