Skip to content
Open
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 number Diff line number Diff 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 Down Expand 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 Down Expand Up @@ -273,6 +275,7 @@
4AFCA36F2E05933800205CAE /* Zip */,
4AAB08C92E1FE77600BA63DF /* Lottie */,
18D65DFF2EB964B500252335 /* VssRustClientFfi */,
182817C02F59A7F10055A441 /* Paykit */,
);
productName = Bitkit;
productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
Expand Down Expand 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 Down Expand 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 Down Expand 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 Down Expand 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 Down Expand 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 Down Expand 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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 Down Expand 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 Down Expand 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