Support both TextInput and GameController based scanning in the BarcodeScannerContainer

Author: staskus

WooCommerce/Classes/POS/Presentation/Barcode Scanning/BarcodeScannerContainer.swift

@@ -39,15 +39,23 @@ struct BarcodeScannerContainerRepresentable: UIViewControllerRepresentable {
     let configuration: HIDBarcodeParserConfiguration
     let onScan: (Result<String, Error>) -> Void
 
-    func makeUIViewController(context: Context) -> BarcodeScannerHostingController {
-        let controller = BarcodeScannerHostingController(
-            configuration: configuration,
-            onScan: onScan
-        )
-        return controller
+    func makeUIViewController(context: Context) -> UIViewController {
+        let featureFlagService = ServiceLocator.featureFlagService
+
+        if featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
+            return GameControllerBarcodeScannerHostingController(
+                configuration: configuration,
+                onScan: onScan
+            )
+        } else {
+            return BarcodeScannerHostingController(
+                configuration: configuration,
+                onScan: onScan
+            )
+        }
     }
 
-    func updateUIViewController(_ uiViewController: BarcodeScannerHostingController, context: Context) {}
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}
 }
 
 /// A UIHostingController that handles keyboard input events for barcode scanning.
@@ -115,3 +123,26 @@ class BarcodeScannerHostingController: UIHostingController<EmptyView> {
         super.pressesCancelled(presses, with: event)
     }
 }
+
+/// A UIHostingController that handles GameController keyboard input events for barcode scanning.
+/// This controller uses GameController framework exclusively for language-independent barcode scanning.
+final class GameControllerBarcodeScannerHostingController: UIHostingController<EmptyView> {
+    private var gameControllerBarcodeObserver: GameControllerBarcodeObserver?
+
+    init(
+        configuration: HIDBarcodeParserConfiguration,
+        onScan: @escaping (Result<String, Error>) -> Void
+    ) {
+        super.init(rootView: EmptyView())
+
+        gameControllerBarcodeObserver = GameControllerBarcodeObserver(configuration: configuration, onScan: onScan)
+    }
+
+    @MainActor required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+        gameControllerBarcodeObserver = nil
+    }
+}

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -52,6 +52,9 @@
 		0188CA0F2C65622A0051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0188CA0E2C65622A0051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageViewModel.swift */; };
 		0188CA112C6565320051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0188CA102C6565320051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageView.swift */; };
 		018D5C7E2CA6B4A60085EBEE /* CurrencySettings+Sanitized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 018D5C7D2CA6B49D0085EBEE /* CurrencySettings+Sanitized.swift */; };
+		0190B44A2E1BDC7C00E1EC48 /* GameControllerBarcodeParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0190B4492E1BDC7C00E1EC48 /* GameControllerBarcodeParser.swift */; };
+		0190B44C2E1BDC8E00E1EC48 /* GameControllerBarcodeParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0190B44B2E1BDC8E00E1EC48 /* GameControllerBarcodeParserTests.swift */; };
+		0190B80A2E1C02DD00E1EC48 /* GameControllerBarcodeObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0190B8092E1C02DD00E1EC48 /* GameControllerBarcodeObserver.swift */; };
 		019130192CF49A77008C0C88 /* TapToPayEducationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 019130182CF49A77008C0C88 /* TapToPayEducationView.swift */; };
 		0191301B2CF4E782008C0C88 /* TapToPayEducationStepViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0191301A2CF4E77F008C0C88 /* TapToPayEducationStepViewModel.swift */; };
 		0191301D2CF4E7B7008C0C88 /* TapToPayEducationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0191301C2CF4E7B6008C0C88 /* TapToPayEducationViewModel.swift */; };
