Add type safe style classes

README.md

@@ -28,7 +28,7 @@ struct Counter: View {
                 count -= 1
             }
             Text("\(count)")
-                .style("title-1")
+                .title1()
                 .frame(minWidth: 100)
             Button(icon: .default(icon: .goNext)) {
                 count += 1

Sources/Adwaita/View/CheckButton+.swift

@@ -0,0 +1,18 @@
+//
+//  CheckButton+.swift
+//  Adwaita
+//
+//  Created by david-swift on 18.05.24.
+//
+
+/// A button widget.
+extension CheckButton {
+
+    /// Apply the selection mode style class.
+    /// - Parameter active: Whether it is applied.
+    /// - Returns: A view.
+    public func selectionMode(_ active: Bool = true) -> View {
+        style("selection-mode", active: active)
+    }
+
+}

Sources/Adwaita/View/Forms/ActionRow+.swift

@@ -14,4 +14,11 @@ extension ActionRow {
         self = self.title(title)
     }
 
+    /// Deemphasize the row title and emphasize the subtitle.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func property(_ active: Bool = true) -> View {
+        style("property", active: active)
+    }
+
 }

Sources/Adwaita/View/HStack.swift

@@ -10,10 +10,13 @@ public struct HStack: View {
 
     /// The content.
     var content: () -> Body
+    /// Whether the linked style should be used.
+    var linked = false
 
     /// The view's body.
     public var view: Body {
         VStack(horizontal: true, content: content)
+            .linked(linked)
     }
 
     /// Initialize a `HStack`.
@@ -22,4 +25,11 @@ public struct HStack: View {
         self.content = content
     }
 
+    /// Link the children.
+    public func linked(_ active: Bool = true) -> Self {
+        var newSelf = self
+        newSelf.linked = active
+        return newSelf
+    }
+
 }

Sources/Adwaita/View/List.swift

@@ -59,8 +59,17 @@ extension List {
     }
 
     /// Add the "navigation-sidebar" style class.
-    public func sidebarStyle() -> View {
+    /// - Parameter active: Whether the style is applied.
-        style("navigation-sidebar")
+    /// - Returns: A view.
+    public func sidebarStyle(_ active: Bool = true) -> View {
+        style("navigation-sidebar", active: active)
+    }
+
+    /// Apply the boxed list style class.
+    /// - Parameter active: Whether the style is applied.
+    /// - Returns: A view.
+    public func boxedList(_ active: Bool = true) -> View {
+        style("boxed-list", active: active)
     }
 
 }

Sources/Adwaita/View/Modifiers/InspectorWrapper.swift

@@ -128,6 +128,204 @@ extension View {
         }
     }
 
