From 640fdf5088a44c3600a065f5058084663da491f3 Mon Sep 17 00:00:00 2001 From: Ryan Thomas Date: Tue, 12 Nov 2024 17:49:58 -0500 Subject: [PATCH 1/3] beaconMoved --- .../Settings/SettingsViewController.swift | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/SettingsViewController.swift b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/SettingsViewController.swift index ffd310357..9ca51d6d5 100644 --- a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/SettingsViewController.swift +++ b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/SettingsViewController.swift @@ -15,11 +15,12 @@ class SettingsViewController: BaseTableViewController { private enum Section: Int, CaseIterable { case general = 0 case audio = 1 - case callouts = 2 - case streetPreview = 3 - case troubleshooting = 4 - case about = 5 - case telemetry = 6 + case beacon = 2 + case callouts = 3 + case streetPreview = 4 + case troubleshooting = 5 + case about = 6 + case telemetry = 7 } private enum CalloutsRow: Int, CaseIterable { @@ -33,12 +34,13 @@ class SettingsViewController: BaseTableViewController { private static let cellIdentifiers: [IndexPath: String] = [ IndexPath(row: 0, section: Section.general.rawValue): "languageAndRegion", IndexPath(row: 1, section: Section.general.rawValue): "voice", - IndexPath(row: 2, section: Section.general.rawValue): "beaconSettings", - IndexPath(row: 3, section: Section.general.rawValue): "volumeSettings", - IndexPath(row: 4, section: Section.general.rawValue): "manageDevices", - IndexPath(row: 5, section: Section.general.rawValue): "siriShortcuts", + IndexPath(row: 2, section: Section.general.rawValue): "volumeSettings", + IndexPath(row: 3, section: Section.general.rawValue): "manageDevices", + IndexPath(row: 4, section: Section.general.rawValue): "siriShortcuts", IndexPath(row: 0, section: Section.audio.rawValue): "mixAudio", + + IndexPath(row: 0, section: Section.beacon.rawValue): "beaconSettings", IndexPath(row: CalloutsRow.all.rawValue, section: Section.callouts.rawValue): "allCallouts", IndexPath(row: CalloutsRow.poi.rawValue, section: Section.callouts.rawValue): "poiCallouts", @@ -83,8 +85,9 @@ class SettingsViewController: BaseTableViewController { guard let sectionType = Section(rawValue: section) else { return 0 } switch sectionType { - case .general: return 6 + case .general: return 5 case .audio: return 1 + case .beacon: return 1 case .callouts: return SettingsContext.shared.automaticCalloutsEnabled ? 5 : 1 case .streetPreview: return 1 case .troubleshooting: return 1 @@ -142,6 +145,7 @@ class SettingsViewController: BaseTableViewController { switch sectionType { case .general: return GDLocalizedString("settings.section.general") case .audio: return GDLocalizedString("settings.audio.media_controls") + case .beacon: return GDLocalizedString("settings.beacon.title") case .callouts: return GDLocalizedString("menu.manage_callouts") case .about: return GDLocalizedString("settings.section.about") case .streetPreview: return GDLocalizedString("preview.title") From 561270de410648a987165b266e2e53074b74395f Mon Sep 17 00:00:00 2001 From: Ryan Thomas Date: Tue, 12 Nov 2024 18:38:50 -0500 Subject: [PATCH 2/3] name changed --- .../Assets/Localization/en-US.lproj/Localizable.strings | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings index 998313537..bcb5ce239 100644 --- a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings +++ b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings @@ -416,6 +416,8 @@ /* Language display name. %1$@ is a language name, %2$@ is the country name. e.g. "English (United Kingdom)" {NumberedPlaceholder="%1$@", "%2$@"} */ "settings.language.language_name" = "%1$@ (%2$@)"; + + //------------------------------------------------------------------------------ // MARK: Settings (Audio) //------------------------------------------------------------------------------ @@ -509,8 +511,7 @@ //------------------------------------------------------------------------------ /* Title of the settings screen for beacons. This screen allows users to configure the way the audio beacon sounds. See Terms for the definition of "beacon". */ -"beacon.settings_title" = "Beacon Settings"; - +"settings.beacon.title" = "Beacon Settings"; /* Title of a section in the beacon settings page where the user can select the distance threshold when a beacon automatically stops playing. */ "beacon.settings.vicinity" = "Enter Vicinity Distance"; From a37730c0bb5ce01f3dd8a19ebbc3f8105171afc6 Mon Sep 17 00:00:00 2001 From: Ryan Thomas Date: Fri, 15 Nov 2024 16:19:03 -0500 Subject: [PATCH 3/3] Update Localizable.strings --- .../Assets/Localization/en-GB.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings index d3c089405..d0d3a8b71 100644 --- a/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings +++ b/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings @@ -575,7 +575,7 @@ /* */ -"beacon.settings_title" = "Beacon Settings"; +"settings.beacon.title" = "Beacon Settings"; /* */ "beacon.settings.vicinity" = "Enter Vicinity Distance";