PLA-7001: Reader id input (#40)

tyro · Jul 2, 2024 · e44598f · e44598f
1 parent c3291b4
commit e44598f
Show file tree

Hide file tree

Showing 12 changed files with 738 additions and 897 deletions.
diff --git a/SampleApp.xcodeproj b/SampleApp.xcodeproj
diff --git a/SampleApp/SampleApp.xcodeproj/project.pbxproj b/SampleApp/SampleApp.xcodeproj/project.pbxproj
diff --git a/SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme b/SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme
diff --git a/SampleApp/SampleApp/POS/DemoConnectionProvider.swift b/SampleApp/SampleApp/POS/DemoConnectionProvider.swift
@@ -11,16 +11,17 @@ import TyroTapToPaySDK
 // Create an endpoint on your server to generate the connection secret
 let DEMO_CONNECTION_SECRET_ENDPOINT_URL = "https://api.tyro.com/connect/tap-to-pay/demo/connections"
 
-// Create the reader id and set it here
-// Only one reader can be used on one device at any time otherwise transactions will fail
-let DEMO_READER_ID = "f310e43b-a6c9-4c43-9535-ff68b2b9c4a1"
-
 final class DemoConnectionProvider: ConnectionProvider {
   static let timeoutIntervalSeconds: TimeInterval = 10
   private let restClient = RestClient()
+  private var readerId: String
+
+  init(readerId: String) {
+    self.readerId = readerId
+  }
 
   func createConnection() async throws -> String {
-    let payload = try JSONEncoder().encode(DemoConnectionRequest(readerId: DEMO_READER_ID))
+    let payload = try JSONEncoder().encode(DemoConnectionRequest(readerId: self.readerId))
     let response = try await restClient.post(
       requestUrl: DEMO_CONNECTION_SECRET_ENDPOINT_URL,
       payload: payload

diff --git a/SampleApp/SampleApp/Resources/Localizable.xcstrings b/SampleApp/SampleApp/Resources/Localizable.xcstrings
diff --git a/SampleApp/SampleApp/SampleApp.swift b/SampleApp/SampleApp/SampleApp.swift
@@ -10,90 +10,96 @@ import TyroTapToPaySDK
 
 @main
 struct SampleApp: App {
-	var body: some Scene {
-		WindowGroup {
-			Home()
-				.navigationBarHidden(true)
-		}
-	}
-}
+  @State var readerId: String?
 
-struct Home : View {
-	@Environment(\.scenePhase) private var scenePhase: ScenePhase
-	@ObservedObject var tapToPaySdk: TyroTapToPay
-	private var contentViewModel: ContentViewModel
+  var body: some Scene {
+    WindowGroup {
+      if readerId != nil {
+        Home(readerId: readerId!)
+          .navigationBarHidden(true)
+      } else {
+        EnterReaderIdView(onSubmitReaderId: { readerId in
+          self.readerId = readerId
+        })
+      }
+    }
+  }
+}
 
-	@State private var isSettingsPresented = false
+struct Home: View {
+  @Environment(\.scenePhase) private var scenePhase: ScenePhase
+  @ObservedObject var tapToPaySdk: TyroTapToPay
+  private var contentViewModel: ContentViewModel
 
-	@State private var selectedIndex: Int = 0;
+  @State private var isSettingsPresented = false
+  @State private var selectedIndex: Int = 0
 
-	init() {
-		do {
-			let tapToPaySdk = try TyroTapToPay(
-				environment: .sandbox,
-				connectionProvider: DemoConnectionProvider()
-			)
-			contentViewModel = ContentViewModel(tapToPaySdk: tapToPaySdk)
-			self.tapToPaySdk = tapToPaySdk
-		} catch {
-			fatalError(error.localizedDescription)
-		}
-	}
+  init(readerId: String) {
+    do {
+      let tapToPaySdk = try TyroTapToPay(
+        environment: .sandbox,
+        connectionProvider: DemoConnectionProvider(readerId: readerId)
+      )
+      contentViewModel = ContentViewModel(tapToPaySdk: tapToPaySdk)
+      self.tapToPaySdk = tapToPaySdk
+    } catch {
+      fatalError(error.localizedDescription)
+    }
+  }
 
-	var body: some View {
-		TabView(selection: $selectedIndex) {
-			NavigationStack {
-				VStack {
-					HStack {
-						Spacer(minLength: 0)
-						Image(.tyroLogo)
-							.resizable()
-							.aspectRatio(contentMode: .fit)
-							.frame(maxWidth: 100)
-							.padding()
-						Spacer(minLength: 0)
-						Button(action: {
-							isSettingsPresented.toggle()
-						}) {
-							Image(systemName: "gear")
-								.renderingMode(.template)
-								.resizable()
-								.frame(width: 25, height: 25)
+  var body: some View {
+    TabView(selection: $selectedIndex) {
+      NavigationStack {
+        VStack {
+          HStack {
+            Spacer(minLength: 0)
+            Image(.tyroLogo)
+              .resizable()
+              .aspectRatio(contentMode: .fit)
+              .frame(maxWidth: 100)
+              .padding()
+            Spacer(minLength: 0)
+            Button(action: {
+              isSettingsPresented.toggle()
+            }) {
+              Image(systemName: "gear")
+                .renderingMode(.template)
+                .resizable()
+                .frame(width: 25, height: 25)
+            }.fullScreenCover(isPresented: $isSettingsPresented) {
+              TyroSettingsViewWrapper()
+            }
+          }.padding()
+          ContentView(viewModel: contentViewModel)
+        }.navigationTitle("")
+      }.tabItem {
+        Label("Home", systemImage: "house")
+      }.tag(0)
 
-						}.fullScreenCover(isPresented: $isSettingsPresented) {
-							TyroSettingsViewWrapper()
-						}
-					}.padding()
-					ContentView(viewModel: contentViewModel)
-				}.navigationTitle("")
-			}.tabItem {
-				Label("Home", systemImage: "house")
-			}.tag(0)
-
-			NavigationStack {
-				TyroSettingsView().navigationTitle("Tyro Settings")
-			}.tabItem {
-				Label("Admin", systemImage: "gear")
-			}.tag(1)
-		}
-	}
+      NavigationStack {
+        TyroSettingsView().navigationTitle("Tyro Settings")
+      }.tabItem {
+        Label("Admin", systemImage: "gear")
+      }.tag(1)
+    }
+  }
 }
 
 struct TyroSettingsViewWrapper: View {
-	@Environment(\.dismiss) var dismiss
-	var body: some View {
-		NavigationStack {
-			ZStack {
-				TyroSettingsView()
-			}.toolbar(content: {
-				Button {
-					dismiss()
-				} label: {
-					Image(systemName: "xmark")
-				}
-			})
-		}
-	}
+  @Environment(\.dismiss) var dismiss
+  var body: some View {
+    NavigationStack {
+      ZStack {
+        TyroSettingsView()
+      }.toolbar(content: {
+        Button {
+          dismiss()
+        } label: {
+          Image(systemName: "xmark")
+        }
+      })
+    }
+  }
 }
 
 extension TyroTapToPay: ObservableObject {