SwiftOCAUI: remove binding() extensions

they no longer work after Combine/Observable support was removed

Author: lhoward

Sources/SwiftOCAUI/Conformances/OcaRoot+Binding.swift

@@ -0,0 +1,121 @@
+//
+// Copyright (c) 2024-2025 PADL Software Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an 'AS IS' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+@_spi(SwiftOCAPrivate)
+import SwiftOCA
+import SwiftUI
+
+public struct OcaPropertyView<Value: Sendable, Resolved: View>: View {
+  let object: OcaRoot
+  let property: any OcaPropertyRepresentable
+  let content: (Value) -> Resolved
+
+  @State
+  private var currentValue: Result<Value, Error>?
+
+  public init(
+    _ object: OcaRoot,
+    _ property: any OcaPropertyRepresentable,
+    @ViewBuilder content: @escaping (Value) -> Resolved
+  ) {
+    self.object = object
+    self.property = property
+    self.content = content
+  }
+
+  public var body: some View {
+    Group {
+      if let currentValue {
+        switch currentValue {
+        case let .success(value):
+          content(value)
+        case let .failure(error):
+          Text("Error: \(error.localizedDescription)").foregroundStyle(.tertiary)
+        }
+      } else {
+        ProgressView()
+      }
+    }
+    .task {
+      await property.subscribe(object)
+      do {
+        for try await result in property.async {
+          switch result {
+          case let .success(value):
+            if let typed = value as? Value {
+              currentValue = .success(typed)
+            } else {
+              currentValue = .failure(Ocp1Error.status(.badFormat))
+            }
+          case let .failure(error):
+            currentValue = .failure(error)
+          }
+        }
+      } catch {}
+    }
+  }
+}
+
+public struct OcaWritablePropertyView<Value: Sendable, Resolved: View>: View {
+  let object: OcaRoot
+  let property: any OcaPropertySubjectRepresentable
+  let content: (Binding<Value>) -> Resolved
+
+  @State
+  private var currentValue: Value?
+
+  public init(
+    _ object: OcaRoot,
+    _ property: any OcaPropertyRepresentable,
+    @ViewBuilder content: @escaping (Binding<Value>) -> Resolved
+  ) {
+    self.object = object
+    self.property = property as! (any OcaPropertySubjectRepresentable)
+    self.content = content
+  }
+
+  private var binding: Binding<Value> {
+    Binding<Value>(
+      get: { currentValue! },
+      set: { newValue in
+        currentValue = newValue
+        Task {
+          try? await property._setValue(object, newValue)
+        }
+      }
+    )
+  }
+
+  public var body: some View {
+    Group {
+      if currentValue != nil {
+        content(binding)
+      } else {
+        ProgressView()
+      }
+    }
+    .task {
+      await property.subscribe(object)
+      do {
+        for try await result in property.async {
+          if case let .success(value) = result, let typed = value as? Value {
+            currentValue = typed
+          }
+        }
+      } catch {}
+    }
+  }
+}

Sources/SwiftOCAUI/Views/PropertyView.swift

@@ -56,17 +56,3 @@ struct OcaLogSliderView: View {
     .id(value.value)
   }
 }
-
-extension Binding where Value == OcaProperty<OcaBoundedPropertyValue<OcaFloat32>>.PropertyValue {
-  var value: Binding<OcaBoundedPropertyValue<OcaFloat32>> {
-    Binding<OcaBoundedPropertyValue<OcaFloat32>>(get: {
-      if case let .success(value) = self.wrappedValue {
-        value
-      } else {
-        OcaBoundedPropertyValue(value: 0.0, in: 0.0...0.0)
-      }
-    }, set: { newValue in
-      self.wrappedValue = .success(newValue)
-    })
-  }
-}

Sources/SwiftOCAUI/Views/Utility/LogSliderView.swift

@@ -23,20 +23,6 @@ extension OcaBooleanActuator: OcaViewRepresentable {
   }
 }
 
-private extension Binding where Value == OcaProperty<OcaBoolean>.PropertyValue {
-  var value: Binding<Bool> {
-    Binding<Bool>(get: {
-      if case let .success(isOn) = self.wrappedValue {
-        isOn
-      } else {
-        false
-      }
-    }, set: { isOn in
-      self.wrappedValue = .success(isOn)
-    })
-  }
-}
-
 public struct OcaBooleanView: OcaView {
   @State
   var object: OcaBooleanActuator
@@ -46,9 +32,10 @@ public struct OcaBooleanView: OcaView {
   }
 
   public var body: some View {
-    Toggle(isOn: object.binding(for: object.$setting).value) {}
-      .toggleStyle(SymbolToggleStyle(systemImage: "circle.fill", activeColor: .accentColor))
-      .padding()
-      .showProgressIfWaiting(object.$setting)
+    OcaWritablePropertyView(object, object.$setting) { (value: Binding<OcaBoolean>) in
+      Toggle(isOn: value) {}
+        .toggleStyle(SymbolToggleStyle(systemImage: "circle.fill", activeColor: .accentColor))
+        .padding()
+    }
   }
 }

