From 248f1e725767c1f5f86814c8d2e2487127dda208 Mon Sep 17 00:00:00 2001 From: Davide Date: Sat, 2 Nov 2024 15:27:52 +0100 Subject: [PATCH] Fix compile error on tvOS --- .../UILibrary/Theme/Platforms/Theme+iOS.swift | 7 ------- .../UILibrary/Theme/Platforms/Theme+macOS.swift | 6 ------ .../UILibrary/Theme/UI/Theme+Modifiers.swift | 15 ++++++++------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift index 0fee69a9..a7568624 100644 --- a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift +++ b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift @@ -99,13 +99,6 @@ extension ThemeWindowModifier { } } -extension ThemeNavigationDetailModifier { - func body(content: Content) -> some View { - content - .navigationBarTitleDisplayMode(.inline) - } -} - extension ThemePlainButtonModifier { func body(content: Content) -> some View { Button(action: action) { diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift index 036be9a2..7f58bbf7 100644 --- a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift +++ b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift @@ -53,12 +53,6 @@ extension ThemeWindowModifier { } } -extension ThemeNavigationDetailModifier { - func body(content: Content) -> some View { - content - } -} - extension ThemePlainButtonModifier { func body(content: Content) -> some View { Button(action: action) { diff --git a/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift b/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift index d34c1300..7231f82b 100644 --- a/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift +++ b/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift @@ -91,15 +91,19 @@ extension View { modifier(ThemeSectionWithHeaderFooterModifier(header: header, footer: footer)) } + public func themeNavigationDetail() -> some View { +#if os(iOS) + navigationBarTitleDisplayMode(.inline) +#else + self +#endif + } + #if !os(tvOS) public func themeWindow(width: CGFloat, height: CGFloat) -> some View { modifier(ThemeWindowModifier(size: .init(width: width, height: height))) } - public func themeNavigationDetail() -> some View { - modifier(ThemeNavigationDetailModifier()) - } - public func themePlainButton(action: @escaping () -> Void) -> some View { modifier(ThemePlainButtonModifier(action: action)) } @@ -292,9 +296,6 @@ struct ThemeWindowModifier: ViewModifier { let size: CGSize } -struct ThemeNavigationDetailModifier: ViewModifier { -} - struct ThemePlainButtonModifier: ViewModifier { let action: () -> Void }