permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 16:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: use 'point.3.connected.trianglepath.dotted' for mesh-reachable; change people count to include connected+reachable (exclude Nostr-only)

Browse Source
This commit is contained in:
jack
2025-08-26 02:39:16 +02:00
parent 35e4ad8914
commit fc690fc0ac
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Views/ContentView.swift
+4 -5
View File
@@ -1036,9 +1036,8 @@ struct ContentView: View {
case .mesh: case .mesh:
let counts = viewModel.allPeers.reduce(into: (others: 0, mesh: 0)) { counts, peer in let counts = viewModel.allPeers.reduce(into: (others: 0, mesh: 0)) { counts, peer in
guard peer.id != viewModel.meshService.myPeerID else { return } guard peer.id != viewModel.meshService.myPeerID else { return }
let isMeshConnected = peer.isConnected if peer.isConnected { counts.mesh += 1; counts.others += 1 }
if isMeshConnected { counts.mesh += 1; counts.others += 1 } else if peer.isReachable { counts.others += 1 }
else if peer.isMutualFavorite { counts.others += 1 }
} }
let meshBlue = Color(hue: 0.60, saturation: 0.85, brightness: 0.82) let meshBlue = Color(hue: 0.60, saturation: 0.85, brightness: 0.82)
let color: Color = counts.mesh > 0 ? meshBlue : Color.secondary let color: Color = counts.mesh > 0 ? meshBlue : Color.secondary
@@ -1248,8 +1247,8 @@ struct ContentView: View {
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Connected via mesh") .accessibilityLabel("Connected via mesh")
case .meshReachable: case .meshReachable:
// Antenna icon for reachable via mesh (not directly connected) // point.3 icon for reachable via mesh (not directly connected)
Image(systemName: "antenna.radiowaves.left.and.right") Image(systemName: "point.3.connected.trianglepath.dotted")
.font(.system(size: 14)) .font(.system(size: 14))
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Reachable via mesh") .accessibilityLabel("Reachable via mesh")
bitchat/Views/MeshPeerList.swift
+5
View File
@@ -52,6 +52,11 @@ struct MeshPeerList: View {
Image(systemName: "antenna.radiowaves.left.and.right") Image(systemName: "antenna.radiowaves.left.and.right")
.font(.system(size: 10)) .font(.system(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} else if peer.isReachable {
// Mesh-reachable (relayed): point.3 icon
Image(systemName: "point.3.connected.trianglepath.dotted")
.font(.system(size: 10))
.foregroundColor(baseColor)
} else if peer.isMutualFavorite { } else if peer.isMutualFavorite {
// Mutual favorite reachable via Nostr: globe icon (purple) // Mutual favorite reachable via Nostr: globe icon (purple)
Image(systemName: "globe") Image(systemName: "globe")