Move ProgressView out of the Label, add Spacer

StanfordSpezi · Nov 17, 2024 · 341dd10 · 341dd10
1 parent b338e02
commit 341dd10
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift b/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift
@@ -26,6 +26,14 @@ public struct NearbyDeviceRow<Label: View>: View {
             }
                 .tint(.primary)
 
+            Spacer()
+
+            if peripheral.state == .connecting || peripheral.state == .disconnecting {
+                ProgressView()
+                    .accessibilityRemoveTraits(.updatesFrequently)
+                    .foregroundStyle(.secondary)
+            }
+
             if secondaryActionClosure != nil && peripheral.state == .connected {
                 ListInfoButton(Text("Device Details", bundle: .module), action: deviceDetailsAction)
             }
@@ -113,6 +121,22 @@ public struct NearbyDeviceRow<Label: View>: View {
             print("Clicked")
         } secondaryAction: {
         }
+
+        let peripheral =  MockBluetoothPeripheral(label: "MyDevice 2", state: .connected)
+        NearbyDeviceRow(peripheral: MockBluetoothPeripheral(label: "MyDevice 2", state: .connected)) {
+            print("Clicked")
+        } secondaryAction: {
+            print("Secondary Clicked!")
+        } label: {
+            ListRow {
+                PeripheralLabel(peripheral)
+                Text("RSSI: -64")
+            } content: {
+                PeripheralSecondaryLabel(peripheral)
+            }
+
+        }
+
     }
 }
 #endif
diff --git a/Sources/SpeziDevicesUI/Scanning/PeripheralSecondaryLabel.swift b/Sources/SpeziDevicesUI/Scanning/PeripheralSecondaryLabel.swift
@@ -37,8 +37,7 @@ public struct PeripheralSecondaryLabel: View {
             } else {
                 switch peripheral.state {
                 case .connecting, .disconnecting:
-                    ProgressView()
-                        .accessibilityRemoveTraits(.updatesFrequently)
+                    EmptyView()
                 case .connected:
                     Text("Connected", bundle: .module)
                 case .disconnected: