mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 07:25:19 +00:00
* Fix lock glyph alignment, privacy-caption band, and empty-state wrapping - Message-row locks: align to first text baseline instead of a hardcoded top padding that left the lock ~4pt below the line's visual center - Header/caption locks: 1pt optical lift (lock.fill ink is bottom-heavy; geometric centering reads low); seal badge stays untouched - DM privacy caption: sit on the themed surface like the rest of the bottom chrome instead of painting its own orange band - Empty-state lines: non-breaking spaces so the closing * can't orphan and 'bitchat/ for help' can't break right after the slash Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Unify sheet close buttons, widen tiny tap targets, handle long nicknames - New SheetCloseButton component: one glyph size/weight (13 semibold), 32pt visual box, 44pt hit target; adopted by all 7 sheets (sizes had drifted across 12/13/14pt, two had no frame at all) - Favorite star buttons get real tap targets (peer list + DM header) - DM header nickname: single line with middle truncation instead of wrapping into the fixed-height header; peer-list names truncate tail - Geohash people rows: leading glyph 12 -> 10 to match mesh rows - Sidebar lock glyphs get the same optical lift as the DM header Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Make channel switching, voice notes, and header actions work under VoiceOver - Channel rows in the location sheet are now single activatable buttons (label + selected trait + switch hint) with the bookmark toggle mirrored as a named accessibility action; bookmark buttons labeled - Voice-note mic: press-and-hold drag gestures can't be activated by VoiceOver, so the default accessibility action now toggles start/stop-and-send; announces 'recording' state; localized labels - Attachment button: camera (long-press) path exposed as a named action; labels localized instead of hardcoded English - People-count button announces connected vs no-one-reachable (was color-only); verification QR button gains a spoken name (.help is only a hint on iOS); bitchat/ logo exposes its tap-for-app-info as a button (panic triple-tap stays undiscoverable on purpose) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Theme-correctness sweep: palette colors everywhere, AX-size header growth - Fingerprint/verification sheet cards: palette-tinted boxes instead of fixed gray bands that ignored matrix green and occluded glass - Voice-note card: palette background (translucent) instead of opaque white/black; waveform + payment chips + image placeholder follow suit - .secondary/.primary/Color.blue swapped for palette.secondary/primary/ accentBlue across location sheets, people sheets, message captions, and the header count (system gray read wrong under matrix green) - Autocomplete/command rows: dropped the uniform gray wash that dulled the themed overlay panel - 'tap to reveal' caption follows the theme font instead of hardcoding monospaced - Headers use minHeight so two-line accessibility text sizes grow the bar instead of clipping inside it Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix main header expanding to fill the screen The header bar's fixed height was load-bearing: its children fill the bar with .frame(maxHeight: .infinity) tap targets, so switching to an open-ended minHeight let the header expand to swallow all available vertical space, centering the title mid-screen and crushing the timeline into the composer. Restore the fixed height — headerHeight is a @ScaledMetric, so it already grows with Dynamic Type. Reproduced and verified both layouts with an offscreen render harness. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * DM header: floating glass panel instead of muddy orange wash under glass Orange at 14% over the backdrop gradient reads as a gray-beige band, not a privacy signature. Under liquid glass the DM header now uses the same floating chrome panel as the main header; the private signature is already carried by the orange lock, caption, and composer accents. Matrix keeps its orange wash over the opaque themed surface, unchanged. 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>
119 lines
3.5 KiB
Swift
119 lines
3.5 KiB
Swift
//
|
|
// PaymentChipView.swift
|
|
// bitchat
|
|
//
|
|
// This is free and unencumbered software released into the public domain.
|
|
// For more information, see <https://unlicense.org>
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct PaymentChipView: View {
|
|
@Environment(\.colorScheme) private var colorScheme
|
|
@Environment(\.openURL) private var openURL
|
|
@ThemedPalette private var palette
|
|
|
|
enum PaymentType {
|
|
case cashu(String)
|
|
case lightning(String)
|
|
|
|
private static let cashuAllowedCharacters = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
|
|
|
|
private static func cashuURL(from link: String) -> URL? {
|
|
if let url = URL(string: link), url.scheme != nil {
|
|
return url
|
|
}
|
|
let enc = link.addingPercentEncoding(withAllowedCharacters: cashuAllowedCharacters) ?? link
|
|
return URL(string: "cashu:\(enc)")
|
|
}
|
|
|
|
var url: URL? {
|
|
switch self {
|
|
case .cashu(let link):
|
|
return Self.cashuURL(from: link)
|
|
case .lightning(let link):
|
|
return URL(string: link)
|
|
}
|
|
}
|
|
|
|
var emoji: String {
|
|
switch self {
|
|
case .cashu: "🥜"
|
|
case .lightning: "⚡"
|
|
}
|
|
}
|
|
|
|
var label: String {
|
|
switch self {
|
|
case .cashu:
|
|
String(localized: "content.payment.cashu", comment: "Label for Cashu payment chip")
|
|
case .lightning:
|
|
String(localized: "content.payment.lightning", comment: "Label for Lightning payment chip")
|
|
}
|
|
}
|
|
}
|
|
|
|
let paymentType: PaymentType
|
|
|
|
private var fgColor: Color { palette.primary }
|
|
private var bgColor: Color {
|
|
palette.secondary.opacity(colorScheme == .dark ? 0.18 : 0.12)
|
|
}
|
|
private var border: Color { fgColor.opacity(0.25) }
|
|
|
|
var body: some View {
|
|
Button {
|
|
#if os(iOS)
|
|
if let url = paymentType.url { openURL(url) }
|
|
#else
|
|
if let url = paymentType.url { NSWorkspace.shared.open(url) }
|
|
#endif
|
|
} label: {
|
|
HStack(spacing: 6) {
|
|
Text(paymentType.emoji)
|
|
Text(paymentType.label)
|
|
.bitchatFont(size: 12, weight: .semibold)
|
|
}
|
|
.padding(.vertical, 6)
|
|
.padding(.horizontal, 12)
|
|
.background(
|
|
RoundedRectangle(cornerRadius: 12)
|
|
.fill(bgColor)
|
|
)
|
|
.overlay(
|
|
RoundedRectangle(cornerRadius: 12)
|
|
.stroke(border, lineWidth: 1)
|
|
)
|
|
.foregroundColor(fgColor)
|
|
}
|
|
.buttonStyle(.plain)
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
let cashuLink = "https://example.com/cashu"
|
|
let lightningLink = "https://example.com/lightning"
|
|
|
|
List {
|
|
HStack {
|
|
PaymentChipView(paymentType: .cashu(cashuLink))
|
|
PaymentChipView(paymentType: .lightning(lightningLink))
|
|
}
|
|
.listRowSeparator(.hidden)
|
|
.listRowInsets(EdgeInsets())
|
|
.listRowBackground(EmptyView())
|
|
}
|
|
.environment(\.colorScheme, .light)
|
|
|
|
List {
|
|
HStack {
|
|
PaymentChipView(paymentType: .cashu(cashuLink))
|
|
PaymentChipView(paymentType: .lightning(lightningLink))
|
|
}
|
|
.listRowSeparator(.hidden)
|
|
.listRowInsets(EdgeInsets())
|
|
.listRowBackground(EmptyView())
|
|
}
|
|
.environment(\.colorScheme, .dark)
|
|
}
|