@@ -3208,6 +3211,9 @@
 		0188CA0E2C65622A0051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleCardPresentPaymentValidatingOrderErrorMessageViewModel.swift; sourceTree = "<group>"; };
 		0188CA102C6565320051BF1C /* PointOfSaleCardPresentPaymentValidatingOrderErrorMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleCardPresentPaymentValidatingOrderErrorMessageView.swift; sourceTree = "<group>"; };
 		018D5C7D2CA6B49D0085EBEE /* CurrencySettings+Sanitized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CurrencySettings+Sanitized.swift"; sourceTree = "<group>"; };
+		0190B4492E1BDC7C00E1EC48 /* GameControllerBarcodeParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameControllerBarcodeParser.swift; sourceTree = "<group>"; };
+		0190B44B2E1BDC8E00E1EC48 /* GameControllerBarcodeParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameControllerBarcodeParserTests.swift; sourceTree = "<group>"; };
+		0190B8092E1C02DD00E1EC48 /* GameControllerBarcodeObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameControllerBarcodeObserver.swift; sourceTree = "<group>"; };
 		019130182CF49A77008C0C88 /* TapToPayEducationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapToPayEducationView.swift; sourceTree = "<group>"; };
 		0191301A2CF4E77F008C0C88 /* TapToPayEducationStepViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapToPayEducationStepViewModel.swift; sourceTree = "<group>"; };
 		0191301C2CF4E7B6008C0C88 /* TapToPayEducationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapToPayEducationViewModel.swift; sourceTree = "<group>"; };
@@ -8298,6 +8304,8 @@
 		20D557572DF9D57800D9EC8B /* Barcode Scanning */ = {
 			isa = PBXGroup;
 			children = (
+				0190B8092E1C02DD00E1EC48 /* GameControllerBarcodeObserver.swift */,
+				0190B4492E1BDC7C00E1EC48 /* GameControllerBarcodeParser.swift */,
 				202235F02DFAEAE500E13DE9 /* HIDBarcodeParser.swift */,
 				20CEBF222E02C760001F3300 /* TimeProvider.swift */,
 				20D5575C2DFADF5400D9EC8B /* BarcodeScannerContainer.swift */,
@@ -8309,6 +8317,7 @@
 		20D5575E2DFAE3D500D9EC8B /* Barcode Scanning */ = {
 			isa = PBXGroup;
 			children = (
+				0190B44B2E1BDC8E00E1EC48 /* GameControllerBarcodeParserTests.swift */,
 				202235F22DFAEC2700E13DE9 /* HIDBarcodeParserTests.swift */,
 				20CEBF242E02C7E6001F3300 /* MockTimeProvider.swift */,
 			);
@@ -15306,6 +15315,7 @@
 				026A50282D2F6BD1002C42C2 /* InfiniteScrollTriggerDeterminable.swift in Sources */,
 				2004E2CA2C07771400D62521 /* CardPresentPaymentReaderConnectionResult.swift in Sources */,
 				860B85F12ADE3A0E00E85884 /* BulletPointView.swift in Sources */,
+				0190B44A2E1BDC7C00E1EC48 /* GameControllerBarcodeParser.swift in Sources */,
 				D817586222BB64C300289CFE /* OrderDetailsNotices.swift in Sources */,
 				022F7A0324A05F6400012601 /* LinkedProductsListSelectorViewController.swift in Sources */,
 				2602A63F27BD880A00B347F1 /* NewOrderInitialStatusResolver.swift in Sources */,
@@ -16051,6 +16061,7 @@
 				B6C78B8E293BAE68008934A1 /* AnalyticsHubLastMonthRangeData.swift in Sources */,
 				B517EA18218B232700730EC4 /* StringFormatter+Notes.swift in Sources */,
 				318109DC25E5B51900EE0BE7 /* ImageTableViewCell.swift in Sources */,
+				0190B80A2E1C02DD00E1EC48 /* GameControllerBarcodeObserver.swift in Sources */,
 				262EB5B0298C7C3A009DCC36 /* SupportFormsDataSources.swift in Sources */,
 				57C5FF7F250925C90074EC26 /* OrderListViewModel.swift in Sources */,
 				029D02602C231F5F00CB1E75 /* PointOfSaleCardPresentPaymentReaderUpdateCompletionView.swift in Sources */,
@@ -17429,6 +17440,7 @@
 				02C2756F24F5F5EE00286C04 /* ProductShippingSettingsViewModel+ProductVariationTests.swift in Sources */,
 				EEBB9B402D8FE5B6008D6CE5 /* WooShippingSplitShipmentsViewModelTests.swift in Sources */,
 				571FDDAE24C768DC00D486A5 /* MockZendeskManager.swift in Sources */,
+				0190B44C2E1BDC8E00E1EC48 /* GameControllerBarcodeParserTests.swift in Sources */,
 				01AB2D122DDC7AD300AA67FD /* PointOfSaleItemListAnalyticsTrackerTests.swift in Sources */,
 				45FBDF3C238D4EA800127F77 /* ExtendedAddProductImageCollectionViewCellTests.swift in Sources */,
 				2609797C2A13D31500442249 /* PrivacyBannerPresentationUseCaseTests.swift in Sources */,