Add row with footer modifier

- iOS/tvOS: section adds footer, row renders as is - macOS: section omits footer, row adds a description
passepartoutvpn · Nov 5, 2024 · d0dff1c · d0dff1c
1 parent 833d717
commit d0dff1c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+iOS.swift
@@ -130,6 +130,13 @@ extension ThemeSectionWithHeaderFooterModifier {
     }
 }
 
+extension ThemeRowWithFooterModifier {
+    func body(content: Content) -> some View {
+        content
+        // omit footer on iOS/tvOS, use ThemeSectionWithHeaderFooterModifier
+    }
+}
+
 // MARK: - Views
 
 extension ThemeTappableText {

diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+macOS.swift
@@ -78,14 +78,25 @@ extension ThemeSectionWithHeaderFooterModifier {
     func body(content: Content) -> some View {
         Section {
             content
+        } header: {
+            header.map(Text.init)
+        }
+        // omit footer on macOS, use ThemeRowWithFooterModifier
+    }
+}
+
+extension ThemeRowWithFooterModifier {
+    func body(content: Content) -> some View {
+        VStack {
+            content
+                .frame(maxWidth: .infinity, alignment: .leading)
+
             footer.map {
                 Text($0)
                     .foregroundStyle(.secondary)
-                    .font(.callout)
+                    .font(.caption)
                     .frame(maxWidth: .infinity, alignment: .leading)
             }
-        } header: {
-            header.map(Text.init)
         }
     }
 }

diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift b/Passepartout/Library/Sources/UILibrary/Theme/Platforms/Theme+tvOS.swift
@@ -63,6 +63,13 @@ extension ThemeSectionWithHeaderFooterModifier {
     }
 }
 
+extension ThemeRowWithFooterModifier {
+    func body(content: Content) -> some View {
+        content
+        // omit footer on iOS/tvOS, use ThemeSectionWithHeaderFooterModifier
+    }
+}
+
 // MARK: - Views
 
 extension ThemeTextField {

diff --git a/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift b/Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift
@@ -91,6 +91,10 @@ extension View {
         modifier(ThemeSectionWithHeaderFooterModifier(header: header, footer: footer))
     }
 
+    public func themeRow(footer: String? = nil) -> some View {
+        modifier(ThemeRowWithFooterModifier(footer: footer))
+    }
+
     public func themeNavigationDetail() -> some View {
 #if os(iOS)
         navigationBarTitleDisplayMode(.inline)
@@ -290,6 +294,10 @@ struct ThemeSectionWithHeaderFooterModifier: ViewModifier {
     let footer: String?
 }
 
+struct ThemeRowWithFooterModifier: ViewModifier {
+    let footer: String?
+}
+
 #if !os(tvOS)
 
 struct ThemeWindowModifier: ViewModifier {