Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/MythicApp/Mythic
Browse files Browse the repository at this point in the history
  • Loading branch information
@vapidinfinity
vapidinfinity committed Apr 14, 2024
2 parents b26ab8d + 0bd548f commit dae95b3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Mythic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2581;
CURRENT_PROJECT_VERSION = 2582;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Mythic/Preview Content\"";
DEVELOPMENT_TEAM = 67ZBY275P8;
Expand Down Expand Up @@ -904,7 +904,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2581;
CURRENT_PROJECT_VERSION = 2582;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Mythic/Preview Content\"";
DEVELOPMENT_TEAM = 67ZBY275P8;
Expand Down
8 changes: 4 additions & 4 deletions Mythic/Views/GameListEvo/GameCard.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct GameCard: View {

var body: some View {
RoundedRectangle(cornerRadius: 20)
.fill(.windowBackground)
.fill(.background)
.aspectRatio(3/4, contentMode: .fit)
.overlay { // MARK: Image
CachedAsyncImage(url: game.imageURL) { phase in
Expand All @@ -54,7 +54,7 @@ struct GameCard: View {
.modifier(FadeInModifier())
} else {
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.shimmering(
animation: .easeInOut(duration: 1)
.repeatForever(autoreverses: false),
Expand All @@ -77,10 +77,10 @@ struct GameCard: View {
case .failure:
// fallthrough
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
@unknown default:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
}
}
.overlay(alignment: .bottom) {
Expand Down
8 changes: 4 additions & 4 deletions Mythic/Views/GameListEvo/GameSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct GameSettingsView: View {
.font(.title)

RoundedRectangle(cornerRadius: 20)
.fill(.windowBackground)
.fill(.background)
.aspectRatio(3/4, contentMode: .fit)
.overlay { // MARK: Image
CachedAsyncImage(url: game.imageURL) { phase in
Expand All @@ -55,7 +55,7 @@ struct GameSettingsView: View {
.scaledToFit()
} else {
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.shimmering(
animation: .easeInOut(duration: 1)
.repeatForever(autoreverses: false),
Expand All @@ -77,13 +77,13 @@ struct GameSettingsView: View {
case .failure:
// fallthrough
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.overlay {
Image(systemName: "exclamationmark.triangle.fill")
}
@unknown default:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.overlay {
Image(systemName: "questionmark.circle.fill")
}
Expand Down
10 changes: 5 additions & 5 deletions Mythic/Views/Navigation/DownloadsEvo.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct DownloadCard: View {

var body: some View {
RoundedRectangle(cornerRadius: 20)
.fill(.windowBackground)
.fill(.background)
.frame(maxHeight: 120)
.opacity({
switch style {
Expand All @@ -64,15 +64,15 @@ struct DownloadCard: View {
switch style {
case .normal:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.shimmering(
animation: .easeInOut(duration: 1)
.repeatForever(autoreverses: false),
bandSize: 1
)
case .prominent:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.shimmering(
animation: .easeInOut(duration: 1)
.repeatForever(autoreverses: false),
Expand All @@ -96,13 +96,13 @@ struct DownloadCard: View {
case .failure:
// fallthrough
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.overlay {
Image(systemName: "exclamationmark.triangle.fill")
}
@unknown default:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.overlay {
Image(systemName: "questionmark.circle.fill")
}
Expand Down
8 changes: 4 additions & 4 deletions Mythic/Views/Navigation/Library/Extensions/LocalImport.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extension LibraryView.GameImportView {
HStack {
if game.imageURL != nil {
RoundedRectangle(cornerRadius: 20)
.fill(.windowBackground)
.fill(.background)
.aspectRatio(3/4, contentMode: .fit)
.overlay { // MARK: Image
CachedAsyncImage(url: game.imageURL) { phase in
Expand All @@ -67,7 +67,7 @@ extension LibraryView.GameImportView {
.modifier(FadeInModifier())
} else {
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
.shimmering(
animation: .easeInOut(duration: 1)
.repeatForever(autoreverses: false),
Expand All @@ -88,10 +88,10 @@ extension LibraryView.GameImportView {
.modifier(FadeInModifier())
case .failure:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
@unknown default:
RoundedRectangle(cornerRadius: 20)
.fill(.background)
.fill(.windowBackground)
}
}
}
Expand Down

0 comments on commit dae95b3

Please sign in to comment.