Merge branch 'fix/no-sim-slot-none' into 'main'

lukbukkit · lukbukkit · commit c5e8933c3750 · 2025-12-19T16:21:25.000+01:00
Remove SIM "None" label

Closes #190

See merge request apple/cell-guard!54
diff --git a/CellGuardAppSwift/CellGuard/User Interface/Cells/CellListView.swift b/CellGuardAppSwift/CellGuard/User Interface/Cells/CellListView.swift
@@ -270,7 +270,7 @@ private struct ListPacketCell: View {
                     HStack(spacing: 2) {
                         Image(systemName: "simcard")
                             .font(.system(size: 12))
-                        Text(simSlots.map { "\($0)" }.sorted().joined(separator: ","))
+                        Text(simSlots.filter { $0 != 0}.map { "\($0)" }.sorted().joined(separator: ","))
                             .font(.system(size: 14))
                     }
                     .foregroundColor(.gray)
diff --git a/CellGuardAppSwift/CellGuard/User Interface/Connectivity/ConnectivityView.swift b/CellGuardAppSwift/CellGuard/User Interface/Connectivity/ConnectivityView.swift
@@ -168,7 +168,7 @@ struct ConnectivityEventListEntry: View {
                     HStack(spacing: 2) {
                         Image(systemName: "simcard")
                             .font(.system(size: 12))
-                        Text(simSlots.map { $0 == 0 ? "None" : "\($0)" }.sorted().joined(separator: ","))
+                        Text(simSlots.filter { $0 != 0}.map { "\($0)" }.sorted().joined(separator: ","))
                             .font(.system(size: 14))
                     }
                     .foregroundColor(.gray)

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private struct ListPacketCell: View {`
`270`	`270`	`HStack(spacing: 2) {`
`271`	`271`	`Image(systemName: "simcard")`
`272`	`272`	`.font(.system(size: 12))`
`273`		`- Text(simSlots.map { "\($0)" }.sorted().joined(separator: ","))`
	`273`	`+ Text(simSlots.filter { $0 != 0}.map { "\($0)" }.sorted().joined(separator: ","))`
`274`	`274`	`.font(.system(size: 14))`
`275`	`275`	`}`
`276`	`276`	`.foregroundColor(.gray)`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ struct ConnectivityEventListEntry: View {`
`168`	`168`	`HStack(spacing: 2) {`
`169`	`169`	`Image(systemName: "simcard")`
`170`	`170`	`.font(.system(size: 12))`
`171`		`- Text(simSlots.map { $0 == 0 ? "None" : "\($0)" }.sorted().joined(separator: ","))`
	`171`	`+ Text(simSlots.filter { $0 != 0}.map { "\($0)" }.sorted().joined(separator: ","))`
`172`	`172`	`.font(.system(size: 14))`
`173`	`173`	`}`
`174`	`174`	`.foregroundColor(.gray)`