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

Remove RSSI-based sender name coloring in chat messages

Browse Source 
- Simplified getSenderColor to always return primary color
- Removed RSSI color calculation logic from formatMessageAsText
- Removed RSSI color calculation logic from formatMessage
- All sender names now use consistent green color
- RSSI information remains visible only in peer list
This commit is contained in:
jack
2025-07-24 13:16:47 +02:00
parent e13380fe27
commit b51000939b
1 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/ChatViewModel.swift
+6 -38
View File
@@ -882,16 +882,8 @@ class ChatViewModel: ObservableObject {
let isDark = colorScheme == .dark let isDark = colorScheme == .dark
let primaryColor = isDark ? Color.green : Color(red: 0, green: 0.5, blue: 0) let primaryColor = isDark ? Color.green : Color(red: 0, green: 0.5, blue: 0)
if message.sender == nickname { // Always use the same color for all senders - no RSSI-based coloring
return primaryColor return primaryColor
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
let rssi = meshService.getPeerRSSI()[peerID] {
// Use actual RSSI value
return getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
} else {
// No RSSI data available - use a neutral color
return primaryColor.opacity(0.7)
}
} }
@@ -989,20 +981,8 @@ class ChatViewModel: ObservableObject {
let sender = AttributedString("<@\(message.sender)> ") let sender = AttributedString("<@\(message.sender)> ")
var senderStyle = AttributeContainer() var senderStyle = AttributeContainer()
// Get sender color // Use consistent color for all senders
let senderColor: Color senderStyle.foregroundColor = primaryColor
if message.sender == nickname {
senderColor = primaryColor
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
let rssi = meshService.getPeerRSSI()[peerID] {
// Use actual RSSI value
senderColor = getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
} else {
// No RSSI data available - use a neutral color
senderColor = primaryColor.opacity(0.7)
}
senderStyle.foregroundColor = senderColor
senderStyle.font = .system(size: 14, weight: .medium, design: .monospaced) senderStyle.font = .system(size: 14, weight: .medium, design: .monospaced)
result.append(sender.mergingAttributes(senderStyle)) result.append(sender.mergingAttributes(senderStyle))
@@ -1122,20 +1102,8 @@ class ChatViewModel: ObservableObject {
let sender = AttributedString("<\(message.sender)> ") let sender = AttributedString("<\(message.sender)> ")
var senderStyle = AttributeContainer() var senderStyle = AttributeContainer()
// Get RSSI-based color // Use consistent color for all senders
let senderColor: Color senderStyle.foregroundColor = primaryColor
if message.sender == nickname {
senderColor = primaryColor
} else if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender),
let rssi = meshService.getPeerRSSI()[peerID] {
// Use actual RSSI value
senderColor = getRSSIColor(rssi: rssi.intValue, colorScheme: colorScheme)
} else {
// No RSSI data available - use a neutral color
senderColor = primaryColor.opacity(0.7)
}
senderStyle.foregroundColor = senderColor
senderStyle.font = .system(size: 12, weight: .medium, design: .monospaced) senderStyle.font = .system(size: 12, weight: .medium, design: .monospaced)
result.append(sender.mergingAttributes(senderStyle)) result.append(sender.mergingAttributes(senderStyle))