Skip to content

Commit

Permalink
chore(a11y): update accessibility statement declaration (#278) (#277)
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
Co-authored-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>

Reviewed-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
Tested-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
  • Loading branch information
Tayebsed93 authored Nov 13, 2024
1 parent 9f05b20 commit 566dd06
Show file tree
Hide file tree
Showing 15 changed files with 1,185 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [Tool] GitHub Action to run SwiftLint for *main* and *develop* branches

### Changed

- [DemoApp] Update accessibility statement usage and instructions ([#278](https://github.com/Orange-OpenSource/ouds-ios/issues/278))

### Fixed

- [DemoApp] Add missing accessibility label for images ([#212](https://github.com/Orange-OpenSource/ouds-ios/issues/212))
Expand Down
3 changes: 3 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ in whole or part of, in any medium, except as required for reasonable and custom
and reproducing the content of the NOTICE and DOCUMENTATION files.
Any use or displaying shall constitute an infringement under intellectual property laws of France and international conventions.

./Showcase/Showcase/Resources/accessibilityStatement/favicon.ico
./Showcase/Showcase/Resources/accessibilityStatement/orange-logo.svg

./docs_release/docs_assets/apple-touch-icon.png
./docs_release/docs_assets/favicon-16x16.png
./docs_release/docs_assets/favicon-32x32.png
Expand Down
65 changes: 65 additions & 0 deletions Showcase/Showcase.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@
51BD762B2C466FCF0033365D /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BD761F2C466FCF0033365D /* MainView.swift */; };
51E3FF0B2CAFD9AE00F1BC59 /* ShowcaseElementPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E3FF0A2CAFD9AE00F1BC59 /* ShowcaseElementPage.swift */; };
51EE2C682C5BF5DE00F634EC /* OUDSThemesOrange in Frameworks */ = {isa = PBXBuildFile; productRef = 51EE2C672C5BF5DE00F634EC /* OUDSThemesOrange */; };
6DFC208B2CDE669500F2EC33 /* AccessibilityStatementPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFC208A2CDE669500F2EC33 /* AccessibilityStatementPage.swift */; };
6DFC20B52CE3AF1500F2EC33 /* boosted-grid.min.css in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20B02CE3AF1500F2EC33 /* boosted-grid.min.css */; };
6DFC20B62CE3AF1500F2EC33 /* favicon.ico in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20B12CE3AF1500F2EC33 /* favicon.ico */; };
6DFC20B72CE3AF1500F2EC33 /* pie.css in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20B32CE3AF1500F2EC33 /* pie.css */; };
6DFC20B82CE3AF1500F2EC33 /* style.css in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20B42CE3AF1500F2EC33 /* style.css */; };
6DFC20B92CE3AF1500F2EC33 /* orange-logo.svg in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20B22CE3AF1500F2EC33 /* orange-logo.svg */; };
6DFC20C12CE3D39D00F2EC33 /* accessibility_detail.html in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20BF2CE3D39D00F2EC33 /* accessibility_detail.html */; };
6DFC20C22CE3D39D00F2EC33 /* accessibility_result.xml in Resources */ = {isa = PBXBuildFile; fileRef = 6DFC20C02CE3D39D00F2EC33 /* accessibility_result.xml */; };
6DFC20C52CE3D9AE00F2EC33 /* DeclarationAccessibility in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC20C42CE3D9AE00F2EC33 /* DeclarationAccessibility */; };
E537B9B66A6466473179DEE8 /* Pods_Showcase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0D3017314DBC1733F8D0C79 /* Pods_Showcase.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -197,6 +206,14 @@
51BD761E2C466FCF0033365D /* Showcase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Showcase.swift; sourceTree = "<group>"; };
51BD761F2C466FCF0033365D /* MainView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
51E3FF0A2CAFD9AE00F1BC59 /* ShowcaseElementPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowcaseElementPage.swift; sourceTree = "<group>"; };
6DFC208A2CDE669500F2EC33 /* AccessibilityStatementPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityStatementPage.swift; sourceTree = "<group>"; };
6DFC20B02CE3AF1500F2EC33 /* boosted-grid.min.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "boosted-grid.min.css"; sourceTree = "<group>"; };
6DFC20B12CE3AF1500F2EC33 /* favicon.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = favicon.ico; sourceTree = "<group>"; };
6DFC20B22CE3AF1500F2EC33 /* orange-logo.svg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "orange-logo.svg"; sourceTree = "<group>"; };
6DFC20B32CE3AF1500F2EC33 /* pie.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = pie.css; sourceTree = "<group>"; };
6DFC20B42CE3AF1500F2EC33 /* style.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
6DFC20BF2CE3D39D00F2EC33 /* accessibility_detail.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = accessibility_detail.html; sourceTree = "<group>"; };
6DFC20C02CE3D39D00F2EC33 /* accessibility_result.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = accessibility_result.xml; sourceTree = "<group>"; };
974E2EAB64D9123627CD7D29 /* Pods-DemoApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoApp.release.xcconfig"; path = "Target Support Files/Pods-DemoApp/Pods-DemoApp.release.xcconfig"; sourceTree = "<group>"; };
BF4130905502F287757622E2 /* Pods-DemoApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoApp.debug.xcconfig"; path = "Target Support Files/Pods-DemoApp/Pods-DemoApp.debug.xcconfig"; sourceTree = "<group>"; };
E0D3017314DBC1733F8D0C79 /* Pods_Showcase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Showcase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -224,6 +241,7 @@
070C35622C75EB1C0029C6A8 /* OUDS in Frameworks */,
513AD9402C5AAADE0003253B /* OUDSTokensComponent in Frameworks */,
510A9CD02C5679A300430620 /* OUDSComponents in Frameworks */,
6DFC20C52CE3D9AE00F2EC33 /* DeclarationAccessibility in Frameworks */,
070C35662C7762B90029C6A8 /* OUDSModules in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -483,6 +501,7 @@
51BD760C2C466FCF0033365D /* About */ = {
isa = PBXGroup;
children = (
6DFC20892CDE664400F2EC33 /* AccessibilityStatement */,
51BD760B2C466FCF0033365D /* AboutPage.swift */,
);
path = About;
Expand Down Expand Up @@ -535,6 +554,7 @@
51BD761B2C466FCF0033365D /* Resources */ = {
isa = PBXGroup;
children = (
6DFC209B2CDF92D500F2EC33 /* accessibilityStatement */,
07CF42712CA31AC3000BD03E /* Assets.xcassets */,
073543122CA1676C001187EA /* Colors.xcassets */,
51BD76152C466FCF0033365D /* about_legal_information.html */,
Expand Down Expand Up @@ -567,6 +587,28 @@
path = Showcase;
sourceTree = "<group>";
};
6DFC20892CDE664400F2EC33 /* AccessibilityStatement */ = {
isa = PBXGroup;
children = (
6DFC208A2CDE669500F2EC33 /* AccessibilityStatementPage.swift */,
);
path = AccessibilityStatement;
sourceTree = "<group>";
};
6DFC209B2CDF92D500F2EC33 /* accessibilityStatement */ = {
isa = PBXGroup;
children = (
6DFC20BF2CE3D39D00F2EC33 /* accessibility_detail.html */,
6DFC20C02CE3D39D00F2EC33 /* accessibility_result.xml */,
6DFC20B02CE3AF1500F2EC33 /* boosted-grid.min.css */,
6DFC20B12CE3AF1500F2EC33 /* favicon.ico */,
6DFC20B22CE3AF1500F2EC33 /* orange-logo.svg */,
6DFC20B32CE3AF1500F2EC33 /* pie.css */,
6DFC20B42CE3AF1500F2EC33 /* style.css */,
);
path = accessibilityStatement;
sourceTree = "<group>";
};
6E90D400B72B50FE406E8DFC /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -633,6 +675,7 @@
070C35612C75EB1C0029C6A8 /* OUDS */,
070C35632C773A0D0029C6A8 /* OUDSThemesInverse */,
070C35652C7762B90029C6A8 /* OUDSModules */,
6DFC20C42CE3D9AE00F2EC33 /* DeclarationAccessibility */,
);
productName = DemoApp;
productReference = 07FDCD912C296A500009AA13 /* OUDS Showcase.app */;
Expand Down Expand Up @@ -671,6 +714,7 @@
mainGroup = 07FDCD882C296A500009AA13;
packageReferences = (
0740080F2C94256C006B8729 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
6DFC20C32CE3D9AE00F2EC33 /* XCRemoteSwiftPackageReference "accessibility-statement-lib-ios" */,
);
productRefGroup = 07FDCD922C296A500009AA13 /* Products */;
projectDirPath = "";
Expand All @@ -696,13 +740,20 @@
buildActionMask = 2147483647;
files = (
073543132CA1676C001187EA /* Colors.xcassets in Resources */,
6DFC20C12CE3D39D00F2EC33 /* accessibility_detail.html in Resources */,
6DFC20C22CE3D39D00F2EC33 /* accessibility_result.xml in Resources */,
5149BADB2C3D6F4F000FA4BF /* Podfile in Resources */,
51BD76242C466FCF0033365D /* Preview Assets.xcassets in Resources */,
51BD76252C466FCF0033365D /* about_legal_information.html in Resources */,
5123647B2C3D7B3500572FD5 /* Gemfile.lock in Resources */,
51BD76262C466FCF0033365D /* about_privacy_policy.html in Resources */,
51BD76282C466FCF0033365D /* Localizable.strings in Resources */,
07CF42722CA31AC3000BD03E /* Assets.xcassets in Resources */,
6DFC20B52CE3AF1500F2EC33 /* boosted-grid.min.css in Resources */,
6DFC20B62CE3AF1500F2EC33 /* favicon.ico in Resources */,
6DFC20B72CE3AF1500F2EC33 /* pie.css in Resources */,
6DFC20B82CE3AF1500F2EC33 /* style.css in Resources */,
6DFC20B92CE3AF1500F2EC33 /* orange-logo.svg in Resources */,
512364792C3D7B2D00572FD5 /* Podfile.lock in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -812,6 +863,7 @@
51BD76292C466FCF0033365D /* WebView.swift in Sources */,
51BD76232C466FCF0033365D /* ShowcaseElementsPage.swift in Sources */,
0765B49C2CC15B2E00E69359 /* NamedColor+Elevation.swift in Sources */,
6DFC208B2CDE669500F2EC33 /* AccessibilityStatementPage.swift in Sources */,
51E3FF0B2CAFD9AE00F1BC59 /* ShowcaseElementPage.swift in Sources */,
0765B4942CC1597C00E69359 /* NamedColor+Background.swift in Sources */,
075114DB2CB7D28D00B8B759 /* SizeTokenElement.swift in Sources */,
Expand Down Expand Up @@ -1192,6 +1244,14 @@
version = 1.17.6;
};
};
6DFC20C32CE3D9AE00F2EC33 /* XCRemoteSwiftPackageReference "accessibility-statement-lib-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Orange-OpenSource/accessibility-statement-lib-ios.git";
requirement = {
kind = exactVersion;
version = 1.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -1228,6 +1288,11 @@
isa = XCSwiftPackageProductDependency;
productName = OUDSThemesOrange;
};
6DFC20C42CE3D9AE00F2EC33 /* DeclarationAccessibility */ = {
isa = XCSwiftPackageProductDependency;
package = 6DFC20C32CE3D9AE00F2EC33 /* XCRemoteSwiftPackageReference "accessibility-statement-lib-ios" */;
productName = DeclarationAccessibility;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 07FDCD892C296A500009AA13 /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"originHash" : "b0e966f4ace0da078a6fcc1dcd094050f4d63b9437f87a3a6b4948c17b90db4e",
"originHash" : "ce9d2b5fcd836ee7f16c345c970c6dad8b1405cc6afc0904bafd4a5916517710",
"pins" : [
{
"identity" : "accessibility-statement-lib-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Orange-OpenSource/accessibility-statement-lib-ios.git",
"state" : {
"revision" : "480bf4629b951e459308379030f1ca0ce28a0987",
"version" : "1.3.0"
}
},
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
Expand Down
7 changes: 7 additions & 0 deletions Showcase/Showcase/Pages/About/AboutPage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ struct AboutPage: View {
Text("app_about_legalInformation_label")
}

NavigationLink {
AccessibilityStatementPage()
.navigationTitle("app_about_accessibilityStatement_label")
} label: {
Text("app_about_accessibilityStatement_label")
}

// TODO: Only for debug purposes, should be displayed in another way
Text("Version: \(Bundle.main.marketingVersion)")
Text("Build number: \(Bundle.main.buildNumber)")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// Software Name: OUDS iOS
// SPDX-FileCopyrightText: Copyright (c) Orange SA
// SPDX-License-Identifier: MIT
//
// This software is distributed under the MIT license,
// the text of which is available at https://opensource.org/license/MIT/
// or see the "LICENSE" file for more details.
//
// Authors: See CONTRIBUTORS.txt
// Software description: A SwiftUI components library with code examples for Orange Unified Design System
//

import DeclarationAccessibility
import SwiftUI

struct AccessibilityStatementPage: View {

// MARK: Stored properties

let detailsPageURL: URL

// MARK: Initializer

init() {
guard let detailsPageURL = Bundle.main.url(forResource: "accessibility_detail", withExtension: "html") else {
fatalError("Unable to find accessibility_detail.html in resources")
}

self.detailsPageURL = detailsPageURL
}

// MARK: Body

var body: some View {
VStack {
DeclarationView(xmlFileName: "accessibility_result", selectedTheme: .orange, url: detailsPageURL.absoluteString, useWebView: true)
}
}
}

// MARK: - Previews

struct AccessibilityStatementPage_Previews: PreviewProvider {
static var previews: some View {
AccessibilityStatementPage()
}
}
Loading

0 comments on commit 566dd06

Please sign in to comment.