mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 17:45:19 +00:00
Peer lists: apply same per-peer colors as chat (self orange); suffix uses lighter variant; geohash uses Nostr pubkey, mesh uses Noise key
This commit is contained in:
@@ -3144,7 +3144,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
|
|||||||
return hash
|
return hash
|
||||||
}
|
}
|
||||||
|
|
||||||
private func colorForPeerSeed(_ seed: String, isDark: Bool) -> Color {
|
@MainActor
|
||||||
|
func colorForPeerSeed(_ seed: String, isDark: Bool) -> Color {
|
||||||
if let cached = peerColorCache[seed] { return cached }
|
if let cached = peerColorCache[seed] { return cached }
|
||||||
var hue = Double(djb2(seed) % 360) / 360.0
|
var hue = Double(djb2(seed) % 360) / 360.0
|
||||||
// Avoid orange (~30°) reserved for self
|
// Avoid orange (~30°) reserved for self
|
||||||
@@ -3175,6 +3176,21 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
|
|||||||
return colorForPeerSeed(seed, isDark: isDark)
|
return colorForPeerSeed(seed, isDark: isDark)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Public helpers for views to color peers consistently in lists
|
||||||
|
@MainActor
|
||||||
|
func colorForNostrPubkey(_ pubkeyHexLowercased: String, isDark: Bool) -> Color {
|
||||||
|
return colorForPeerSeed("nostr:" + pubkeyHexLowercased.lowercased(), isDark: isDark)
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
func colorForMeshPeer(id peerID: String, isDark: Bool) -> Color {
|
||||||
|
if let peer = unifiedPeerService.getPeer(by: peerID) {
|
||||||
|
let full = peer.noisePublicKey.hexEncodedString().lowercased()
|
||||||
|
return colorForPeerSeed("noise:" + full, isDark: isDark)
|
||||||
|
}
|
||||||
|
return colorForPeerSeed(peerID.lowercased(), isDark: isDark)
|
||||||
|
}
|
||||||
|
|
||||||
private func trimMeshTimelineIfNeeded() {
|
private func trimMeshTimelineIfNeeded() {
|
||||||
if meshTimeline.count > meshTimelineCap {
|
if meshTimeline.count > meshTimelineCap {
|
||||||
let removeCount = meshTimeline.count - meshTimelineCap
|
let removeCount = meshTimeline.count - meshTimelineCap
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ struct GeohashPeopleList: View {
|
|||||||
let textColor: Color
|
let textColor: Color
|
||||||
let secondaryTextColor: Color
|
let secondaryTextColor: Color
|
||||||
let onTapPerson: () -> Void
|
let onTapPerson: () -> Void
|
||||||
|
@Environment(\.colorScheme) var colorScheme
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Group {
|
Group {
|
||||||
@@ -51,14 +52,15 @@ struct GeohashPeopleList: View {
|
|||||||
}
|
}
|
||||||
let (base, suffix) = splitSuffix(from: person.displayName)
|
let (base, suffix) = splitSuffix(from: person.displayName)
|
||||||
let isMe = person.id == myHex
|
let isMe = person.id == myHex
|
||||||
|
let assignedColor = viewModel.colorForNostrPubkey(person.id, isDark: colorScheme == .dark)
|
||||||
HStack(spacing: 0) {
|
HStack(spacing: 0) {
|
||||||
let rowColor: Color = isMe ? .orange : textColor
|
let rowColor: Color = isMe ? .orange : assignedColor
|
||||||
Text(base)
|
Text(base)
|
||||||
.font(.system(size: 14, design: .monospaced))
|
.font(.system(size: 14, design: .monospaced))
|
||||||
.fontWeight(isMe ? .bold : .regular)
|
.fontWeight(isMe ? .bold : .regular)
|
||||||
.foregroundColor(rowColor)
|
.foregroundColor(rowColor)
|
||||||
if !suffix.isEmpty {
|
if !suffix.isEmpty {
|
||||||
let suffixColor = isMe ? Color.orange.opacity(0.6) : textColor.opacity(0.6)
|
let suffixColor = isMe ? Color.orange.opacity(0.6) : rowColor.opacity(0.6)
|
||||||
Text(suffix)
|
Text(suffix)
|
||||||
.font(.system(size: 14, design: .monospaced))
|
.font(.system(size: 14, design: .monospaced))
|
||||||
.foregroundColor(suffixColor)
|
.foregroundColor(suffixColor)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ struct MeshPeerList: View {
|
|||||||
let onTapPeer: (String) -> Void
|
let onTapPeer: (String) -> Void
|
||||||
let onToggleFavorite: (String) -> Void
|
let onToggleFavorite: (String) -> Void
|
||||||
let onShowFingerprint: (String) -> Void
|
let onShowFingerprint: (String) -> Void
|
||||||
|
@Environment(\.colorScheme) var colorScheme
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Group {
|
Group {
|
||||||
@@ -61,7 +62,8 @@ struct MeshPeerList: View {
|
|||||||
|
|
||||||
let displayName = isMe ? viewModel.nickname : peer.nickname
|
let displayName = isMe ? viewModel.nickname : peer.nickname
|
||||||
let (base, suffix) = splitSuffix(from: displayName)
|
let (base, suffix) = splitSuffix(from: displayName)
|
||||||
let baseColor = ((peer.favoriteStatus?.isFavorite ?? false) || peerNicknames[peer.id] != nil) ? textColor : secondaryTextColor
|
let assigned = viewModel.colorForMeshPeer(id: peer.id, isDark: colorScheme == .dark)
|
||||||
|
let baseColor = isMe ? Color.orange : assigned
|
||||||
HStack(spacing: 0) {
|
HStack(spacing: 0) {
|
||||||
Text(base)
|
Text(base)
|
||||||
.font(.system(size: 14, design: .monospaced))
|
.font(.system(size: 14, design: .monospaced))
|
||||||
|
|||||||
Reference in New Issue
Block a user