From 234a4a6484e6b0d6cd47482fcfb5b450c1a2fa76 Mon Sep 17 00:00:00 2001 From: Victoria Park Date: Mon, 10 Jul 2023 13:58:45 -0700 Subject: [PATCH] move MerchantIntegration enum to separate file --- Demo/Demo.xcodeproj/project.pbxproj | 4 ++++ .../Demo/Networking/MerchantIntegration.swift | 21 +++++++++++++++++ Demo/Demo/ViewModels/BaseViewModel.swift | 23 +------------------ 3 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 Demo/Demo/Networking/MerchantIntegration.swift diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 198001591..eb595530a 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 3B80D50E2A291C0800D2EAC4 /* ClientIDRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B80D50D2A291C0800D2EAC4 /* ClientIDRequest.swift */; }; 3B80D5102A291CB100D2EAC4 /* ClientIDResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B80D50F2A291CB100D2EAC4 /* ClientIDResponse.swift */; }; + 3BB7A9772A5CA6FD00C05140 /* MerchantIntegration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BB7A9762A5CA6FD00C05140 /* MerchantIntegration.swift */; }; 5301468C28918B4D00184F22 /* ApprovalResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5301468B28918B4D00184F22 /* ApprovalResult.swift */; }; 536A5CA82898AA2A005C053D /* SwiftUINativeCheckoutDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536A5CA72898AA2A005C053D /* SwiftUINativeCheckoutDemo.swift */; }; 53B9E8EA28C93B4400719239 /* OrderRequestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B9E8E928C93B4400719239 /* OrderRequestHelpers.swift */; }; @@ -98,6 +99,7 @@ /* Begin PBXFileReference section */ 3B80D50D2A291C0800D2EAC4 /* ClientIDRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientIDRequest.swift; sourceTree = ""; }; 3B80D50F2A291CB100D2EAC4 /* ClientIDResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientIDResponse.swift; sourceTree = ""; }; + 3BB7A9762A5CA6FD00C05140 /* MerchantIntegration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MerchantIntegration.swift; sourceTree = ""; }; 5301468B28918B4D00184F22 /* ApprovalResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApprovalResult.swift; sourceTree = ""; }; 536A5CA22898A48C005C053D /* PayPalNativeCheckout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PayPalNativeCheckout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 536A5CA72898AA2A005C053D /* SwiftUINativeCheckoutDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUINativeCheckoutDemo.swift; sourceTree = ""; }; @@ -297,6 +299,7 @@ children = ( 80F33CE726F8DE29006811B1 /* DemoMerchantAPI.swift */, BE1766B226F911A2007EF438 /* URLResponseError.swift */, + 3BB7A9762A5CA6FD00C05140 /* MerchantIntegration.swift */, ); path = Networking; sourceTree = ""; @@ -493,6 +496,7 @@ 80F33CEF26F8E7CC006811B1 /* CreateOrderParams.swift in Sources */, BECD84A227036DDB007CCAE4 /* Intent.swift in Sources */, BED041AF270CA0FB00C80954 /* CustomButton.swift in Sources */, + 3BB7A9772A5CA6FD00C05140 /* MerchantIntegration.swift in Sources */, BE1766B326F911A2007EF438 /* URLResponseError.swift in Sources */, CBC16DD929ED90B600307117 /* UpdateOrderParams.swift in Sources */, BE9F36D82745490400AFC7DA /* FloatingLabelTextField.swift in Sources */, diff --git a/Demo/Demo/Networking/MerchantIntegration.swift b/Demo/Demo/Networking/MerchantIntegration.swift new file mode 100644 index 000000000..59adf9f5e --- /dev/null +++ b/Demo/Demo/Networking/MerchantIntegration.swift @@ -0,0 +1,21 @@ +import Foundation + +enum MerchantIntegration { + case direct + case connectedPath + case managedPath + case unspecified + + var path: String { + switch self { + case .direct: + return "/direct" + case .connectedPath: + return "/connected_path" + case .managedPath: + return "/managed_path" + default: + return "" + } + } +} diff --git a/Demo/Demo/ViewModels/BaseViewModel.swift b/Demo/Demo/ViewModels/BaseViewModel.swift index 05922ca2f..0e0e49389 100644 --- a/Demo/Demo/ViewModels/BaseViewModel.swift +++ b/Demo/Demo/ViewModels/BaseViewModel.swift @@ -8,27 +8,6 @@ import PayPalCheckout /// This class is used to share the orderID across shared views, update the text of `bottomStatusLabel` in our `FeatureBaseViewController` /// as well as share the logic of `processOrder` across our duplicate (SwiftUI and UIKit) card views. -/// -/// // temp place instead of new file -enum MerchantIntegration { - case direct - case connectedPath - case managedPath - case unspecified - - var path: String { - switch self { - case .direct: - return "/direct" - case .connectedPath: - return "/connected_path" - case .managedPath: - return "/managed_path" - default: - return "" - } - } -} class BaseViewModel: ObservableObject, PayPalWebCheckoutDelegate, CardDelegate { @@ -38,7 +17,7 @@ class BaseViewModel: ObservableObject, PayPalWebCheckoutDelegate, CardDelegate { /// order ID shared across views @Published var orderID: String? - @Published var selectedMerchantIntegration: MerchantIntegration = .connectedPath + @Published var selectedMerchantIntegration: MerchantIntegration = .unspecified // MARK: - Init