+    /// Make a button or similar widget use accent colors.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func suggested(_ active: Bool = true) -> View {
+        style("suggested-action", active: active)
+    }
+
+    /// Make a button or similar widget use destructive colors.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func destructive(_ active: Bool = true) -> View {
+        style("destructive-action", active: active)
+    }
+
+    /// Make a button or similar widget use flat appearance.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func flat(_ active: Bool = true) -> View {
+        style("flat", active: active)
+    }
+
+    /// Make a button or similar widget use the regular appearance instead of the flat one.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func raised(_ active: Bool = true) -> View {
+        style("raised", active: active)
+    }
+
+    /// Make a button or similar widget round.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func circular(_ active: Bool = true) -> View {
+        style("circular", active: active)
+    }
+
+    /// Make a button or similar widget appear as a pill.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func pill(_ active: Bool = true) -> View {
+        style("pill", active: active)
+    }
+
+    /// Make the view partially transparent.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func dimLabel(_ active: Bool = true) -> View {
+        style("dim-label", active: active)
+    }
+
+    /// Use a title typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func title1(_ active: Bool = true) -> View {
+        style("title-1", active: active)
+    }
+
+    /// Use a title typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func title2(_ active: Bool = true) -> View {
+        style("title-2", active: active)
+    }
+
+    /// Use a title typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func title3(_ active: Bool = true) -> View {
+        style("title-3", active: active)
+    }
+
+    /// Use a title typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func title4(_ active: Bool = true) -> View {
+        style("title-4", active: active)
+    }
+
+    /// Use the heading typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func heading(_ active: Bool = true) -> View {
+        style("heading", active: active)
+    }
+
+    /// Use the body typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func body(_ active: Bool = true) -> View {
+        style("body", active: active)
+    }
+
+    /// Use the caption heading typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func captionHeading(_ active: Bool = true) -> View {
+        style("caption-heading", active: active)
+    }
+
+    /// Use the caption typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func caption(_ active: Bool = true) -> View {
+        style("caption", active: active)
+    }
+
+    /// Use the monospace typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func monospace(_ active: Bool = true) -> View {
+        style("monospace", active: active)
+    }
+
+    /// Use the numeric typography style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func numeric(_ active: Bool = true) -> View {
+        style("numeric", active: active)
+    }
+
+    /// Apply the accent color.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func accent(_ active: Bool = true) -> View {
+        style("accent", active: active)
+    }
+
+    /// Apply the success color.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func success(_ active: Bool = true) -> View {
+        style("success", active: active)
+    }
+
+    /// Apply the warning color.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func warning(_ active: Bool = true) -> View {
+        style("warning", active: active)
+    }
+
+    /// Apply the error color.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func error(_ active: Bool = true) -> View {
+        style("error", active: active)
+    }
+
+    /// Apply the card style.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func card(_ active: Bool = true) -> View {
+        style("card", active: active)
+    }
+
+    /// Apply an icon dropshadow.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    ///
+    /// Use for icons larger than 32x32 pixels.
+    public func iconDropshadow(_ active: Bool = true) -> View {
+        style("icon-dropshadow", active: active)
+    }
+
+    /// Use for icons smaller than or equal to 32x32 pixels.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func lowresIcon(_ active: Bool = true) -> View {
+        style("lowres-icon", active: active)
+    }
+
+    /// Use the OSD style class.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func osd(_ active: Bool = true) -> View {
+        style("osd", active: active)
+    }
+
+    /// Give a view the default window background and foreground colors.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func backgroundStyle(_ active: Bool = true) -> View {
+        style("background", active: active)
+    }
+
+    /// Give a view the default view background and foreground colors.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func viewStyle(_ active: Bool = true) -> View {
+        style("view", active: active)
+    }
+
+    /// Give a view the default border.
+    /// - Parameter active: Whether the style is currently applied.
+    /// - Returns: A view.
+    public func frameStyle(_ active: Bool = true) -> View {
+        style("frame", active: active)
+    }
+
     /// Run a function when the view gets an update.
     /// - Parameter onUpdate: The function.
     /// - Returns: A view.

Sources/Adwaita/View/StatusPage+.swift

@@ -26,4 +26,11 @@ extension StatusPage {
         self = self.child(content)
     }
 
+    /// Make the status page more compact.
+    /// - Parameter active: Whether the style is applied.
+    /// - Returns: A view.
+    public func compact(_ active: Bool = true) -> View {
+        style("compact", active: active)
+    }
+
 }

Sources/Adwaita/View/VStack.swift

@@ -28,4 +28,9 @@ extension VStack {
         }
     }
 
+    /// Link the children.
+    public func linked(_ active: Bool = true) -> View {
+        style("linked", active: active)
+    }
+
 }

Tests/AlertDialogDemo.swift

@@ -19,8 +19,8 @@ struct AlertDialogDemo: View {
             Button("Show Dialog") {
                 dialog = true
             }
-            .style("pill")
+            .pill()
-            .style("suggested-action")
+            .suggested()
             .frame(maxWidth: 100)
             .padding()
         }

Tests/CarouselDemo.swift

@@ -32,7 +32,7 @@ struct CarouselDemo: View {
             }
             .vexpand()
             .hexpand()
-            .style("card")
+            .card()
             .onClick { print(element.id) }
             .padding(20)
             .frame(minWidth: 300, minHeight: 200)

Tests/CounterDemo.swift

@@ -19,7 +19,7 @@ struct CounterDemo: View {
             HStack {
                 CountButton(count: $count, icon: .goPrevious) { $0 -= 1 }
                 Text("\(count)")
-                    .style("title-1")
+                    .title1()
                     .frame(minWidth: 100)
                 CountButton(count: $count, icon: .goNext) { $0 += 1 }
             }
@@ -39,7 +39,7 @@ struct CounterDemo: View {
             Button(icon: .default(icon: icon)) {
                 action(&count)
             }
-            .style("circular")
+            .circular()
         }
     }
 

Tests/DialogDemo.swift

@@ -21,8 +21,8 @@ struct DialogDemo: View {
             Button("Show Dialog") {
                 dialog = true
             }
-            .style("pill")
+            .pill()
-            .style("suggested-action")
+            .suggested()
             .frame(maxWidth: 100)
             .padding()
         }

Tests/DiceDemo.swift

@@ -26,8 +26,8 @@ struct DiceDemo: View {
             Button(label) {
                 number = .random(in: 1...6)
             }
-            .style("pill")
+            .pill()
-            .style("suggested-action")
+            .suggested()
             .frame(maxWidth: 100)
         }
         .valign(.center)

