Temporarily Disable Editing Nearby Distance on tvOS (#749)

- .popover and Slider are not available on tvOS. - Perhaps try .contextMenu???
bolsinga · Dec 4, 2023 · f81a5f4 · f81a5f4
1 parent 2fc8a96
commit f81a5f4
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 43 deletions.
diff --git a/Sources/Site/Music/UI/NearbyDistanceThresholdModifier.swift b/Sources/Site/Music/UI/NearbyDistanceThresholdModifier.swift
@@ -30,12 +30,14 @@ struct NearbyDistanceThresholdModifier: ViewModifier {
               Image(systemName: "gear")
             }
           }
-          .popover(isPresented: $presentDistanceSliderPopover) {
-            NearbyDistanceThresholdView(distanceThreshold: $model.distanceThreshold) {
-              labelText
+          #if !os(tvOS)
+            .popover(isPresented: $presentDistanceSliderPopover) {
+              NearbyDistanceThresholdView(distanceThreshold: $model.distanceThreshold) {
+                labelText
+              }
+              .presentationCompactAdaptation(.popover)
             }
-            .presentationCompactAdaptation(.popover)
-          }
+          #endif
         }
       }
       .task {

diff --git a/Sources/Site/Music/UI/NearbyDistanceThresholdView.swift b/Sources/Site/Music/UI/NearbyDistanceThresholdView.swift
@@ -8,50 +8,52 @@
 import CoreLocation
 import SwiftUI
 
-struct NearbyDistanceThresholdView: View {
-  @Binding var distanceThreshold: CLLocationDistance
-  @ViewBuilder var text: () -> Text
+#if !os(tvOS)
+  struct NearbyDistanceThresholdView: View {
+    @Binding var distanceThreshold: CLLocationDistance
+    @ViewBuilder var text: () -> Text
 
-  private var distanceThresholdMeasurementString: String {
-    nearbyDistanceThresholdFormatter.string(
-      from: Measurement(value: distanceThreshold, unit: UnitLength.meters))
-  }
+    private var distanceThresholdMeasurementString: String {
+      nearbyDistanceThresholdFormatter.string(
+        from: Measurement(value: distanceThreshold, unit: UnitLength.meters))
+    }
 
-  private func distanceValueString(_ distance: CLLocationDistance) -> String {
-    nearbyDistanceValueFormatter.string(
-      from: Measurement(value: distance, unit: UnitLength.meters))
-  }
+    private func distanceValueString(_ distance: CLLocationDistance) -> String {
+      nearbyDistanceValueFormatter.string(
+        from: Measurement(value: distance, unit: UnitLength.meters))
+    }
 
-  var body: some View {
-    VStack {
-      Slider(
-        value: $distanceThreshold, in: minimumNearbyDistance...maximumNearbyDistance,
-        step: nearbyDistanceStep
-      ) {
-        text()
-      } minimumValueLabel: {
-        Label {
-          Text(distanceValueString(minimumNearbyDistance))
-        } icon: {
-          Image(systemName: "minus.circle")
-        }
-      } maximumValueLabel: {
-        Label {
-          Text(distanceValueString(maximumNearbyDistance))
-        } icon: {
-          Image(systemName: "plus.circle")
+    var body: some View {
+      VStack {
+        Slider(
+          value: $distanceThreshold, in: minimumNearbyDistance...maximumNearbyDistance,
+          step: nearbyDistanceStep
+        ) {
+          text()
+        } minimumValueLabel: {
+          Label {
+            Text(distanceValueString(minimumNearbyDistance))
+          } icon: {
+            Image(systemName: "minus.circle")
+          }
+        } maximumValueLabel: {
+          Label {
+            Text(distanceValueString(maximumNearbyDistance))
+          } icon: {
+            Image(systemName: "plus.circle")
+          }
         }
+        Text(distanceThresholdMeasurementString)
       }
-      Text(distanceThresholdMeasurementString)
+      .frame(width: 300)
+      .padding([.leading, .trailing], 10)
     }
-    .frame(width: 300)
-    .padding([.leading, .trailing], 10)
   }
-}
 
-#Preview {
-  NearbyDistanceThresholdView(distanceThreshold: .constant(100.0)) {
-    let v = "Nearby Distance"
-    Text(v)
+  #Preview {
+    NearbyDistanceThresholdView(distanceThreshold: .constant(100.0)) {
+      let v = "Nearby Distance"
+      Text(v)
+    }
   }
-}
+#endif