Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: trezor hardware support by coreyphillips · Pull Request #507 · synonymdev/bitkit-ios · GitHub
Skip to content
Merged
16 changes: 16 additions & 0 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -522,6 +522,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -550,6 +554,10 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -710,6 +718,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -754,6 +766,10 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.2.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ struct AppScene: View {
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()
@State private var keyboardManager = KeyboardManager()
@State private var trezorViewModel = TrezorViewModel()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -144,6 +145,7 @@ struct AppScene: View {
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.environment(keyboardManager)
.environment(trezorViewModel)
.onChange(of: pubkyProfile.authState, initial: true) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
Expand Down
212 changes: 212 additions & 0 deletions Bitkit/Components/Trezor/TrezorDeviceRow.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
import BitkitCore
import SwiftUI

/// Row displaying a discovered Trezor device
struct TrezorDeviceRow: View {
let device: TrezorDeviceInfo
let isConnecting: Bool
let onConnect: () -> Void

var body: some View {
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: transportIcon)
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(displayName)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(transportLabel)
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

// Connect indicator or chevron
if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
} else {
Text("Connect")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.white)
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background(Color.white.opacity(0.15))
.clipShape(Capsule())
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
.buttonStyle(.plain)
.disabled(isConnecting)
}

private var displayName: String {
if let label = device.label, !label.isEmpty {
return label
}
return modelName
}

private var modelName: String {
if let model = device.model {
return "Trezor \(model)"
}
return "Trezor"
}

private var transportIcon: String {
switch device.transportType {
case .bluetooth:
return "wave.3.right"
case .usb:
return "cable.connector"
}
}

private var transportLabel: String {
switch device.transportType {
case .bluetooth:
return "Bluetooth"
case .usb:
return "USB"
}
}
}

// MARK: - Known Device Row

/// Row displaying a previously connected (known) Trezor device
struct KnownDeviceRow: View {
let device: TrezorKnownDevice
let isConnecting: Bool
let onConnect: () -> Void
let onForget: () -> Void

var body: some View {
HStack(spacing: 16) {
// Tap area for connect
Button(action: {
if !isConnecting {
onConnect()
}
}) {
HStack(spacing: 16) {
// Device icon
Image(systemName: device.transportType == "bluetooth" ? "wave.3.right" : "cable.connector")
.font(.system(size: 24))
.foregroundColor(.white)
.frame(width: 48, height: 48)
.background(Color.white.opacity(0.1))
.clipShape(RoundedRectangle(cornerRadius: 12))

// Device info
VStack(alignment: .leading, spacing: 4) {
Text(device.label ?? device.name)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(device.lastConnectedAt.relativeDescription)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.4))
}

Spacer()

if isConnecting {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
}
}
}
.buttonStyle(.plain)
.disabled(isConnecting)

// Forget button
Button(action: onForget) {
Image(systemName: "trash")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.padding(10)
}
.buttonStyle(.plain)
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}

// MARK: - Date Helper

extension Date {
private static let relativeDateFormatter: RelativeDateTimeFormatter = {
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .full
return formatter
}()

/// Returns a relative description like "2 minutes ago"
var relativeDescription: String {
Self.relativeDateFormatter.localizedString(for: self, relativeTo: Date())
}
}

// MARK: - Preview

#if DEBUG
struct TrezorDeviceRow_Previews: PreviewProvider {
static var previews: some View {
ZStack {
Color.black.ignoresSafeArea()

VStack(spacing: 16) {
TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "ble:12345",
transportType: .bluetooth,
name: "Trezor Safe 5",
path: "ble:12345",
label: "My Trezor",
model: "Safe 5",
isBootloader: false
),
isConnecting: false,
onConnect: {}
)

TrezorDeviceRow(
device: TrezorDeviceInfo(
id: "usb:001",
transportType: .usb,
name: "Trezor Model T",
path: "usb:001",
label: nil,
model: "Model T",
isBootloader: false
),
isConnecting: true,
onConnect: {}
)
}
.padding()
}
}
}
#endif
63 changes: 63 additions & 0 deletions Bitkit/Components/Trezor/TrezorExpandableSection.swift
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
import SwiftUI

/// Reusable expandable section for the Trezor dashboard.
/// Provides a tappable header with animated expand/collapse of content.
struct TrezorExpandableSection<Content: View>: View {
let title: String
let icon: String
let description: String
@Binding var isExpanded: Bool
@ViewBuilder let content: () -> Content

var body: some View {
VStack(spacing: 0) {
// Tappable header
Button(action: {
withAnimation(.easeInOut(duration: 0.25)) {
isExpanded.toggle()
}
}) {
HStack(spacing: 16) {
Image(systemName: icon)
.font(.system(size: 20))
.foregroundColor(.white)
.frame(width: 40, height: 40)
.background(Color.white.opacity(0.1))
.clipShape(Circle())

VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.system(size: 16, weight: .semibold))
.foregroundColor(.white)

Text(description)
.font(.system(size: 12))
.foregroundColor(.white.opacity(0.6))
}

Spacer()

Image(systemName: "chevron.down")
.font(.system(size: 14))
.foregroundColor(.white.opacity(0.4))
.rotationEffect(.degrees(isExpanded ? 0 : -90))
.animation(.easeInOut(duration: 0.25), value: isExpanded)
}
}

// Expandable content
if isExpanded {
Divider()
.background(Color.white.opacity(0.1))
.padding(.top, 12)

content()
.padding(.top, 12)
.transition(.opacity)
}
}
.padding(16)
.background(Color.white.opacity(0.05))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}
Loading
Loading