Skip to content

Commit 718baa6

Browse files
authored
Fix iOS 26 A11y (#660)
1 parent 1ce9e1b commit 718baa6

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

ios/HackerNews.xcodeproj/project.pbxproj

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
F48E9DA82D4D2A3C00FD8B30 /* Common in Embed Frameworks */ = {isa = PBXBuildFile; productRef = F48E9DA62D4D2A3C00FD8B30 /* Common */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3535
F48E9ECB2D4D691600FD8B30 /* ETDistribution in Frameworks */ = {isa = PBXBuildFile; productRef = F48E9ECA2D4D691600FD8B30 /* ETDistribution */; };
3636
F48E9FDB2D51690400FD8B30 /* ETDistribution in Embed Frameworks */ = {isa = PBXBuildFile; productRef = F48E9ECA2D4D691600FD8B30 /* ETDistribution */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
37+
FA3637612EC7AC7D00541313 /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA3637602EC7AC7D00541313 /* AccessibilitySnapshotCore */; };
38+
FA3637642EC7ACAD00541313 /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA3637632EC7ACAD00541313 /* AccessibilitySnapshotCore */; };
3739
FA80C2702EC78D7500A700AB /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */; };
38-
FA80C2732EC78F2D00A700AB /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA80C2722EC78F2D00A700AB /* AccessibilitySnapshotCore */; };
3940
/* End PBXBuildFile section */
4041

4142
/* Begin PBXContainerItemProxy section */
@@ -205,11 +206,12 @@
205206
isa = PBXFrameworksBuildPhase;
206207
buildActionMask = 2147483647;
207208
files = (
208-
FA80C2732EC78F2D00A700AB /* AccessibilitySnapshotCore in Frameworks */,
209+
FA3637612EC7AC7D00541313 /* AccessibilitySnapshotCore in Frameworks */,
209210
A495A6662CED57BB009A2A6B /* SnapshotTesting in Frameworks */,
210211
C3AC6AD92CB6E8F7006BD22D /* SnapshottingTests in Frameworks */,
211212
A4BED5C32AD5E083001642B3 /* (null) in Frameworks */,
212213
F48E9DA32D4D2A3500FD8B30 /* Common in Frameworks */,
214+
FA3637642EC7ACAD00541313 /* AccessibilitySnapshotCore in Frameworks */,
213215
FA80C2702EC78D7500A700AB /* AccessibilitySnapshotCore in Frameworks */,
214216
);
215217
runOnlyForDeploymentPostprocessing = 0;
@@ -502,7 +504,7 @@
502504
F45F6F4C2D4D2554003FA9A3 /* XCLocalSwiftPackageReference "Packages/Fonts" */,
503505
F48E9EC92D4D691600FD8B30 /* XCRemoteSwiftPackageReference "ETDistribution" */,
504506
A42271692DE78DEF002F03D5 /* XCRemoteSwiftPackageReference "faultordering" */,
505-
FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */,
507+
FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */,
506508
);
507509
productRefGroup = A427057A2A4293B10057E439 /* Products */;
508510
projectDirPath = "";
@@ -1281,20 +1283,20 @@
12811283
minimumVersion = 0.2.1;
12821284
};
12831285
};
1284-
FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = {
1286+
FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */ = {
12851287
isa = XCRemoteSwiftPackageReference;
1286-
repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot.git";
1288+
repositoryURL = "https://github.com/EmergeTools/AccessibilitySnapshotios26";
12871289
requirement = {
1288-
kind = exactVersion;
1289-
version = 1.0.2;
1290+
branch = main;
1291+
kind = branch;
12901292
};
12911293
};
1292-
FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = {
1294+
FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = {
12931295
isa = XCRemoteSwiftPackageReference;
1294-
repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot";
1296+
repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot.git";
12951297
requirement = {
1296-
kind = upToNextMajorVersion;
1297-
minimumVersion = 0.10.0;
1298+
kind = exactVersion;
1299+
version = 1.0.2;
12981300
};
12991301
};
13001302
/* End XCRemoteSwiftPackageReference section */
@@ -1385,14 +1387,18 @@
13851387
package = F48E9EC92D4D691600FD8B30 /* XCRemoteSwiftPackageReference "ETDistribution" */;
13861388
productName = ETDistribution;
13871389
};
1388-
FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */ = {
1390+
FA3637602EC7AC7D00541313 /* AccessibilitySnapshotCore */ = {
13891391
isa = XCSwiftPackageProductDependency;
1390-
package = FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */;
13911392
productName = AccessibilitySnapshotCore;
13921393
};
1393-
FA80C2722EC78F2D00A700AB /* AccessibilitySnapshotCore */ = {
1394+
FA3637632EC7ACAD00541313 /* AccessibilitySnapshotCore */ = {
13941395
isa = XCSwiftPackageProductDependency;
1395-
package = FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */;
1396+
package = FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */;
1397+
productName = AccessibilitySnapshotCore;
1398+
};
1399+
FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */ = {
1400+
isa = XCSwiftPackageProductDependency;
1401+
package = FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */;
13961402
productName = AccessibilitySnapshotCore;
13971403
};
13981404
/* End XCSwiftPackageProductDependency section */

ios/HackerNews.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ios/HackerNewsTests/HackerNewsSnapshotTest.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ override open class func setupA11y() -> ((UIViewController, UIWindow, PreviewLay
3636
}
3737
let a11yView = AccessibilitySnapshotView(
3838
containedView: containedView,
39-
viewRenderingMode: controller.view.bounds.size.requiresCoreAnimationSnapshot ? .renderLayerInContext : .drawHierarchyInRect,
40-
activationPointDisplayMode: .never,
41-
showUserInputLabels: true)
39+
snapshotConfiguration: .init(
40+
viewRenderingMode: controller.view.bounds.size.requiresCoreAnimationSnapshot ? .renderLayerInContext : .drawHierarchyInRect,
41+
activationPointDisplay: .never,
42+
includesInputLabels: .never))
4243

4344
a11yView.center = window.center
4445
window.addSubview(a11yView)
4546

46-
_ = try? a11yView.parseAccessibility(useMonochromeSnapshot: false)
47+
_ = try? a11yView.parseAccessibility()
4748
a11yView.sizeToFit()
4849
return a11yView
4950
}

0 commit comments

Comments
 (0)