Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,14 @@ let openSwiftUITarget = Target.target(
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
swiftSettings: sharedSwiftSettings,
linkerSettings: [.unsafeFlags(["-framework", "CoreServices"], .when(platforms: [.iOS]))] // For CS private API link support
linkerSettings: [
// -framework CoreServices
// For CS private API link support
.linkedFramework("CoreServices", .when(platforms: [.iOS])),
// -lAccessibility
// For Accessibility private API link support
.linkedLibrary("Accessibility", .when(platforms: [.iOS])),
]
)

let openSwiftUITestsSupportTarget = Target.target(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
//
// AccessibilityCoreUserSettings.swift
// OpenSwiftUI
//
// Audited for 6.5.4
// Status: Complete

#if canImport(UIKit)
import Accessibility
package import OpenSwiftUICore
import UIKit

extension AccessibilityCore {
package enum UserSettings {
package static func resolve(into environment: inout EnvironmentValues) {
environment.accessibilityDifferentiateWithoutColor = UIAccessibility.shouldDifferentiateWithoutColor
environment.accessibilityReduceTransparency = UIAccessibility.isReduceTransparencyEnabled
environment.accessibilityReduceMotion = UIAccessibility.isReduceMotionEnabled
environment.accessibilityInvertColors = UIAccessibility.isInvertColorsEnabled
environment.accessibilityPrefersCrossFadeTransitions = UIAccessibility.prefersCrossFadeTransitions
environment.accessibilityShowButtonShapes = UIAccessibility.buttonShapesEnabled
environment.accessibilityDimFlashingLights = _AXSPhotosensitiveMitigationEnabled()
environment.accessibilityPlayAnimatedImages = AccessibilitySettings.animatedImagesEnabled
environment.accessibilityEnabledTechnologies = .enabledTechnologies
environment._accessibilityLargeContentViewerEnabled = UILargeContentViewerInteraction.isEnabled
environment._accessibilityQuickActionsEnabled = false
environment.accessibilityPrefersOnOffLabels = _AXSIncreaseButtonLegibility()
}
}
}

// MARK: - AccessibilityTechnologies + enabledTechnologies

extension AccessibilityTechnologies {
package static var enabledTechnologies: AccessibilityTechnologies {
let enabled = AccessibilityTechnology.allCases.filter { technology in
switch technology {
case .voiceOver: UIAccessibility.isVoiceOverRunning
case .switchControl: UIAccessibility.isSwitchControlRunning
case .fullKeyboardAccess: _AXSFullKeyboardAccessEnabled()
case .voiceControl: _AXSCommandAndControlEnabled()
case .hoverText: _AXSHoverTextEnabled()
case .assistiveAccess: AXAssistiveAccessEnabled()
}
}
return AccessibilityTechnologies(list: enabled)
}
}

// MARK: - Private C functions

@_silgen_name("_AXSPhotosensitiveMitigationEnabled")
private func _AXSPhotosensitiveMitigationEnabled() -> Bool

@_silgen_name("_AXSIncreaseButtonLegibility")
private func _AXSIncreaseButtonLegibility() -> Bool

@_silgen_name("_AXSFullKeyboardAccessEnabled")
private func _AXSFullKeyboardAccessEnabled() -> Bool

@_silgen_name("_AXSCommandAndControlEnabled")
private func _AXSCommandAndControlEnabled() -> Bool

@_silgen_name("_AXSHoverTextEnabled")
private func _AXSHoverTextEnabled() -> Bool

@_silgen_name("AXAssistiveAccessEnabled")
private func AXAssistiveAccessEnabled() -> Bool

#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
//
// AccessibilityEnvironmentAdditions.swift
// OpenSwiftUI
//
// Audited for 6.5.4
// Status: Complete
// ID: E3F97FE8C846010147E7A62076265464 (SwiftUI)

import OpenSwiftUICore

// MARK: - EnabledTechnologiesKey

private struct EnabledTechnologiesKey: EnvironmentKey {
static var defaultValue: AccessibilityTechnologies { AccessibilityTechnologies() }
}

// MARK: - EnvironmentValues + Accessbility

extension EnvironmentValues {
@_spi(Private)
@available(OpenSwiftUI_v3_0, *)
public var accessibilityEnabledTechnologies: AccessibilityTechnologies {
get { self[EnabledTechnologiesKey.self] }
set { self[EnabledTechnologiesKey.self] = newValue }
}

fileprivate func isEnabled(for technology: AccessibilityTechnology) -> Bool {
let member = AccessibilityTechnologies(list: [technology])
return accessibilityEnabledTechnologies.contains(member)
}

fileprivate mutating func setIsEnabled(_ enabled: Bool, for technology: AccessibilityTechnology) {
guard isEnabled(for: technology) != enabled else { return }
let member = AccessibilityTechnologies(list: [technology])
if enabled {
accessibilityEnabledTechnologies.insert(member)
} else {
accessibilityEnabledTechnologies.remove(member)
}
}

}

@available(OpenSwiftUI_v3_0, *)
extension EnvironmentValues {

/// A Boolean value that indicates whether the VoiceOver screen reader is in use.
///
/// The state changes as the user turns on or off the VoiceOver screen reader.
public var accessibilityVoiceOverEnabled: Bool {
isEnabled(for: .voiceOver)
}

/// A Boolean value that indicates whether the Switch Control motor accessibility feature is in use.
///
/// The state changes as the user turns on or off the Switch Control feature.
public var accessibilitySwitchControlEnabled: Bool {
isEnabled(for: .switchControl)
}
}

@_spi(Private)
@available(OpenSwiftUI_v4_0, *)
extension EnvironmentValues {
public var accessibilityFullKeyboardAccessEnabled: Bool {
isEnabled(for: .fullKeyboardAccess)
}

public var accessibilityVoiceControlEnabled: Bool {
isEnabled(for: .voiceControl)
}
}

@_spi(Private)
@available(OpenSwiftUI_v5_0, *)
extension EnvironmentValues {
public var accessibilityHoverTextEnabled: Bool {
isEnabled(for: .hoverText)
}
}

@available(OpenSwiftUI_v6_0, *)
extension EnvironmentValues {
/// A Boolean value that indicates whether Assistive Access is in use.
public var accessibilityAssistiveAccessEnabled: Bool {
isEnabled(for: .assistiveAccess)
}
}
Loading
Loading