🔀 Merge branch 'ladislas/feature/lekaapp-add-robot-connection'

leka · Nov 9, 2023 · 806772d · 806772d
2 parents cf6887b + 091310f
commit 806772d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 353 deletions.
diff --git a/Apps/LekaApp/Project.swift b/Apps/LekaApp/Project.swift
@@ -11,6 +11,7 @@ let project = Project.iOSApp(
     version: "1.0.0",
     dependencies: [
         .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
+        .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
         .external(name: "Yams"),
         .external(name: "Lottie"),
     ],

diff --git a/Apps/LekaApp/Sources/HomeView.swift b/Apps/LekaApp/Sources/HomeView.swift
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import DesignKit
+import RobotKit
 import SwiftUI
 
 struct HomeView: View {
@@ -43,7 +44,7 @@ struct HomeView: View {
         }
         .fullScreenCover(isPresented: $navigationVM.showRobotPicker) {
             NavigationStack {
-                RobotPicker()
+                RobotConnectionView()
             }
         }
         .fullScreenCover(isPresented: $navigationVM.showActivitiesFullScreenCover) {

diff --git a/Apps/LekaApp/Sources/Views/EducationalContent/PathToGameview/FullScreenCoverToGameView.swift b/Apps/LekaApp/Sources/Views/EducationalContent/PathToGameview/FullScreenCoverToGameView.swift
@@ -2,6 +2,7 @@
 // Copyright 2023 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+import RobotKit
 import SwiftUI
 
 struct FullScreenCoverToGameView: View {
@@ -15,7 +16,7 @@ struct FullScreenCoverToGameView: View {
                     for: PathsToGame.self,
                     destination: { destination in
                         switch destination {
-                            case .robot: RobotPicker()
+                            case .robot: RobotConnectionView()
                             case .user: ProfileSelector_Users()
                             case .game: GameView()
                         }

diff --git a/Apps/LekaApp/Sources/Views/Robot/BotConnectComponents/RobotFaceView.swift b/Apps/LekaApp/Sources/Views/Robot/BotConnectComponents/RobotFaceView.swift
diff --git a/Apps/LekaApp/Sources/Views/Robot/BotConnectComponents/RobotStore.swift b/Apps/LekaApp/Sources/Views/Robot/BotConnectComponents/RobotStore.swift
diff --git a/Apps/LekaApp/Sources/Views/Robot/RobotPicker.swift b/Apps/LekaApp/Sources/Views/Robot/RobotPicker.swift