Tests/FlowBoxDemo.swift

@@ -28,8 +28,8 @@ struct FlowBoxDemo: View {
                 selectedItem = items[safe: index]?.id ?? items[safe: index ?? 0 - 1]?.id ?? items.first?.id ?? ""
             }
         }
+        .linked()
         .padding()
-        .style("linked")
         .halign(.center)
         if !items.isEmpty {
             FlowBox(items, selection: $selectedItem) { item in

Tests/FormDemo.swift

@@ -18,8 +18,8 @@ struct FormDemo: View {
             Button("View Demo") {
                 app.showWindow("form-demo")
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
         }
     }
@@ -43,7 +43,7 @@ struct FormDemo: View {
                             EntryRow("Entry Row", text: $text)
                                 .suffix {
                                     Button(icon: .default(icon: .editCopy)) { State<Any>.copy(text) }
-                                        .style("flat")
+                                        .flat()
                                         .verticalCenter()
                                 }
                             EntryRow(password, text: $password)

Tests/IdleDemo.swift

@@ -37,7 +37,7 @@ struct IdleDemo: View {
             }
         }
         .padding()
-        .style("pill")
+        .pill()
         .hexpand()
         .halign(.center)
         .insensitive(activeProcess)

Tests/ListDemo.swift

@@ -28,8 +28,8 @@ struct ListDemo: View {
                 selectedItem = items[safe: index]?.id ?? items[safe: index ?? 0 - 1]?.id ?? items.first?.id ?? ""
             }
         }
+        .linked()
         .padding()
-        .style("linked")
         .halign(.center)
         if !items.isEmpty {
             List(items, selection: $selectedItem) { item in
@@ -39,8 +39,8 @@ struct ListDemo: View {
                 }
                 .padding()
             }
+            .boxedList()
             .valign(.center)
-            .style("boxed-list")
             .padding()
         }
     }

Tests/NavigationViewDemo.swift

@@ -18,8 +18,8 @@ struct NavigationViewDemo: View {
             Button("View Demo") {
                 app.showWindow("navigation")
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
             .padding()
         }

Tests/PictureDemo.swift

@@ -31,8 +31,8 @@ struct PictureDemo: View {
             app.addWindow("picture", parent: window)
         }
         .halign(.center)
-        .style("pill")
+        .pill()
-        .style("suggested-action")
+        .suggested()
         .padding()
     }
 

Tests/PopoverDemo.swift

@@ -18,8 +18,8 @@ struct PopoverDemo: View {
             Button("Present Popover") {
                 visible = true
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
             .popover(visible: $visible) {
                 CounterDemo()

Tests/ToastDemo.swift

@@ -18,8 +18,8 @@ struct ToastDemo: View {
             Button("Add Toast") {
                 toast.signal()
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
         }
     }

Tests/ToolbarDemo.swift

@@ -18,8 +18,8 @@ struct ToolbarDemo: View {
             Button("View Demo") {
                 app.showWindow("toolbar-demo")
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
         }
     }
@@ -34,8 +34,8 @@ struct ToolbarDemo: View {
                 Button("Toggle Toolbar") {
                     visible.toggle()
                 }
-                .style("suggested-action")
+                .suggested()
-                .style("pill")
+                .pill()
                 .frame(maxWidth: 100)
                 .padding(15)
             }

Tests/TransitionDemo.swift

@@ -18,21 +18,21 @@ struct TransitionDemo: View {
             if firstView {
                 Text("First View")
                     .transition(.slideDown)
-                    .style("accent")
+                    .accent()
             } else {
                 Text("Second View")
                     .transition(.slideUp)
-                    .style("success")
+                    .success()
             }
         }
-        .modifyContent(Text.self) { $0.style("title-2").padding() }
+        .modifyContent(Text.self) { $0.title2().padding() }
-        .style("card")
+        .card()
         .frame(maxWidth: 200)
         .padding()
         Button("Toggle View") {
             firstView.toggle()
         }
-        .style("pill")
+        .pill()
         .padding()
         .frame(maxWidth: 100)
     }

Tests/ViewSwitcherDemo.swift

@@ -18,8 +18,8 @@ struct ViewSwitcherDemo: View {
             Button("View Demo") {
                 app.showWindow("switcher-demo")
             }
-            .style("suggested-action")
+            .suggested()
-            .style("pill")
+            .pill()
             .frame(maxWidth: 100)
         }
     }

Tests/WindowsDemo.swift

@@ -25,8 +25,8 @@ struct WindowsDemo: View {
                 }
                 .hexpand()
             }
+            .linked()
             .valign(.center)
-            .style("linked")
             .padding()
         }
         .frame(maxWidth: 100)