ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable Swift Symbol Generation for Assets Catalogs (#955)

This commit is contained in:
Daniel Chick 2024-03-13 15:37:03 -05:00 committed by GitHub
parent 3efe899250
commit 876ffba417
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Swiftfin tvOS/Views/BasicAppSettingsView.swift
View File

@ -26,7 +26,7 @@ struct BasicAppSettingsView: View {
var body: some View { var body: some View {
SplitFormWindowView() SplitFormWindowView()
.descriptionView { .descriptionView {
Image("jellyfin-blob-blue") Image(.jellyfinBlobBlue)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(maxWidth: 400) .frame(maxWidth: 400)

2
Swiftfin tvOS/Views/ServerListView.swift
View File

@ -75,7 +75,7 @@ struct ServerListView: View {
SplitFormWindowView() SplitFormWindowView()
.descriptionView { .descriptionView {
VStack { VStack {
Image("jellyfin-blob-blue") Image(.jellyfinBlobBlue)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(maxWidth: 400) .frame(maxWidth: 400)

2
Swiftfin tvOS/Views/SettingsView/SettingsView.swift
View File

@ -25,7 +25,7 @@ struct SettingsView: View {
var body: some View { var body: some View {
SplitFormWindowView() SplitFormWindowView()
.descriptionView { .descriptionView {
Image("jellyfin-blob-blue") Image(.jellyfinBlobBlue)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(maxWidth: 400) .frame(maxWidth: 400)

4
Swiftfin.xcodeproj/project.pbxproj
View File

@ -2964,7 +2964,7 @@
New, New,
); );
LastSwiftUpdateCheck = 1250; LastSwiftUpdateCheck = 1250;
LastUpgradeCheck = 1430; LastUpgradeCheck = 1520;
TargetAttributes = { TargetAttributes = {
5358705F2669D21600D05A09 = { 5358705F2669D21600D05A09 = {
CreatedOnToolsVersion = 12.5; CreatedOnToolsVersion = 12.5;
@ -3994,6 +3994,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@ -4058,6 +4059,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

2
Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1430" LastUpgradeVersion = "1520"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1430" LastUpgradeVersion = "1520"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Swiftfin/Views/AboutAppView.swift
View File

@ -45,7 +45,7 @@ struct AboutAppView: View {
ChevronButton(title: L10n.sourceCode) ChevronButton(title: L10n.sourceCode)
.leadingView { .leadingView {
Image("logo.github") Image(.logoGithub)
.resizable() .resizable()
.frame(width: 20, height: 20) .frame(width: 20, height: 20)
.foregroundColor(.primary) .foregroundColor(.primary)

4
Swiftfin/Views/ItemView/Components/AboutView/Components/RatingsCard.swift
View File

@ -26,11 +26,11 @@ extension ItemView.AboutView {
VStack { VStack {
Group { Group {
if criticRating >= 60 { if criticRating >= 60 {
Image("tomato.fresh") Image(.tomatoFresh)
.symbolRenderingMode(.multicolor) .symbolRenderingMode(.multicolor)
.foregroundStyle(.green, .red) .foregroundStyle(.green, .red)
} else { } else {
Image("tomato.rotten") Image(.tomatoRotten)
.symbolRenderingMode(.monochrome) .symbolRenderingMode(.monochrome)
.foregroundColor(.green) .foregroundColor(.green)
} }

4
Swiftfin/Views/LiveTVChannelItemWideElement.swift
View File

@ -103,7 +103,7 @@ struct LiveTVChannelItemWideElement: View {
programLabel( programLabel(
timeText: currentProgramText.timeDisplay, timeText: currentProgramText.timeDisplay,
titleText: currentProgramText.title, titleText: currentProgramText.title,
color: Color("TextHighlightColor") color: Color(.textHighlight)
) )
if nextProgramsText.isNotEmpty { if nextProgramsText.isNotEmpty {
let nextItem = nextProgramsText[0] let nextItem = nextProgramsText[0]
@ -132,7 +132,7 @@ struct LiveTVChannelItemWideElement: View {
.background { .background {
RoundedRectangle(cornerRadius: 10, style: .continuous) RoundedRectangle(cornerRadius: 10, style: .continuous)
.fill(Color("BackgroundColor")) .fill(Color("BackgroundColor"))
.shadow(color: Color("ShadowColor"), radius: 4, x: 0, y: 0) .shadow(color: Color(.shadow), radius: 4, x: 0, y: 0)
} }
} }

2
contributing.md
View File

@ -6,7 +6,7 @@
## Setup ## Setup
Fork the Swiftfin repo and install the necessary dependencies with Xcode 14: Fork the Swiftfin repo and install the necessary dependencies with Xcode 15:
```bash ```bash
# install Carthage, SwiftFormat, and SwiftGen with homebrew # install Carthage, SwiftFormat, and SwiftGen with homebrew