Simplify the AppBackend API to reduce the number of methods and improve

consistency Before there were a lot of atomic methods, but SwiftCrossUI never needs to call them separately, so it's simpler to combine them into a single 'update' method for each widget type
stackotter · Dec 11, 2023 · ad16aa4 · ad16aa4
1 parent 26aa77c
commit ad16aa4
Show file tree

Hide file tree

Showing 29 changed files with 614 additions and 841 deletions.
diff --git a/Sources/AppKitBackend/AppKitBackend.swift b/Sources/AppKitBackend/AppKitBackend.swift
@@ -58,24 +58,18 @@ public struct AppKitBackend: AppBackend {
 
     public func show(widget: Widget) {}
 
-    public func createTextView(content: String, shouldWrap: Bool) -> Widget {
-        if shouldWrap {
-            return NSTextField(wrappingLabelWithString: content)
-        } else {
-            return NSTextField(labelWithString: content)
-        }
+    public func createTextView() -> Widget {
+        return NSTextField(wrappingLabelWithString: "")
     }
 
-    public func setContent(ofTextView textView: Widget, to content: String) {
+    public func updateTextView(_ textView: Widget, content: String, shouldWrap: Bool) {
+        // TODO: Implement text wrap handling
         (textView as! NSTextField).stringValue = content
     }
 
-    public func setWrap(ofTextView textView: Widget, to shouldWrap: Bool) {}
-
-    public func createVStack(spacing: Int) -> Widget {
+    public func createVStack() -> Widget {
         let view = NSStackView()
         view.orientation = .vertical
-        view.spacing = CGFloat(spacing)
         return view
     }
 
@@ -88,10 +82,9 @@ public struct AppKitBackend: AppBackend {
         (widget as! NSStackView).spacing = CGFloat(spacing)
     }
 
-    public func createHStack(spacing: Int) -> Widget {
+    public func createHStack() -> Widget {
         let view = NSStackView()
         view.orientation = .horizontal
-        view.spacing = CGFloat(spacing)
         return view
     }
 
@@ -103,19 +96,12 @@ public struct AppKitBackend: AppBackend {
         (widget as! NSStackView).spacing = CGFloat(spacing)
     }
 
-    public func createButton(label: String, action: @escaping () -> Void) -> Widget {
-        let button = NSButton(title: label, target: nil, action: nil)
-        button.onAction = { _ in
-            action()
-        }
-        return button
+    public func createButton() -> Widget {
+        return NSButton(title: "", target: nil, action: nil)
     }
 
-    public func setLabel(ofButton button: Widget, to label: String) {
+    public func updateButton(_ button: Widget, label: String, action: @escaping () -> Void) {
         (button as! NSButton).title = label
-    }
-
-    public func setAction(ofButton button: Widget, to action: @escaping () -> Void) {
         (button as! NSButton).onAction = { _ in
             action()
         }

diff --git a/Sources/CursesBackend/CursesBackend.swift b/Sources/CursesBackend/CursesBackend.swift
@@ -52,7 +52,7 @@ public final class CursesBackend: AppBackend {
         widget.setNeedsDisplay()
     }
 
-    public func createVStack(spacing: Int) -> Widget {
+    public func createVStack() -> Widget {
         return View()
     }
 
@@ -64,7 +64,7 @@ public final class CursesBackend: AppBackend {
 
     public func setSpacing(ofVStack container: Widget, to spacing: Int) {}
 
-    public func createHStack(spacing: Int) -> Widget {
+    public func createHStack() -> Widget {
         return View()
     }
 
@@ -76,30 +76,26 @@ public final class CursesBackend: AppBackend {
 
     public func setSpacing(ofHStack container: Widget, to spacing: Int) {}
 
-    public func createTextView(content: String, shouldWrap: Bool) -> Widget {
-        let label = Label(content)
+    public func createTextView() -> Widget {
+        let label = Label("")
         label.width = Dim.fill()
         return label
     }
 
-    public func setContent(ofTextView textView: Widget, to content: String) {
+    public func updateTextView(_ textView: Widget, content: String, shouldWrap: Bool) {
+        // TODO: Implement text wrap handling
         let label = textView as! Label
         label.text = content
     }
 
-    public func setWrap(ofTextView textView: Widget, to shouldWrap: Bool) {}
-
-    public func createButton(label: String, action: @escaping () -> Void) -> Widget {
-        let button = TermKit.Button(label, clicked: action)
+    public func createButton() -> Widget {
+        let button = TermKit.Button("")
         button.height = Dim.sized(1)
         return button
     }
 
-    public func setLabel(ofButton button: Widget, to label: String) {
+    public func updateButton(_ button: Widget, label: String, action: @escaping () -> Void) {
         (button as! TermKit.Button).text = label
-    }
-
-    public func setAction(ofButton button: Widget, to action: @escaping () -> Void) {
         (button as! TermKit.Button).clicked = { _ in
             action()
         }