Sources/SwiftOCAUI/Views/Workers/Actuators/BooleanActuatorView.swift

@@ -32,7 +32,11 @@ public struct OcaFloat32ActuatorView: OcaView {
   }
 
   public var body: some View {
-    OcaLogSliderView(value: object.binding(for: object.$setting).value)
-      .showProgressIfWaiting(object.$setting)
+    OcaWritablePropertyView(
+      object,
+      object.$setting
+    ) { (value: Binding<OcaBoundedPropertyValue<OcaFloat32>>) in
+      OcaLogSliderView(value: value)
+    }
   }
 }

Sources/SwiftOCAUI/Views/Workers/Actuators/Float32ActuatorView.swift

@@ -32,7 +32,11 @@ public struct OcaGainView: OcaView {
   }
 
   public var body: some View {
-    OcaLogSliderView(value: object.binding(for: object.$gain).value)
-      .showProgressIfWaiting(object.$gain)
+    OcaWritablePropertyView(
+      object,
+      object.$gain
+    ) { (value: Binding<OcaBoundedPropertyValue<OcaDB>>) in
+      OcaLogSliderView(value: value)
+    }
   }
 }

Sources/SwiftOCAUI/Views/Workers/Actuators/GainView.swift

@@ -23,20 +23,6 @@ extension OcaMute: OcaViewRepresentable {
   }
 }
 
-private extension Binding where Value == OcaProperty<OcaMuteState>.PropertyValue {
-  var value: Binding<Bool> {
-    Binding<Bool>(get: {
-      if case let .success(muteState) = self.wrappedValue {
-        muteState == .muted
-      } else {
-        false
-      }
-    }, set: { isOn in
-      self.wrappedValue = .success(isOn ? .muted : .unmuted)
-    })
-  }
-}
-
 public struct OcaMuteView: OcaView {
   @State
   var object: OcaMute
@@ -46,12 +32,17 @@ public struct OcaMuteView: OcaView {
   }
 
   public var body: some View {
-    Toggle(isOn: object.binding(for: object.$state).value) {}
-      .toggleStyle(SymbolToggleStyle(
-        systemImage: "speaker.slash.circle.fill",
-        activeColor: .red
-      ))
-      .padding()
-      .showProgressIfWaiting(object.$state)
+    OcaWritablePropertyView(object, object.$state) { (value: Binding<OcaMuteState>) in
+      let boolBinding = Binding<Bool>(
+        get: { value.wrappedValue == .muted },
+        set: { value.wrappedValue = $0 ? .muted : .unmuted }
+      )
+      Toggle(isOn: boolBinding) {}
+        .toggleStyle(SymbolToggleStyle(
+          systemImage: "speaker.slash.circle.fill",
+          activeColor: .red
+        ))
+        .padding()
+    }
   }
 }

Sources/SwiftOCAUI/Views/Workers/Actuators/MuteView.swift

@@ -33,8 +33,12 @@ public struct OcaPanBalanceView: OcaView {
   }
 
   public var body: some View {
-    OcaVariableSliderView(value: object.binding(for: object.$position).value)
-      .valueSliderStyle(HorizontalValueSliderStyle())
-      .showProgressIfWaiting(object.$position)
+    OcaWritablePropertyView(
+      object,
+      object.$position
+    ) { (value: Binding<OcaBoundedPropertyValue<OcaFloat32>>) in
+      OcaVariableSliderView(value: value)
+        .valueSliderStyle(HorizontalValueSliderStyle())
+    }
   }
 }

Sources/SwiftOCAUI/Views/Workers/Actuators/PanBalanceView.swift

@@ -23,20 +23,6 @@ extension OcaPolarity: OcaViewRepresentable {
   }
 }
 
-private extension Binding where Value == OcaProperty<OcaPolarityState>.PropertyValue {
-  var value: Binding<Bool> {
-    Binding<Bool>(get: {
-      if case let .success(isInverted) = self.wrappedValue {
-        isInverted == .inverted
-      } else {
-        false
-      }
-    }, set: { isInverted in
-      self.wrappedValue = .success(isInverted ? .inverted : .nonInverted)
-    })
-  }
-}
-
 public struct OcaPolarityView: OcaView {
   @State
   var object: OcaPolarity
@@ -46,9 +32,14 @@ public struct OcaPolarityView: OcaView {
   }
 
   public var body: some View {
-    Toggle(isOn: object.binding(for: object.$state).value) {}
-      .toggleStyle(SymbolToggleStyle(systemImage: "circle.slash", activeColor: .accentColor))
-      .padding()
-      .showProgressIfWaiting(object.$state)
+    OcaWritablePropertyView(object, object.$state) { (value: Binding<OcaPolarityState>) in
+      let boolBinding = Binding<Bool>(
+        get: { value.wrappedValue == .inverted },
+        set: { value.wrappedValue = $0 ? .inverted : .nonInverted }
+      )
+      Toggle(isOn: boolBinding) {}
+        .toggleStyle(SymbolToggleStyle(systemImage: "circle.slash", activeColor: .accentColor))
+        .padding()
+    }
   }
 }