diff --git a/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift b/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift index 56570ff4..0d5c8c65 100644 --- a/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift +++ b/Library/Sources/AppUIMain/Views/About/macOS/AboutContentView+macOS.swift @@ -69,7 +69,6 @@ struct AboutContentView: View whe } } } - .background(navigationRoute == .version ? theme.primaryColor : nil) .onLoad { navigationRoute = .version } diff --git a/Library/Sources/AppUITV/Views/Profile/ProfileView.swift b/Library/Sources/AppUITV/Views/Profile/ProfileView.swift index 155f64a3..e1fbc959 100644 --- a/Library/Sources/AppUITV/Views/Profile/ProfileView.swift +++ b/Library/Sources/AppUITV/Views/Profile/ProfileView.swift @@ -80,7 +80,7 @@ struct ProfileView: View, Routable, TunnelInstallationProviding { } } .ignoresSafeArea(edges: .horizontal) - .background(theme.primaryColor) + .background(theme.primaryGradient) .themeAnimation(on: showsSidePanel, category: .profiles) .defaultFocus($focusedField, .switchProfile) .onChange(of: tunnel.status, onTunnelStatus) diff --git a/Library/Sources/AppUITV/Views/Settings/SettingsView.swift b/Library/Sources/AppUITV/Views/Settings/SettingsView.swift index e3f79c6f..09fcc447 100644 --- a/Library/Sources/AppUITV/Views/Settings/SettingsView.swift +++ b/Library/Sources/AppUITV/Views/Settings/SettingsView.swift @@ -63,7 +63,7 @@ struct SettingsView: View { DetailView(detail: detail) .frame(maxWidth: .infinity) } - .background(theme.primaryColor) + .background(theme.primaryGradient) .onChange(of: focus) { guard focus != nil else { return diff --git a/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift b/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift index d55e658f..9ad53dde 100644 --- a/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift +++ b/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift @@ -34,11 +34,11 @@ extension Theme { secondaryWeight = .light } -// public var primaryGradient: AnyGradient { -// primaryColor -// .opacity(0.6) -// .gradient -// } + public var primaryGradient: AnyGradient { + primaryColor + .opacity(0.6) + .gradient + } } // MARK: - Shortcuts diff --git a/Library/Sources/UILibrary/Views/About/VersionView.swift b/Library/Sources/UILibrary/Views/About/VersionView.swift index 728b543e..592f8bf9 100644 --- a/Library/Sources/UILibrary/Views/About/VersionView.swift +++ b/Library/Sources/UILibrary/Views/About/VersionView.swift @@ -40,6 +40,26 @@ public struct VersionView: View where Icon: View { public var body: some View { ScrollView { + contentView + } +#if os(iOS) + .background(theme.primaryColor) + .foregroundStyle(.white) +#endif + } +} + +extension VersionView where Icon == LogoImage { + public init() { + icon = { + LogoImage() + } + } +} + +private extension VersionView { + var contentView: some View { + Group { icon() .padding(.top) Spacer() @@ -54,16 +74,6 @@ public struct VersionView: View where Icon: View { .padding() } } - .background(theme.primaryColor) - .foregroundStyle(.white) - } -} - -extension VersionView where Icon == LogoImage { - public init() { - icon = { - LogoImage() - } } } diff --git a/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@2x.png b/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@2x.png index c18bae2f..2000a14b 100644 Binary files a/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@2x.png and b/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@2x.png differ diff --git a/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@3x.png b/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@3x.png index 4e1d504a..02c38cf9 100644 Binary files a/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@3x.png and b/Passepartout/App/Assets.xcassets/Logo.imageset/Logo@3x.png differ