mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 21:05:20 +00:00
* Centralize UI theme colors into semantic ThemePalette tokens Introduce AppTheme/ThemePalette (Utils/Theme.swift) with an environment key and @ThemedPalette property wrapper, persisted via @AppStorage. Views now resolve background/primary/secondary/accentBlue/alertRed/ divider tokens from the environment instead of computing colors inline, removing the backgroundColor/textColor/secondaryTextColor prop-drilling through the header, composer, and people-sheet hierarchy. Matrix theme output is pixel-identical; this is groundwork for a user-selectable theme switcher. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Add liquid glass theme with in-app appearance switcher Add a .liquidGlass AppTheme alongside the matrix terminal theme, selectable from a one-line APPEARANCE row in the app info sheet (persisted via @AppStorage, applies live). Liquid glass renders system fonts and colors over a subtle gradient backdrop, with the header and composer floating as Liquid Glass panels (real .glassEffect() on iOS/macOS 26, compiler-gated with an ultraThinMaterial fallback for older SDKs). The message list scrolls underneath the chrome via safe-area insets, and all sheets share the same backdrop and surface language. The matrix theme is unchanged. Details: - Theme is threaded through ChatMessageFormatter so message AttributedStrings switch font design per theme; the per-message format cache gains a variant key so themes never serve each other's cached strings - New palette tokens: accent (interactive tint) and locationAccent (geohash green), replacing scattered hardcoded greens/blues in the voice note, waveform, verification, and people-sheet views - Header controls get full-height tap targets and the people count becomes a real Button (previously a tap gesture on the cluster) - CommandSuggestionsView renders nothing when empty instead of a zero-height view that pushed the composer input off-center - New appearance strings localized for all 29 catalog languages Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
151 lines
7.3 KiB
Swift
151 lines
7.3 KiB
Swift
import SwiftUI
|
|
import BitFoundation
|
|
|
|
struct MeshPeerList: View {
|
|
@EnvironmentObject private var peerListModel: PeerListModel
|
|
@ThemedPalette private var palette
|
|
let onTapPeer: (PeerID) -> Void
|
|
let onToggleFavorite: (PeerID) -> Void
|
|
let onShowFingerprint: (PeerID) -> Void
|
|
@Environment(\.colorScheme) var colorScheme
|
|
|
|
@State private var orderedIDs: [String] = []
|
|
|
|
private enum Strings {
|
|
static let noneNearby: LocalizedStringKey = "geohash_people.none_nearby"
|
|
static let blockedTooltip = String(localized: "geohash_people.tooltip.blocked", comment: "Tooltip shown next to a blocked peer indicator")
|
|
static let newMessagesTooltip = String(localized: "mesh_peers.tooltip.new_messages", comment: "Tooltip for the unread messages indicator")
|
|
}
|
|
|
|
var body: some View {
|
|
let currentIDs = peerListModel.meshRows.map(\.id)
|
|
let displayIDs = orderedIDs.filter { currentIDs.contains($0) } + currentIDs.filter { !orderedIDs.contains($0) }
|
|
let peers: [MeshPeerRow] = displayIDs.compactMap { id in
|
|
peerListModel.meshRows.first(where: { $0.id == id })
|
|
}
|
|
|
|
if peerListModel.meshRows.isEmpty {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
Text(Strings.noneNearby)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(palette.secondary)
|
|
.padding(.horizontal)
|
|
.padding(.top, 12)
|
|
}
|
|
} else {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
ForEach(0..<peers.count, id: \.self) { idx in
|
|
let peer = peers[idx]
|
|
let isMe = peer.isMe
|
|
HStack(spacing: 4) {
|
|
let assigned = peerListModel.colorForMeshPeer(id: peer.peerID, isDark: colorScheme == .dark)
|
|
let baseColor = isMe ? Color.orange : assigned
|
|
if isMe {
|
|
Image(systemName: "person.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if peer.isConnected {
|
|
// Mesh-connected peer: radio icon
|
|
Image(systemName: "antenna.radiowaves.left.and.right")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if peer.isReachable {
|
|
// Mesh-reachable (relayed): point.3 icon
|
|
Image(systemName: "point.3.filled.connected.trianglepath.dotted")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if peer.isMutualFavorite {
|
|
// Mutual favorite reachable via Nostr: globe icon (purple)
|
|
Image(systemName: "globe")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.purple)
|
|
} else {
|
|
// Fallback icon for others (dimmed)
|
|
Image(systemName: "person")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(palette.secondary)
|
|
}
|
|
|
|
let (base, suffix) = peer.displayName.splitSuffix()
|
|
HStack(spacing: 0) {
|
|
Text(base)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(baseColor)
|
|
if !suffix.isEmpty {
|
|
let suffixColor = isMe ? Color.orange.opacity(0.6) : baseColor.opacity(0.6)
|
|
Text(suffix)
|
|
.bitchatFont(size: 14)
|
|
.foregroundColor(suffixColor)
|
|
}
|
|
}
|
|
|
|
if peer.isBlocked {
|
|
Image(systemName: "nosign")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.red)
|
|
.help(Strings.blockedTooltip)
|
|
}
|
|
|
|
if !isMe {
|
|
if peer.isConnected {
|
|
if let icon = peer.encryptionStatus.icon {
|
|
Image(systemName: icon)
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
}
|
|
} else {
|
|
// Offline: prefer showing verified badge from persisted fingerprints
|
|
if peer.showsVerifiedBadgeWhenOffline {
|
|
Image(systemName: "checkmark.seal.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
} else if let icon = peer.encryptionStatus.icon {
|
|
// Fallback to whatever status says (likely lock if we had a past session)
|
|
Image(systemName: icon)
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(baseColor)
|
|
}
|
|
}
|
|
}
|
|
|
|
Spacer()
|
|
|
|
// Unread message indicator for this peer
|
|
if peer.hasUnread {
|
|
Image(systemName: "envelope.fill")
|
|
.font(.bitchatSystem(size: 10))
|
|
.foregroundColor(.orange)
|
|
.help(Strings.newMessagesTooltip)
|
|
}
|
|
|
|
if !isMe {
|
|
Button(action: { onToggleFavorite(peer.peerID) }) {
|
|
Image(systemName: peer.isFavorite ? "star.fill" : "star")
|
|
.font(.bitchatSystem(size: 12))
|
|
.foregroundColor(peer.isFavorite ? .yellow : palette.secondary)
|
|
}
|
|
.buttonStyle(.plain)
|
|
}
|
|
}
|
|
.padding(.horizontal)
|
|
.padding(.vertical, 4)
|
|
.padding(.top, idx == 0 ? 10 : 0)
|
|
.contentShape(Rectangle())
|
|
.onTapGesture { if !isMe { onTapPeer(peer.peerID) } }
|
|
.onTapGesture(count: 2) { if !isMe { onShowFingerprint(peer.peerID) } }
|
|
}
|
|
}
|
|
// Seed and update order outside result builder
|
|
.onAppear {
|
|
orderedIDs = currentIDs
|
|
}
|
|
.onChange(of: currentIDs) { ids in
|
|
var newOrder = orderedIDs
|
|
newOrder.removeAll { !ids.contains($0) }
|
|
for id in ids where !newOrder.contains(id) { newOrder.append(id) }
|
|
if newOrder != orderedIDs { orderedIDs = newOrder }
|
|
}
|
|
}
|
|
}
|
|
}
|