Skip to content

Replace marker tutorial storyboard with SwiftUI #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RDMurray wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace marker tutorial storyboard with SwiftUI #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/ios/GuideDogs.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@
D30355D31B61401D00E1DDED /* GDAJSONObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D30355D21B61401D00E1DDED /* GDAJSONObject.m */; };
D395B0F71B41DA15005A6407 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D395B0F61B41DA15005A6407 /* Images.xcassets */; };
D4A72B0131A1000100C0FFEE /* URLResourceIdentifierTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4A72B0031A1000100C0FFEE /* URLResourceIdentifierTest.swift */; };
F2A1000131B0000100C0FFEE /* MarkerTutorialViewStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2A1000031B0000100C0FFEE /* MarkerTutorialViewStateTests.swift */; };
DCAAD87F2BC1E95F0018D135 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = DCAAD87E2BC1E95F0018D135 /* PrivacyInfo.xcprivacy */; };
DCE4D2AD2D7CE40F00B5DA4B /* NewFeatures.json in Resources */ = {isa = PBXBuildFile; fileRef = DCE4D2AC2D7CE40F00B5DA4B /* NewFeatures.json */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -1332,6 +1333,7 @@
915FF9F42ADE3F91002B3690 /* AuthoredActivityContentTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthoredActivityContentTest.swift; sourceTree = "<group>"; };
91C82AAC2A5DCF040086D126 /* GeolocationManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = " GeolocationManagerTest.swift"; path = "UnitTests/Sensors/Geolocation/Geolocation Manager/ GeolocationManagerTest.swift"; sourceTree = SOURCE_ROOT; };
91C82ABD2A6B08500086D126 /* RouteGuidanceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RouteGuidanceTest.swift; path = "UnitTests/Behaviors/Route Guidance/RouteGuidanceTest.swift"; sourceTree = SOURCE_ROOT; };
F2A1000031B0000100C0FFEE /* MarkerTutorialViewStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MarkerTutorialViewStateTests.swift; path = UnitTests/MarkerTutorialViewStateTests.swift; sourceTree = SOURCE_ROOT; };
9A69906E2D5BDB8900D37B7D /* BoseFramesBLEDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BoseFramesBLEDevice.swift; path = Code/Devices/BLE/BoseFramesBLEDevice.swift; sourceTree = "<group>"; };
9A69906F2D5BDB8900D37B7D /* BoseSensorConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BoseSensorConfiguration.swift; path = Code/Devices/BLE/BoseSensorConfiguration.swift; sourceTree = "<group>"; };
9A6990702D5BDB8900D37B7D /* BoseSensorDataProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BoseSensorDataProcessor.swift; path = Code/Devices/BLE/BoseSensorDataProcessor.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3509,6 +3511,7 @@
914DEBCE2A3CE6B9007B161C /* UnitTests */ = {
isa = PBXGroup;
children = (
F2A1000031B0000100C0FFEE /* MarkerTutorialViewStateTests.swift */,
914BAAFB2AD747C200CB2171 /* Audio */,
91C82ABB2A6B03790086D126 /* Behaviors */,
91C82AB52A67182E0086D126 /* Data */,
Expand Down Expand Up @@ -4744,6 +4747,7 @@
914BAB012AD7490100CB2171 /* NavigationControllerTest.swift in Sources */,
D4A72B0131A1000100C0FFEE /* URLResourceIdentifierTest.swift in Sources */,
D4A72B1131A2000100C0FFEE /* LocalizationContextTest.swift in Sources */,
F2A1000131B0000100C0FFEE /* MarkerTutorialViewStateTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
8 changes: 3 additions & 5 deletions apps/ios/GuideDogs/Code/Visual UI/View Controllers/Help/HelpViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Soundscape
//
// Copyright (c) Microsoft Corporation.
// Copyright (c) Soundscape Community Contributors.
// Licensed under the MIT License.
//

Expand Down Expand Up @@ -272,7 +273,6 @@ class HelpViewController: BaseTableViewController {
static let OpenHelpPage = "OpenHelpPage"
static let OpenGenericHelpPage = "OpenGenericHelpPage"
static let OpenDestinationTutorial = "destinationTutorial"
static let OpenMarkerTutorial = "markerTutorial"
static let OpenOfflinePage = "showOfflineInfo"
}

Expand Down Expand Up @@ -414,7 +414,8 @@ class HelpViewController: BaseTableViewController {
if indexPath.row == Row.destinations {
performSegue(withIdentifier: Segues.OpenDestinationTutorial, sender: self)
} else if indexPath.row == Row.markers {
performSegue(withIdentifier: Segues.OpenMarkerTutorial, sender: self)
let viewController = MarkerTutorialViewController(logContext: "help_screen")
navigationController?.pushViewController(viewController, animated: true)
}

default:
Expand Down Expand Up @@ -488,9 +489,6 @@ class HelpViewController: BaseTableViewController {
case let destinationVC as DestinationTutorialIntroViewController:
destinationVC.logContext = "help_screen"

case let markerVC as MarkerTutorialViewController:
markerVC.logContext = "help_screen"

default:
return
}
Expand Down
2 changes: 0 additions & 2 deletions apps/ios/GuideDogs/Code/Visual UI/View Controllers/Home/HomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,6 @@ class HomeViewController: UIViewController {
} else if let vc = segue.destination as? DestinationTutorialIntroViewController {
vc.source = self
vc.logContext = telemetryContext
} else if let vc = segue.destination as? MarkerTutorialViewController {
vc.logContext = telemetryContext
} else if let vc = segue.destination as? StandbyViewController {
vc.delegate = self
} else if let vc = segue.destination as? LocationDetailViewController {
Expand Down
Loading