Skip to content

Commit 6c7fb3f

Browse files
reezreez
authored
ui: colors
1 parent 3031dd1 commit 6c7fb3f

File tree

4 files changed

+80
-54
lines changed

4 files changed

+80
-54
lines changed

‎BDKSwiftExampleWallet/Resources/Localizable.xcstrings

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
}
7171
}
7272
}
73+
},
74+
"(Optional) Import 12 Word Seed Phrase" : {
75+
7376
},
7477
"/" : {
7578
"localizations" : {
@@ -180,6 +183,7 @@
180183
}
181184
},
182185
"12 Word Seed Phrase (Optional)" : {
186+
"extractionState" : "stale",
183187
"localizations" : {
184188
"fr" : {
185189
"stringUnit" : {
@@ -190,6 +194,7 @@
190194
}
191195
},
192196
"A bitcoin wallet powered by Bitcoin Dev Kit" : {
197+
"extractionState" : "stale",
193198
"localizations" : {
194199
"fr" : {
195200
"stringUnit" : {
@@ -240,6 +245,7 @@
240245
}
241246
},
242247
"BDK Wallet" : {
248+
"extractionState" : "stale",
243249
"localizations" : {
244250
"fr" : {
245251
"stringUnit" : {
@@ -509,6 +515,9 @@
509515
}
510516
}
511517
}
518+
},
519+
"powered by Bitcoin Dev Kit" : {
520+
512521
},
513522
"Receive" : {
514523
"localizations" : {

‎BDKSwiftExampleWallet/View/OnboardingView.swift

Lines changed: 61 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,65 +25,70 @@ struct OnboardingView: View {
2525
Spacer()
2626

2727
VStack(spacing: 25) {
28-
Image(systemName: "bitcoinsign.circle.fill")
28+
Image(systemName: "bitcoinsign.circle")
2929
.resizable()
30-
.foregroundColor(.bitcoinOrange)
30+
.foregroundStyle(
31+
.secondary
32+
)
3133
.frame(width: 100, height: 100, alignment: .center)
32-
Text("BDK Wallet")
33-
.textStyle(BitcoinTitle1())
34-
.multilineTextAlignment(.center)
35-
.padding(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 12))
36-
Text("A bitcoin wallet powered by Bitcoin Dev Kit")
37-
.textStyle(BitcoinBody5())
34+
Text("powered by Bitcoin Dev Kit")
35+
.foregroundStyle(
36+
LinearGradient(
37+
gradient: Gradient(
38+
colors: [
39+
.secondary,
40+
.primary,
41+
]
42+
),
43+
startPoint: .topLeading,
44+
endPoint: .bottomTrailing
45+
)
46+
)
3847
.fontWidth(.expanded)
39-
.foregroundColor(.secondary)
48+
.fontWeight(.medium)
4049
.multilineTextAlignment(.center)
50+
.padding()
4151
}
4252

43-
VStack {
44-
45-
VStack {
46-
Picker(
47-
"Network",
48-
selection: $viewModel.selectedNetwork
49-
) {
50-
Text("Signet").tag(Network.signet)
51-
Text("Testnet").tag(Network.testnet)
52-
Text("Regtest").tag(Network.regtest)
53-
}
54-
.pickerStyle(.automatic)
55-
.tint(viewModel.buttonColor)
56-
57-
Picker(
58-
"Esplora Server",
59-
selection: $viewModel.selectedURL
60-
) {
61-
ForEach(viewModel.availableURLs, id: \.self) { url in
62-
Text(
63-
url.replacingOccurrences(
64-
of: "https://",
65-
with: ""
66-
).replacingOccurrences(
67-
of: "http://",
68-
with: ""
69-
)
70-
)
71-
.tag(url)
72-
}
73-
}
74-
.pickerStyle(.automatic)
75-
.tint(viewModel.buttonColor)
76-
53+
Picker(
54+
"Network",
55+
selection: $viewModel.selectedNetwork
56+
) {
57+
Text("Signet").tag(Network.signet)
58+
Text("Testnet").tag(Network.testnet)
59+
Text("Regtest").tag(Network.regtest)
60+
}
61+
.pickerStyle(.automatic)
62+
.tint(.primary)
63+
64+
Picker(
65+
"Esplora Server",
66+
selection: $viewModel.selectedURL
67+
) {
68+
ForEach(viewModel.availableURLs, id: \.self) { url in
69+
Text(
70+
url.replacingOccurrences(
71+
of: "https://",
72+
with: ""
73+
).replacingOccurrences(
74+
of: "http://",
75+
with: ""
76+
)
77+
)
78+
.tag(url)
7779
}
78-
7980
}
80-
.padding()
81+
.pickerStyle(.automatic)
82+
.tint(.primary)
8183

8284
VStack {
83-
TextField("12 Word Seed Phrase (Optional)", text: $viewModel.words)
84-
.submitLabel(.done)
85-
.textFieldStyle(RoundedBorderTextFieldStyle())
86-
.padding(.horizontal, 40)
85+
TextField(
86+
"(Optional) Import 12 Word Seed Phrase",
87+
text: $viewModel.words
88+
)
89+
.submitLabel(.done)
90+
.textFieldStyle(RoundedBorderTextFieldStyle())
91+
.padding(.horizontal, 40)
8792
if viewModel.wordArray != [] {
8893
SeedPhraseView(
8994
words: viewModel.wordArray,
@@ -92,6 +97,7 @@ struct OnboardingView: View {
9297
wordsPerPage: 4
9398
)
9499
.frame(height: 200)
100+
} else {
95101
}
96102
}
97103
.padding(.top, 30)
@@ -101,7 +107,12 @@ struct OnboardingView: View {
101107
Button("Create Wallet") {
102108
viewModel.createWallet()
103109
}
104-
.buttonStyle(BitcoinFilled(tintColor: .bitcoinOrange, isCapsule: true))
110+
.buttonStyle(
111+
BitcoinFilled(
112+
tintColor: .bitcoinOrange,
113+
isCapsule: true
114+
)
115+
)
105116
.padding()
106117

107118
}

‎BDKSwiftExampleWallet/View/Send/FeeView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct FeeView: View {
6969
.tag(3)
7070
}
7171
.pickerStyle(.automatic)
72-
.tint(.bitcoinOrange)
72+
.tint(.primary)
7373
Text("sat/vb")
7474
.foregroundColor(.secondary)
7575
.fontWeight(.thin)

‎BDKSwiftExampleWallet/View/Settings/SeedView.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct SeedView: View {
2323

2424
SeedPhraseView(
2525
words: seed.mnemonic.components(separatedBy: " "),
26-
preferredWordsPerRow: 3,
26+
preferredWordsPerRow: 2,
2727
usePaging: true,
2828
wordsPerPage: 6
2929
)
@@ -45,8 +45,14 @@ struct SeedView: View {
4545
.bold()
4646
}
4747
}
48-
.buttonStyle(.borderedProminent)
49-
.tint(.bitcoinOrange)
48+
.buttonStyle(
49+
BitcoinFilled(
50+
width: 120,
51+
height: 40,
52+
tintColor: .bitcoinOrange,
53+
isCapsule: true
54+
)
55+
)
5056
Spacer()
5157
}
5258
.padding()

0 commit comments

Comments
 (0)