Skip to content
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

Jump to bottom

Add initializers for AppIntents #125

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

Add initializers for AppIntents #125

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
57dd08c
Add initializers for AppIntents
andschdk Jan 22, 2024
7d20717
Rename files
andschdk Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

### Added

- None
- Added initializers for AppIntents (`DisplayRepresentation` and `DisplayRepresentation.Image`) (By [andschdk](https://github.com/andschdk))

### Changed

Expand Down
29 changes: 29 additions & 0 deletions SFSafeSymbols.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
636A46C928002819007E6028 /* SFSymbol+AllSymbols+2.1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636A46B928002819007E6028 /* SFSymbol+AllSymbols+2.1.swift */; };
636A46CA28002819007E6028 /* SFSymbol+AllSymbols+2.0.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636A46BA28002819007E6028 /* SFSymbol+AllSymbols+2.0.swift */; };
636EBFD427EB2ABC005CFF4C /* SymbolWithLocalizations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636EBFD327EB2ABC005CFF4C /* SymbolWithLocalizations.swift */; };
8AD97FE02B5E9AC20058C050 /* DisplayRepresentationImageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD97FDF2B5E9AC20058C050 /* DisplayRepresentationImageExtension.swift */; };
8AD97FE22B5E9B790058C050 /* DisplayRepresentationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD97FE12B5E9B790058C050 /* DisplayRepresentationExtension.swift */; };
8AD97FE62B5EA17D0058C050 /* DisplayRepresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD97FE42B5EA0B70058C050 /* DisplayRepresentationTests.swift */; };
B00FBD8E285E146400A7878B /* LocalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B00FBD8D285E146400A7878B /* LocalizationTests.swift */; };
B01C186D2B55D9B300AC4288 /* SFSymbol+5.0.swift in Sources */ = {isa = PBXBuildFile; fileRef = B01C18652B55D9B300AC4288 /* SFSymbol+5.0.swift */; };
B01C186E2B55D9B300AC4288 /* SFSymbol+5.2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B01C18662B55D9B300AC4288 /* SFSymbol+5.2.swift */; };
Expand Down Expand Up @@ -85,6 +88,9 @@
636A46B928002819007E6028 /* SFSymbol+AllSymbols+2.1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SFSymbol+AllSymbols+2.1.swift"; sourceTree = "<group>"; };
636A46BA28002819007E6028 /* SFSymbol+AllSymbols+2.0.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SFSymbol+AllSymbols+2.0.swift"; sourceTree = "<group>"; };
636EBFD327EB2ABC005CFF4C /* SymbolWithLocalizations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolWithLocalizations.swift; sourceTree = "<group>"; };
8AD97FDF2B5E9AC20058C050 /* DisplayRepresentationImageExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayRepresentationImageExtension.swift; sourceTree = "<group>"; };
8AD97FE12B5E9B790058C050 /* DisplayRepresentationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayRepresentationExtension.swift; sourceTree = "<group>"; };
8AD97FE42B5EA0B70058C050 /* DisplayRepresentationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayRepresentationTests.swift; sourceTree = "<group>"; };
B00FBD8D285E146400A7878B /* LocalizationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationTests.swift; sourceTree = "<group>"; };
B01C18652B55D9B300AC4288 /* SFSymbol+5.0.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SFSymbol+5.0.swift"; sourceTree = "<group>"; };
B01C18662B55D9B300AC4288 /* SFSymbol+5.2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SFSymbol+5.2.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -146,6 +152,23 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
8AD97FDE2B5E9A830058C050 /* AppIntents */ = {
isa = PBXGroup;
children = (
8AD97FDF2B5E9AC20058C050 /* DisplayRepresentationImageExtension.swift */,
8AD97FE12B5E9B790058C050 /* DisplayRepresentationExtension.swift */,
);
path = AppIntents;
sourceTree = "<group>";
};
8AD97FE32B5EA07C0058C050 /* AppIntents */ = {
isa = PBXGroup;
children = (
8AD97FE42B5EA0B70058C050 /* DisplayRepresentationTests.swift */,
);
path = AppIntents;
sourceTree = "<group>";
};
96244F11253F15B700253B88 /* SFSafeSymbols */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -177,6 +200,7 @@
children = (
CC1D813027F758D900CACDC7 /* Helpers */,
B0DDAE102637BF0700081F1C /* Core */,
8AD97FE32B5EA07C0058C050 /* AppIntents */,
CCCCD05B252F7F8300C7CE9F /* AppKit */,
CCCCD034252F62D400C7CE9F /* SwiftUI */,
CCCCD039252F62DB00C7CE9F /* UIKit */,
Expand Down Expand Up @@ -236,6 +260,7 @@
CCCCCFE6252F61E700C7CE9F /* Initializers */ = {
isa = PBXGroup;
children = (
8AD97FDE2B5E9A830058C050 /* AppIntents */,
CCCCD04C252F632900C7CE9F /* AppKit */,
CCCCCFFE252F620400C7CE9F /* SwiftUI */,
CCCCD003252F620B00C7CE9F /* UIKit */,
Expand Down Expand Up @@ -438,6 +463,7 @@
B01C186E2B55D9B300AC4288 /* SFSymbol+5.2.swift in Sources */,
636A46BD28002819007E6028 /* SFSymbol+2.0.swift in Sources */,
CCCCCFEF252F61E700C7CE9F /* UIApplicationShortcutIconExtension.swift in Sources */,
8AD97FE02B5E9AC20058C050 /* DisplayRepresentationImageExtension.swift in Sources */,
636A46BE28002819007E6028 /* SFSymbol+AllSymbols+3.2.swift in Sources */,
B01C186D2B55D9B300AC4288 /* SFSymbol+5.0.swift in Sources */,
CCA29C3D285B4E9400133245 /* SFSymbol+AllSymbols+4.0.swift in Sources */,
Expand All @@ -446,13 +472,16 @@
636A46C528002819007E6028 /* SFSymbol+AllSymbols.swift in Sources */,
CCCCCFF1252F61E700C7CE9F /* UIImageExtension.swift in Sources */,
B01C18712B55D9B300AC4288 /* SFSymbol+5.1.swift in Sources */,
8AD97FE22B5E9B790058C050 /* DisplayRepresentation.swift in Sources */,
8AD97FE22B5E9B790058C050 /* DisplayRepresentationExtension.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
OBJ_59 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 0;
files = (
8AD97FE62B5EA17D0058C050 /* DisplayRepresentationTests.swift in Sources */,
CCCCD019252F622B00C7CE9F /* SwiftUILabelExtensionTests.swift in Sources */,
B0DDAE152637C11400081F1C /* CodableTests.swift in Sources */,
CCCCD016252F622B00C7CE9F /* SwiftUIImageExtensionTests.swift in Sources */,
Expand Down
22 changes: 22 additions & 0 deletions Sources/SFSafeSymbols/Initializers/AppIntents/DisplayRepresentationExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import AppIntents

@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
public extension DisplayRepresentation {
init(title: LocalizedStringResource, subtitle: LocalizedStringResource? = nil, systemSymbol: SFSymbol? = nil) {
self.init(
title: title,
subtitle: subtitle,
image: systemSymbol.map { DisplayRepresentation.Image(systemSymbol: $0) }
)
}

@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *)
init(title: LocalizedStringResource, subtitle: LocalizedStringResource? = nil, systemSymbol: SFSymbol? = nil, synonyms: [LocalizedStringResource] = []) {
self.init(
title: title,
subtitle: subtitle,
image: systemSymbol.map { DisplayRepresentation.Image(systemSymbol: $0) },
synonyms: synonyms
)
}
}
8 changes: 8 additions & 0 deletions Sources/SFSafeSymbols/Initializers/AppIntents/DisplayRepresentationImageExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import AppIntents

@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
public extension DisplayRepresentation.Image {
init(systemSymbol: SFSymbol) {
self.init(systemName: systemSymbol.rawValue)
}
}
32 changes: 32 additions & 0 deletions Tests/SFSafeSymbolsTests/AppIntents/DisplayRepresentationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@testable import SFSafeSymbols

import XCTest
import AppIntents

class DisplayRepresentationTests: XCTestCase {
/// Tests, whether the `DisplayRepresentation.Image` retrieved via SFSafeSymbols is equal to the one retrieved via the `String` initializer
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
func testDisplayRepresentationImage() {
for symbol in TestHelper.allSymbolsWithVariants {
print("Testing validity of \"\(symbol.rawValue)\" via DisplayRepresentation.Image init")

let expected = DisplayRepresentation.Image(systemName: symbol.rawValue)
let actual = DisplayRepresentation.Image(systemSymbol: symbol)

XCTAssertEqual(actual, expected)
}
}

/// Tests, whether the `DisplayRepresentation` retrieved via SFSafeSymbols is equal to the one retrieved via the `String` initializer
@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
func testDisplayRepresentation() {
for symbol in TestHelper.allSymbolsWithVariants {
print("Testing validity of \"\(symbol.rawValue)\" via DisplayRepresentation init")

let expected = DisplayRepresentation(title: "", image: DisplayRepresentation.Image(systemName: symbol.rawValue))
let actual = DisplayRepresentation(title: "", systemSymbol: symbol)

XCTAssertEqual(actual.image, expected.image)
}
}
}