Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
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); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions Bitkit.xcodeproj/project.pbxproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
Expand DownExpand Up@@ -161,6 +162,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
182817C12F59A7F10055A441 /* Paykit in Frameworks */,
4AFCA3702E05933800205CAE /* Zip in Frameworks */,
968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
Expand DownExpand Up@@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand DownExpand Up@@ -380,6 +383,7 @@
968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
);
productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
projectDirPath = "";
Expand DownExpand Up@@ -512,7 +516,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -540,7 +548,11 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand DownExpand Up@@ -699,7 +711,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -742,7 +758,11 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.0;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
);
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand DownExpand Up@@ -891,6 +911,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = revision;
revision = cd1253291b1582759d569372d5942b8871527ea1;
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
Expand DownExpand Up@@ -935,8 +963,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/bitkit-core";
requirement = {
branch = master;
kind = branch;
kind = revision;
revision = ea770caabdaf07f5fd196b6e1df3997ac497f25a;
};
};
96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {
Expand All@@ -958,6 +986,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
182817C02F59A7F10055A441 /* Paykit */ = {
isa = XCSwiftPackageProductDependency;
package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
productName = Paykit;
};
18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
isa = XCSwiftPackageProductDependency;
package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Bitkit/AppScene.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ struct AppScene: View {
@StateObject private var transferTracking: TransferTrackingManager
@StateObject private var channelDetails = ChannelDetailsViewModel.shared
@StateObject private var migrations = MigrationsService.shared
@StateObject private var pubkyProfile = PubkyProfileManager()
@StateObject private var contactsManager = ContactsManager()

@State private var hideSplash = false
@State private var removeSplash = false
Expand DownExpand Up@@ -131,6 +133,15 @@ struct AppScene: View {
.environmentObject(tagManager)
.environmentObject(transferTracking)
.environmentObject(channelDetails)
.environmentObject(pubkyProfile)
.environmentObject(contactsManager)
.onChange(of: pubkyProfile.authState) { _, authState in
if authState == .authenticated, let pk = pubkyProfile.publicKey {
Task { try? await contactsManager.loadContacts(for: pk) }
} else if authState == .idle {
contactsManager.reset()
}
}
.onAppear {
if !settings.pinEnabled {
isPinVerified = true
Expand DownExpand Up@@ -388,6 +399,10 @@ struct AppScene: View {

@Sendable
private func setupTask() async {
// Start Pubky/Paykit initialization early so PKDNS bootstrapping
// runs concurrently with wallet setup instead of sequentially after it.
Task { await pubkyProfile.initialize() }

do {
// Handle orphaned keychain before anything else
handleOrphanedKeychain()
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "pubky-ring-logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pubky-ring-logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pubky-ring-logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "tag-pubky.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "tag-pubky@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tag-pubky@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 45 additions & 17 deletions Bitkit/Components/Header.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import SwiftUI
struct Header: View {
@EnvironmentObject var app: AppViewModel
@EnvironmentObject var navigation: NavigationViewModel
@EnvironmentObject var pubkyProfile: PubkyProfileManager

/// When true, shows the widget edit button (only on the widgets tab).
var showWidgetEditButton: Bool = false
Expand All@@ -16,23 +17,7 @@ struct Header: View {

var body: some View {
HStack(alignment: .center, spacing: 0) {
// Button {
// if app.hasSeenProfileIntro {
// navigation.navigate(.profile)
// } else {
// navigation.navigate(.profileIntro)
// }
// } label: {
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: "person.circle.fill")
// .resizable()
// .font(.title2)
// .foregroundColor(.gray1)
// .frame(width: 32, height: 32)

// TitleText(t("slashtags__your_name_capital"))
// }
// }
profileButton

Spacer()

Expand DownExpand Up@@ -79,4 +64,47 @@ struct Header: View {
.padding(.leading, 16)
.padding(.trailing, 10)
}

@ViewBuilder
private var profileButton: some View {
Button {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if app.hasSeenProfileIntro {
navigation.navigate(.pubkyRingAuth)
} else {
navigation.navigate(.profileIntro)
}
} label: {
HStack(alignment: .center, spacing: 16) {
profileAvatar

if let name = pubkyProfile.displayName {
TitleText(name)
} else {
TitleText(t("slashtags__your_name_capital"))
}
}
.contentShape(Rectangle())
}
.accessibilityLabel(pubkyProfile.displayName ?? t("profile__nav_title"))
}

@ViewBuilder
private var profileAvatar: some View {
if let imageUri = pubkyProfile.displayImageUri {
PubkyImage(uri: imageUri, size: 32)
} else {
Circle()
.fill(Color.gray4)
.frame(width: 32, height: 32)
.overlay {
Image("user-square")
.resizable()
.scaledToFit()
.foregroundColor(.white32)
.frame(width: 16, height: 16)
}
}
}
}
Loading
Loading