diff --git a/LICENSE.txt b/LICENSE.txt index 9e841e7a..70aaf881 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,6 @@ MIT License + Copyright (c) 2024 Soundscape Community Contributors Copyright (c) Microsoft Corporation. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/apps/ios/GuideDogs.xcodeproj/project.pbxproj b/apps/ios/GuideDogs.xcodeproj/project.pbxproj index b0a8eb6a..cea8b1c7 100644 --- a/apps/ios/GuideDogs.xcodeproj/project.pbxproj +++ b/apps/ios/GuideDogs.xcodeproj/project.pbxproj @@ -6472,7 +6472,7 @@ CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/SoundscapeDF.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = ""; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_BITCODE = NO; @@ -6503,7 +6503,7 @@ "$(inherited)", "$(PROJECT_DIR)/GuideDogs", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.1; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) -DADHOC"; PRODUCT_BUNDLE_IDENTIFIER = "services.soundscape-adhoc"; @@ -6761,7 +6761,7 @@ CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/Soundscape.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X4H33NKGKY; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -6793,7 +6793,7 @@ "$(inherited)", "$(PROJECT_DIR)/GuideDogs", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.1; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) -DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = "services.soundscape-debug"; @@ -6821,7 +6821,7 @@ CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/Soundscape.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = X4H33NKGKY; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_BITCODE = NO; @@ -6851,7 +6851,7 @@ "$(inherited)", "$(PROJECT_DIR)/GuideDogs", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.1; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) -DRELEASE"; PRODUCT_BUNDLE_IDENTIFIER = services.soundscape; diff --git a/apps/ios/GuideDogs/Assets/Licenses/licenses.html b/apps/ios/GuideDogs/Assets/Licenses/licenses.html index 03e5c861..56b97d7d 100644 --- a/apps/ios/GuideDogs/Assets/Licenses/licenses.html +++ b/apps/ios/GuideDogs/Assets/Licenses/licenses.html @@ -3,7 +3,7 @@ - Third Party Notices + Copyright Notices +

MIT License

- Soundscape -
Copyright (c) Microsoft Corporation + Copyright © 2024 Soundscape Community Contributors +
+ Copyright © Microsoft Corporation. +

+

+ Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: +

+

+ The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. +

+

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE +

+

Third Party Notices

+

+ Microsoft Soundscape +
Copyright © Microsoft Corporation

OpenStreetMap -
Copyright (c) OpenStreetMap Contributors +
Copyright © OpenStreetMap Contributors

CocoaLumberjack -
Copyright (c) 2016 Deusty, LLC +
Copyright © 2016 Deusty, LLC

Realm -
Copyright (c) 2011-2016 Realm Inc All rights reserved +
Copyright © 2011-2016 Realm Inc All rights reserved

DZNEmptyDataSet -
Copyright (c) 2016 Ignacio Romero Zurbuchen +
Copyright © 2016 Ignacio Romero Zurbuchen

NVActivityIndicatorView -
Copyright (c) 2016 Nguyen Vinh +
Copyright © 2016 Nguyen Vinh

- iOS-GPX-Framework -
Copyright (c) 2012 NextBusinessSystem Co., Ltd. + CoreGPX +
Copyright © 2018 Vincent Neo

TBXML -
Copyright (c) 2009 Tom Bradley +
Copyright © 2009 Tom Bradley

SDWebImage -
Copyright (c) 2009-2017 Olivier Poitrey rs@dailymotion.com +
Copyright © 2009-2017 Olivier Poitrey rs@dailymotion.com

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 ff8917ca..a95174bc 100644 --- a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings +++ b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings @@ -589,6 +589,9 @@ /* Settings About Title, Third Party Notices */ "settings.about.title.third_party" = "Third Party Notices"; +/* Settings About Title, Copyright Notices */ +"settings.about.title.copyright" = "Copyright Notices"; + //------------------------------------------------------------------------------ // MARK: Settings (New Feature) //------------------------------------------------------------------------------ diff --git a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift index 5e57a7ea..98214f1a 100644 --- a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift +++ b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift @@ -51,7 +51,7 @@ class AboutApplicationViewController: BaseTableViewController { AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.whats_new"), segue: "ShowVersionHistorySegue"), AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Privacy Policy"), url: AppContext.Links.privacyPolicyURL(for: LocalizationContext.currentAppLocale), event: "about.privacy_policy"), AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Services Agreement"), url: AppContext.Links.servicesAgreementURL(for: LocalizationContext.currentAppLocale), event: "about.services_agreement"), - AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.third_party"), segue: "ShowThirdPartyNoticesSegue") + AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.copyright"), segue: "ShowThirdPartyNoticesSegue") ] if LocalizationContext.currentAppLocale == Locale.frFr { diff --git a/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard b/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard index d4451605..2cf722f6 100644 --- a/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard +++ b/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard @@ -896,7 +896,7 @@ - +