Skip to content

Get off of accessibilitySnapshot fork #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Get off of accessibilitySnapshot fork #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f595cc
Get off of accessibilitySnapshot fork
NicoHinderling Aug 6, 2024
fcd17a0
include string localization to demonstrate the NSDoubleLocalizedStrin…
NicoHinderling Aug 8, 2024
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
12 changes: 12 additions & 0 deletions DemoApp/DemoApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
C33735B42C6537E6001054FE /* String+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33735B22C6537E6001054FE /* String+Localization.swift */; };
FA0B20F12A7DA20200EC91D3 /* AnyViewPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0B20F02A7DA20200EC91D3 /* AnyViewPreview.swift */; };
FA0B20FA2A7DCB0100EC91D3 /* ArrayBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0B20F82A7DCB0100EC91D3 /* ArrayBuilder.swift */; };
FA0B20FB2A7DCB0100EC91D3 /* PreviewVariants.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0B20F92A7DCB0100EC91D3 /* PreviewVariants.swift */; };
Expand Down Expand Up @@ -138,6 +139,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
C33735B22C6537E6001054FE /* String+Localization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "String+Localization.swift"; path = "DemoApp/Extensions/String+Localization.swift"; sourceTree = SOURCE_ROOT; };
FA0B20F02A7DA20200EC91D3 /* AnyViewPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyViewPreview.swift; sourceTree = "<group>"; };
FA0B20F82A7DCB0100EC91D3 /* ArrayBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayBuilder.swift; sourceTree = "<group>"; };
FA0B20F92A7DCB0100EC91D3 /* PreviewVariants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewVariants.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -234,6 +236,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
C33735B32C6537E6001054FE /* Extensions */ = {
isa = PBXGroup;
children = (
C33735B22C6537E6001054FE /* String+Localization.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
FA1671B62A5367A800A42DB0 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -268,6 +278,7 @@
FABCCD922AC39081008F4D3A /* EMGTestHandler.swift */,
FA1671C42A5367A800A42DB0 /* ContentView.swift */,
FAD52BF02A7B5EBB001F1832 /* TestViews */,
C33735B32C6537E6001054FE /* Extensions */,
FA1671C62A5367A800A42DB0 /* Assets.xcassets */,
FA1671C82A5367A800A42DB0 /* DemoApp.entitlements */,
FA1671C92A5367A800A42DB0 /* Preview Content */,
Expand Down Expand Up @@ -609,6 +620,7 @@
FAD52BF72A7B5EEA001F1832 /* CodeEntryView.swift in Sources */,
FAD52BF62A7B5EEA001F1832 /* ExpandingView.swift in Sources */,
FAD52BF92A7B5EEA001F1832 /* RideShareButton.swift in Sources */,
C33735B42C6537E6001054FE /* String+Localization.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
7 changes: 7 additions & 0 deletions DemoApp/DemoApp/Extensions/String+Localization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Foundation

extension String {
var localized: String {
return NSLocalizedString(self, comment: "")
}
}
2 changes: 1 addition & 1 deletion DemoApp/DemoApp/TestViews/RideShareButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct RideShareButtonView_Previews: PreviewProvider {
.previewLayout(.sizeThatFits)
.padding()

RideShareButtonView(title: "Request Ride") {
RideShareButtonView(title: "Request Ride".localized) {
print("Button tapped")
}
.previewLayout(.sizeThatFits)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/EmergeTools/FlyingFox.git", exact: "1.0.0"),
.package(url: "https://github.com/EmergeTools/AccessibilitySnapshot.git", exact: "1.0.2"),
.package(url: "https://github.com/cashapp/AccessibilitySnapshot.git", exact: "0.7.0"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
3 changes: 2 additions & 1 deletion Sources/SnapshotPreviewsCore/View+Snapshot.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ extension View {
a11yView.center = window.center
window.addSubview(a11yView)

let elements = try? a11yView.parseAccessibility(useMonochromeSnapshot: false)
try? a11yView.parseAccessibility(useMonochromeSnapshot: false)
let elements = a11yView.accessibilityElements as? [any AccessibilityMark]
a11yView.sizeToFit()
let result = Self.takeSnapshot(layout: .sizeThatFits, renderingMode: renderingMode, rootVC: containerVC, targetView: a11yView)
a11yView.removeFromSuperview()
Expand Down