diff --git a/Ruddarr/Views/Activity/QueueItemSheet.swift b/Ruddarr/Views/Activity/QueueItemSheet.swift index d827f8d7..4346b437 100644 --- a/Ruddarr/Views/Activity/QueueItemSheet.swift +++ b/Ruddarr/Views/Activity/QueueItemSheet.swift @@ -8,13 +8,13 @@ struct QueueItemSheet: View { @Environment(\.dismiss) private var dismiss @Environment(\.openURL) private var openURL @Environment(\.deviceType) private var deviceType + @Environment(\.accessibilityReduceTransparency) private var reduceTransparency @State private var downloadProgress: Float = 0 let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect() var body: some View { - // swiftlint:disable:next closure_body_length NavigationStack { ScrollView { VStack(alignment: .leading) { @@ -47,11 +47,7 @@ struct QueueItemSheet: View { details } .scenePadding(.horizontal) - #if os(macOS) - .padding(.top, 24) - #else - .offset(y: -45) - #endif + .padding(.top, deviceType == .mac ? 24 : (reduceTransparency ? 0 : -45)) } .toolbar { ToolbarItem(placement: .destructiveAction) { diff --git a/Ruddarr/Views/Movies/Releases/MovieReleaseSheet.swift b/Ruddarr/Views/Movies/Releases/MovieReleaseSheet.swift index 31f612e8..ca44aa56 100644 --- a/Ruddarr/Views/Movies/Releases/MovieReleaseSheet.swift +++ b/Ruddarr/Views/Movies/Releases/MovieReleaseSheet.swift @@ -10,6 +10,7 @@ struct MovieReleaseSheet: View { @Environment(\.dismiss) private var dismiss @Environment(\.deviceType) private var deviceType + @Environment(\.accessibilityReduceTransparency) private var reduceTransparency @State private var showGrabConfirmation: Bool = false @@ -32,11 +33,7 @@ struct MovieReleaseSheet: View { details } .scenePadding(.horizontal) - #if os(macOS) - .padding(.top, 24) - #else - .padding(.top, -45) - #endif + .padding(.top, deviceType == .mac ? 24 : (reduceTransparency ? 0 : -45)) } .toolbar { ToolbarItem(placement: .destructiveAction) { diff --git a/Ruddarr/Views/Series/Releases/SeriesReleaseSheet.swift b/Ruddarr/Views/Series/Releases/SeriesReleaseSheet.swift index 95647482..7bde6695 100644 --- a/Ruddarr/Views/Series/Releases/SeriesReleaseSheet.swift +++ b/Ruddarr/Views/Series/Releases/SeriesReleaseSheet.swift @@ -12,6 +12,7 @@ struct SeriesReleaseSheet: View { @Environment(\.dismiss) private var dismiss @Environment(\.deviceType) private var deviceType + @Environment(\.accessibilityReduceTransparency) private var reduceTransparency @State private var showGrabConfirmation: Bool = false @@ -34,11 +35,7 @@ struct SeriesReleaseSheet: View { details } .scenePadding(.horizontal) - #if os(macOS) - .padding(.top, 24) - #else - .padding(.top, -45) - #endif + .padding(.top, deviceType == .mac ? 24 : (reduceTransparency ? 0 : -45)) } .toolbar { ToolbarItem(placement: .destructiveAction) { diff --git a/Ruddarr/Views/Shared/MediaEventSheet.swift b/Ruddarr/Views/Shared/MediaEventSheet.swift index be85d948..c2f01e2c 100644 --- a/Ruddarr/Views/Shared/MediaEventSheet.swift +++ b/Ruddarr/Views/Shared/MediaEventSheet.swift @@ -7,6 +7,8 @@ struct MediaEventSheet: View { @EnvironmentObject var settings: AppSettings @Environment(\.dismiss) private var dismiss + @Environment(\.deviceType) private var deviceType + @Environment(\.accessibilityReduceTransparency) private var reduceTransparency var body: some View { // swiftlint:disable:next closure_body_length @@ -50,11 +52,7 @@ struct MediaEventSheet: View { Spacer() } .scenePadding(.horizontal) - #if os(macOS) - .padding(.top, 24) - #else - .offset(y: -45) - #endif + .padding(.top, deviceType == .mac ? 24 : (reduceTransparency ? 0 : -45)) } .toolbar { ToolbarItem(placement: .destructiveAction) { diff --git a/Ruddarr/Views/Shared/MediaFileSheet.swift b/Ruddarr/Views/Shared/MediaFileSheet.swift index 61e7129d..95a30e77 100644 --- a/Ruddarr/Views/Shared/MediaFileSheet.swift +++ b/Ruddarr/Views/Shared/MediaFileSheet.swift @@ -5,6 +5,7 @@ struct MediaFileSheet: View { var runtime: Int @Environment(\.dismiss) private var dismiss + @Environment(\.accessibilityReduceTransparency) private var reduceTransparency var body: some View { NavigationStack { @@ -17,7 +18,7 @@ struct MediaFileSheet: View { Spacer().frame(height: 42) } - .padding(.top, -52) + .padding(.top, reduceTransparency ? 0 : -52) .scenePadding(.horizontal) } #if os(macOS)