Skip to content

spm: bitcoinui main #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2024
Merged

spm: bitcoinui main #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions BDKSwiftExampleWallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
AE34DDAE2B6B320F00F04AD4 /* SeedViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE34DDAD2B6B320F00F04AD4 /* SeedViewModel.swift */; };
AE3646262BEDB01200B04E25 /* FileManager+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE3646252BEDB01200B04E25 /* FileManager+Extensions.swift */; };
AE3902A42A3B4CD900BEC318 /* TabHomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE3902A32A3B4CD900BEC318 /* TabHomeView.swift */; };
AE40754F2C1C950D001CBF94 /* SeedPhraseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE40754E2C1C950D001CBF94 /* SeedPhraseView.swift */; };
AE49847C2A1BBBD6009951E2 /* BDKSwiftExampleWalletApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE49847B2A1BBBD6009951E2 /* BDKSwiftExampleWalletApp.swift */; };
AE4984802A1BBBD7009951E2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AE49847F2A1BBBD7009951E2 /* Assets.xcassets */; };
AE4984832A1BBBD7009951E2 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AE4984822A1BBBD7009951E2 /* Preview Assets.xcassets */; };
Expand Down Expand Up @@ -119,7 +118,6 @@
AE34DDAD2B6B320F00F04AD4 /* SeedViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedViewModel.swift; sourceTree = "<group>"; };
AE3646252BEDB01200B04E25 /* FileManager+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extensions.swift"; sourceTree = "<group>"; };
AE3902A32A3B4CD900BEC318 /* TabHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabHomeView.swift; sourceTree = "<group>"; };
AE40754E2C1C950D001CBF94 /* SeedPhraseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedPhraseView.swift; sourceTree = "<group>"; };
AE4984782A1BBBD6009951E2 /* BDKSwiftExampleWallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BDKSwiftExampleWallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
AE49847B2A1BBBD6009951E2 /* BDKSwiftExampleWalletApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BDKSwiftExampleWalletApp.swift; sourceTree = "<group>"; };
AE49847F2A1BBBD7009951E2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -247,7 +245,6 @@
AE783A002AB4E5E1005F0CBA /* BuildTransactionView.swift */,
AE2ADD732B61E8F500C2A823 /* SettingsView.swift */,
AE34DDAB2B6B31ED00F04AD4 /* SeedView.swift */,
AE40754E2C1C950D001CBF94 /* SeedPhraseView.swift */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -559,7 +556,6 @@
AE0C30F72A804A2D008F1EAE /* WalletTransactionListView.swift in Sources */,
AE29ED152BBE36C500EB9C4F /* WalletTransactionsListViewModel.swift in Sources */,
AEB905C32A7EEBF000CD0337 /* BackupInfo.swift in Sources */,
AE40754F2C1C950D001CBF94 /* SeedPhraseView.swift in Sources */,
AE783A072AB4F7C7005F0CBA /* FeeView.swift in Sources */,
AE2B8C1D2A9678C900815B2F /* FeeService.swift in Sources */,
AEC2CF5A2ABFBA19008065E4 /* BuildTransactionViewModel.swift in Sources */,
Expand Down Expand Up @@ -929,8 +925,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/reez/BitcoinUI.git";
requirement = {
kind = exactVersion;
version = 1.0.3;
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
5 changes: 1 addition & 4 deletions BDKSwiftExampleWallet/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@
},
"%@ sats fee" : {

},
"%lld" : {

},
"%lld %@" : {
"localizations" : {
Expand Down Expand Up @@ -138,7 +135,7 @@
}
}
},
"A bitcoin wallet powered by Bitcoin Dev Kit" : {
"A bitcoin wallet powered by Bitcoin Dev Kit." : {

},
"A simple bitcoin wallet." : {
Expand Down
100 changes: 0 additions & 100 deletions BDKSwiftExampleWallet/View/SeedPhraseView.swift
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions BDKSwiftExampleWallet/View/SeedView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by Matthew Ramsden on 1/31/24.
//

import BitcoinUI
import SwiftUI

struct SeedView: View {
Expand All @@ -17,10 +18,13 @@ struct SeedView: View {
Color(uiColor: .systemBackground)
.ignoresSafeArea()

VStack(alignment: .leading) {
VStack {
if let seed = viewModel.seed {

SeedPhraseView(words: seed.mnemonic.components(separatedBy: " "))
SeedPhraseView(
words: seed.mnemonic.components(separatedBy: " "),
preferredWordsPerRow: 3
)

HStack {
Spacer()
Expand Down
Loading