From be0e3c50972adbf079a12b11458bf9217e9fc9de Mon Sep 17 00:00:00 2001 From: David Cordero Date: Sun, 16 Jan 2022 20:54:58 +0100 Subject: [PATCH] Avoid inverting the colors of movies and series posters when using Smart Invert --- Swiftfin/Components/EpisodesRowView/EpisodeRowCard.swift | 1 + Swiftfin/Components/PortraitHStackView.swift | 1 + Swiftfin/Components/PortraitItemButton.swift | 1 + Swiftfin/Views/ContinueWatchingView.swift | 1 + Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift | 2 ++ .../Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift | 1 + Swiftfin/Views/ItemView/Portrait/ItemPortraitMainView.swift | 1 + Swiftfin/Views/LibraryListView.swift | 1 + 8 files changed, 9 insertions(+) diff --git a/Swiftfin/Components/EpisodesRowView/EpisodeRowCard.swift b/Swiftfin/Components/EpisodesRowView/EpisodeRowCard.swift index 412eee34..ef5de88f 100644 --- a/Swiftfin/Components/EpisodesRowView/EpisodeRowCard.swift +++ b/Swiftfin/Components/EpisodesRowView/EpisodeRowCard.swift @@ -34,6 +34,7 @@ struct EpisodeRowCard: View { } } .padding(.top) + .accessibilityIgnoresInvertColors() VStack(alignment: .leading) { Text(episode.getEpisodeLocator() ?? "S-:E-") diff --git a/Swiftfin/Components/PortraitHStackView.swift b/Swiftfin/Components/PortraitHStackView.swift index 06276d2c..edd67dcc 100644 --- a/Swiftfin/Components/PortraitHStackView.swift +++ b/Swiftfin/Components/PortraitHStackView.swift @@ -48,6 +48,7 @@ struct PortraitImageHStackView: View { failureInitials: item.failureInitials) .portraitPoster(width: maxWidth) .shadow(radius: 4, y: 2) + .accessibilityIgnoresInvertColors() if item.showTitle { Text(item.title) diff --git a/Swiftfin/Views/ContinueWatchingView.swift b/Swiftfin/Views/ContinueWatchingView.swift index 8c5c04c2..cd32af82 100644 --- a/Swiftfin/Views/ContinueWatchingView.swift +++ b/Swiftfin/Views/ContinueWatchingView.swift @@ -29,6 +29,7 @@ struct ContinueWatchingView: View { ZStack { ImageView(src: item.getBackdropImage(maxWidth: 320), bh: item.getBackdropImageBlurHash()) .frame(width: 320, height: 180) + .accessibilityIgnoresInvertColors() HStack { VStack { diff --git a/Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift b/Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift index c4290d05..8ef58c0e 100644 --- a/Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift +++ b/Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift @@ -28,6 +28,7 @@ struct ItemLandscapeMainView: View { bh: viewModel.item.getPrimaryImageBlurHash()) .frame(width: 130, height: 195) .cornerRadius(10) + .accessibilityIgnoresInvertColors() Spacer().frame(height: 15) @@ -100,6 +101,7 @@ struct ItemLandscapeMainView: View { .edgesIgnoringSafeArea(.all) .blur(radius: 8) .layoutPriority(-1) + .accessibilityIgnoresInvertColors() // iPadOS is making the view go all the way to the edge. // We have to accomodate this here diff --git a/Swiftfin/Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift b/Swiftfin/Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift index 2ae40695..db91e1c6 100644 --- a/Swiftfin/Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift +++ b/Swiftfin/Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift @@ -26,6 +26,7 @@ struct PortraitHeaderOverlayView: View { ImageView(src: viewModel.item.portraitHeaderViewURL(maxWidth: 130)) .portraitPoster(width: 130) + .accessibilityIgnoresInvertColors() VStack(alignment: .leading, spacing: 1) { Spacer() diff --git a/Swiftfin/Views/ItemView/Portrait/ItemPortraitMainView.swift b/Swiftfin/Views/ItemView/Portrait/ItemPortraitMainView.swift index 0c6403b1..fbb4692b 100644 --- a/Swiftfin/Views/ItemView/Portrait/ItemPortraitMainView.swift +++ b/Swiftfin/Views/ItemView/Portrait/ItemPortraitMainView.swift @@ -23,6 +23,7 @@ struct ItemPortraitMainView: View { bh: viewModel.item.getBackdropImageBlurHash()) .opacity(0.4) .blur(radius: 2.0) + .accessibilityIgnoresInvertColors() } // MARK: portraitStaticOverlayView diff --git a/Swiftfin/Views/LibraryListView.swift b/Swiftfin/Views/LibraryListView.swift index 2438e35c..26c25fb6 100644 --- a/Swiftfin/Views/LibraryListView.swift +++ b/Swiftfin/Views/LibraryListView.swift @@ -82,6 +82,7 @@ struct LibraryListView: View { ZStack { ImageView(src: library.getPrimaryImage(maxWidth: 500), bh: library.getPrimaryImageBlurHash()) .opacity(0.4) + .accessibilityIgnoresInvertColors() HStack { Spacer() VStack {