From f344f37642d7dff669cc3e24108d9ead8b9d56ca Mon Sep 17 00:00:00 2001 From: Piv <18462828+Piv200@users.noreply.github.com> Date: Sun, 3 May 2020 17:21:15 +0930 Subject: [PATCH] Reconfigure iOS project to not be weird. --- .../CarController.xcodeproj/project.pbxproj | 84 ++---------------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../UserInterfaceState.xcuserstate | Bin 0 -> 27789 bytes .../contents.xcworkspacedata | 3 - .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../WorkspaceSettings.xcsettings} | 10 +-- .../xcshareddata/swiftpm/Package.resolved | 70 +++++++++++++++ .../{CarController => }/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../UserInterfaceState.xcuserstate | Bin 24570 -> 0 bytes .../{CarController => }/ContentView.swift | 0 .../{CarController => }/Info.plist | 0 .../Preview Assets.xcassets/Contents.json | 0 .../{CarController => }/SceneDelegate.swift | 0 .../{CarController => }/ServerData.swift | 0 .../SimpleControllerView.swift | 2 + 20 files changed, 82 insertions(+), 89 deletions(-) rename CarControlleriOS/{CarController => }/CarController.xcodeproj/project.pbxproj (80%) rename CarControlleriOS/{CarController => }/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata (68%) rename CarControlleriOS/{CarController => }/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename CarControlleriOS/{CarController/CarController.xcworkspace => CarController.xcodeproj/project.xcworkspace}/xcshareddata/swiftpm/Package.resolved (100%) create mode 100644 CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate rename CarControlleriOS/{CarController => }/CarController.xcworkspace/contents.xcworkspacedata (68%) rename CarControlleriOS/{CarController => }/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename CarControlleriOS/{CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist => CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings} (54%) create mode 100644 CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved rename CarControlleriOS/CarController/{CarController => }/AppDelegate.swift (100%) rename CarControlleriOS/CarController/{CarController => }/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename CarControlleriOS/CarController/{CarController => }/Assets.xcassets/Contents.json (100%) rename CarControlleriOS/CarController/{CarController => }/Base.lproj/LaunchScreen.storyboard (100%) delete mode 100644 CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate rename CarControlleriOS/CarController/{CarController => }/ContentView.swift (100%) rename CarControlleriOS/CarController/{CarController => }/Info.plist (100%) rename CarControlleriOS/CarController/{CarController => }/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename CarControlleriOS/CarController/{CarController => }/SceneDelegate.swift (100%) rename CarControlleriOS/CarController/{CarController => }/ServerData.swift (100%) rename CarControlleriOS/CarController/{CarController => }/SimpleControllerView.swift (89%) diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj b/CarControlleriOS/CarController.xcodeproj/project.pbxproj similarity index 80% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj rename to CarControlleriOS/CarController.xcodeproj/project.pbxproj index 27f45a5..ab9af95 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj +++ b/CarControlleriOS/CarController.xcodeproj/project.pbxproj @@ -21,14 +21,10 @@ 5A9EB280240100970053D3CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB27F240100970053D3CF /* Assets.xcassets */; }; 5A9EB283240100970053D3CF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB282240100970053D3CF /* Preview Assets.xcassets */; }; 5A9EB286240100970053D3CF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB284240100970053D3CF /* LaunchScreen.storyboard */; }; - 5AE45131245CFF2800D82BAF /* GRPC in Frameworks */ = {isa = PBXBuildFile; productRef = 5AE45130245CFF2800D82BAF /* GRPC */; }; - 5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FB25F696A1B33332234B4F /* Pods_CarController.framework */; }; + 5AE45131245CFF2800D82BAF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 03FB25F696A1B33332234B4F /* Pods_CarController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CarController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.release.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.release.xcconfig"; sourceTree = ""; }; - 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.debug.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.debug.xcconfig"; sourceTree = ""; }; 5A6B344D2459AFCE0000E6FC /* SlamController.grpc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlamController.grpc.swift; sourceTree = ""; }; 5A6B344E2459AFCE0000E6FC /* SlamController.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlamController.pb.swift; sourceTree = ""; }; 5A6B34502459AFCE0000E6FC /* lidar_tracker.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = lidar_tracker.pb.swift; sourceTree = ""; }; @@ -52,22 +48,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5AE45131245CFF2800D82BAF /* GRPC in Frameworks */, - 5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */, + 5AE45131245CFF2800D82BAF /* BuildFile in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 49C2CFB75CF1768D7363A9DB /* Frameworks */ = { - isa = PBXGroup; - children = ( - 03FB25F696A1B33332234B4F /* Pods_CarController.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 5A6B344B2459AFCE0000E6FC /* car */ = { isa = PBXGroup; children = ( @@ -112,8 +99,6 @@ 5A6B344B2459AFCE0000E6FC /* car */, 5A9EB278240100960053D3CF /* CarController */, 5A9EB277240100960053D3CF /* Products */, - A595BD070E838AFD9A774908 /* Pods */, - 49C2CFB75CF1768D7363A9DB /* Frameworks */, ); sourceTree = ""; }; @@ -149,15 +134,6 @@ path = "Preview Content"; sourceTree = ""; }; - A595BD070E838AFD9A774908 /* Pods */ = { - isa = PBXGroup; - children = ( - 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */, - 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -165,11 +141,9 @@ isa = PBXNativeTarget; buildConfigurationList = 5A9EB28A240100970053D3CF /* Build configuration list for PBXNativeTarget "CarController" */; buildPhases = ( - DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */, 5A9EB272240100960053D3CF /* Sources */, 5A9EB273240100960053D3CF /* Frameworks */, 5A9EB274240100960053D3CF /* Resources */, - E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -177,7 +151,7 @@ ); name = CarController; packageProductDependencies = ( - 5AE45130245CFF2800D82BAF /* GRPC */, + 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */, ); productName = CarController; productReference = 5A9EB276240100960053D3CF /* CarController.app */; @@ -208,7 +182,7 @@ ); mainGroup = 5A9EB26D240100950053D3CF; packageReferences = ( - 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */, + 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */, ); productRefGroup = 5A9EB277240100960053D3CF /* Products */; projectDirPath = ""; @@ -232,48 +206,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CarController-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 5A9EB272240100960053D3CF /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -423,7 +355,6 @@ }; 5A9EB28B240100970053D3CF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -444,7 +375,6 @@ }; 5A9EB28C240100970053D3CF /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -487,7 +417,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */ = { + 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/grpc/grpc-swift.git"; requirement = { @@ -498,9 +428,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 5AE45130245CFF2800D82BAF /* GRPC */ = { + 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */ = { isa = XCSwiftPackageProductDependency; - package = 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */; + package = 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */; productName = GRPC; }; /* End XCSwiftPackageProductDependency section */ diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 68% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 4a8720b..919434a 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..2d2e86aa0681ae5a38d17932ff6598a9f09b87ae GIT binary patch literal 27789 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 z - - diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to CarControlleriOS/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist b/CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 54% rename from CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist rename to CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 475fda5..f9b0d7c 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -2,13 +2,7 @@ - SchemeUserState - - CarController.xcscheme_^#shared#^_ - - orderHint - 0 - - + PreviewsEnabled + diff --git a/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..c90f41d --- /dev/null +++ b/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,70 @@ +{ + "object": { + "pins": [ + { + "package": "grpc-swift", + "repositoryURL": "https://github.com/grpc/grpc-swift.git", + "state": { + "branch": null, + "revision": "373ffd54c1c1a319d0ddac9476d13be9023584bb", + "version": "1.0.0-alpha.11" + } + }, + { + "package": "swift-log", + "repositoryURL": "https://github.com/apple/swift-log.git", + "state": { + "branch": null, + "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa", + "version": "1.2.0" + } + }, + { + "package": "swift-nio", + "repositoryURL": "https://github.com/apple/swift-nio.git", + "state": { + "branch": null, + "revision": "e876fb37410e0036b98b5361bb18e6854739572b", + "version": "2.16.0" + } + }, + { + "package": "swift-nio-http2", + "repositoryURL": "https://github.com/apple/swift-nio-http2.git", + "state": { + "branch": null, + "revision": "82eb3fa0974b838358ee46bc6c5381e5ae5de6b9", + "version": "1.11.0" + } + }, + { + "package": "swift-nio-ssl", + "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", + "state": { + "branch": null, + "revision": "ae213938e151964aa691f0e902462fbe06baeeb6", + "version": "2.7.1" + } + }, + { + "package": "swift-nio-transport-services", + "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", + "state": { + "branch": null, + "revision": "85a67aea7caf5396ed599543dd23cffeb6dbbf96", + "version": "1.5.1" + } + }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "7790acf0a81d08429cb20375bf42a8c7d279c5fe", + "version": "1.8.0" + } + } + ] + }, + "version": 1 +} diff --git a/CarControlleriOS/CarController/CarController/AppDelegate.swift b/CarControlleriOS/CarController/AppDelegate.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/AppDelegate.swift rename to CarControlleriOS/CarController/AppDelegate.swift diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json b/CarControlleriOS/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json rename to CarControlleriOS/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json b/CarControlleriOS/CarController/Assets.xcassets/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json rename to CarControlleriOS/CarController/Assets.xcassets/Contents.json diff --git a/CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard b/CarControlleriOS/CarController/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard rename to CarControlleriOS/CarController/Base.lproj/LaunchScreen.storyboard diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 48d4abe71ca08d9479a846a728bcdeba92958b0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24570 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 diff --git a/CarControlleriOS/CarController/CarController/ContentView.swift b/CarControlleriOS/CarController/ContentView.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/ContentView.swift rename to CarControlleriOS/CarController/ContentView.swift diff --git a/CarControlleriOS/CarController/CarController/Info.plist b/CarControlleriOS/CarController/Info.plist similarity index 100% rename from CarControlleriOS/CarController/CarController/Info.plist rename to CarControlleriOS/CarController/Info.plist diff --git a/CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json b/CarControlleriOS/CarController/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json rename to CarControlleriOS/CarController/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/CarControlleriOS/CarController/CarController/SceneDelegate.swift b/CarControlleriOS/CarController/SceneDelegate.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/SceneDelegate.swift rename to CarControlleriOS/CarController/SceneDelegate.swift diff --git a/CarControlleriOS/CarController/CarController/ServerData.swift b/CarControlleriOS/CarController/ServerData.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/ServerData.swift rename to CarControlleriOS/CarController/ServerData.swift diff --git a/CarControlleriOS/CarController/CarController/SimpleControllerView.swift b/CarControlleriOS/CarController/SimpleControllerView.swift similarity index 89% rename from CarControlleriOS/CarController/CarController/SimpleControllerView.swift rename to CarControlleriOS/CarController/SimpleControllerView.swift index ddddf3c..a394d1f 100644 --- a/CarControlleriOS/CarController/CarController/SimpleControllerView.swift +++ b/CarControlleriOS/CarController/SimpleControllerView.swift @@ -11,11 +11,13 @@ import SwiftUI struct SimpleControllerView: View { @EnvironmentObject var server: ServerData @State var throttle: Float = 0 + @State var steering: Float = 0 var body: some View { HStack{ Text("Opened Simple Controller!") Slider(value: $throttle) + Slider(value: $steering) } } }