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

Swift symbol asset catalog #2

Closed
wants to merge 7 commits into from
Closed

Swift symbol asset catalog #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ec4df9
Enable generating swift symbols for the asset catalogs
chickdan Jan 24, 2024
4d71752
Convert asset string names to Swift symbols
chickdan Jan 24, 2024
7b1028c
Update contributing info for xcode 15
chickdan Jan 25, 2024
0d10d1a
Merge branch 'main'
chickdan Jan 25, 2024
8b0a6f4
Merge branch 'main'
chickdan Feb 16, 2024
0c6e618
Merge branch 'main'
chickdan Mar 12, 2024
d360c8c
Merge branch 'main'
chickdan Mar 12, 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
2 changes: 1 addition & 1 deletion Swiftfin tvOS/Views/BasicAppSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct BasicAppSettingsView: View {
var body: some View {
SplitFormWindowView()
.descriptionView {
Image("jellyfin-blob-blue")
Image(.jellyfinBlobBlue)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 400)
Expand Down
2 changes: 1 addition & 1 deletion Swiftfin tvOS/Views/ServerListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct ServerListView: View {
SplitFormWindowView()
.descriptionView {
VStack {
Image("jellyfin-blob-blue")
Image(.jellyfinBlobBlue)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 400)
Expand Down
2 changes: 1 addition & 1 deletion Swiftfin tvOS/Views/SettingsView/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct SettingsView: View {
var body: some View {
SplitFormWindowView()
.descriptionView {
Image("jellyfin-blob-blue")
Image(.jellyfinBlobBlue)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 400)
Expand Down
4 changes: 3 additions & 1 deletion Swiftfin.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2964,7 +2964,7 @@
New,
);
LastSwiftUpdateCheck = 1250;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1520;
TargetAttributes = {
5358705F2669D21600D05A09 = {
CreatedOnToolsVersion = 12.5;
Expand Down Expand Up @@ -3994,6 +3994,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -4058,6 +4059,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down
2 changes: 1 addition & 1 deletion Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Swiftfin/Views/AboutAppView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct AboutAppView: View {

ChevronButton(title: L10n.sourceCode)
.leadingView {
Image("logo.github")
Image(.logoGithub)
.resizable()
.frame(width: 20, height: 20)
.foregroundColor(.primary)
Expand Down
4 changes: 2 additions & 2 deletions Swiftfin/Views/ItemView/Components/AboutView/Components/RatingsCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ extension ItemView.AboutView {
VStack {
Group {
if criticRating >= 60 {
Image("tomato.fresh")
Image(.tomatoFresh)
.symbolRenderingMode(.multicolor)
.foregroundStyle(.green, .red)
} else {
Image("tomato.rotten")
Image(.tomatoRotten)
.symbolRenderingMode(.monochrome)
.foregroundColor(.green)
}
Expand Down
4 changes: 2 additions & 2 deletions Swiftfin/Views/LiveTVChannelItemWideElement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ struct LiveTVChannelItemWideElement: View {
programLabel(
timeText: currentProgramText.timeDisplay,
titleText: currentProgramText.title,
color: Color("TextHighlightColor")
color: Color(.textHighlight)
)
if nextProgramsText.isNotEmpty {
let nextItem = nextProgramsText[0]
Expand Down Expand Up @@ -132,7 +132,7 @@ struct LiveTVChannelItemWideElement: View {
.background {
RoundedRectangle(cornerRadius: 10, style: .continuous)
.fill(Color("BackgroundColor"))
.shadow(color: Color("ShadowColor"), radius: 4, x: 0, y: 0)
.shadow(color: Color(.shadow), radius: 4, x: 0, y: 0)
}
}

Expand Down
2 changes: 1 addition & 1 deletion contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## 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
# install Carthage, SwiftFormat, and SwiftGen with homebrew
Expand Down
Loading