Skip to content
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

Jump to bottom

ui: color from orange to primary #225

Merged
merged 1 commit into from
Oct 5, 2024
Merged

ui: color from orange to primary #225

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
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/Assets.xcassets/AccentColor.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"color" : {
"platform" : "universal",
"reference" : "systemOrangeColor"
"reference" : "labelColor"
},
"idiom" : "universal"
}
Expand Down
4 changes: 2 additions & 2 deletions BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ struct TransactionDetailView: View {
} label: {
Image(systemName: "safari")
.fontWeight(.semibold)
.foregroundStyle(Color.bitcoinOrange)
.foregroundStyle(.primary)
}
Spacer()
}
Expand All @@ -142,7 +142,7 @@ struct TransactionDetailView: View {
}
}
.fontWeight(.semibold)
.foregroundStyle(Color.bitcoinOrange)
.foregroundStyle(.primary)
}
}
.fontDesign(.monospaced)
Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/View/OnboardingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ struct OnboardingView: View {
}
.buttonStyle(
BitcoinFilled(
tintColor: .bitcoinOrange,
tintColor: .primary,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/View/Receive/ReceiveView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct ReceiveView: View {
}
}
.fontWeight(.semibold)
.foregroundStyle(Color.bitcoinOrange)
.foregroundStyle(.primary)
}
}
.padding()
Expand Down
8 changes: 7 additions & 1 deletion BDKSwiftExampleWallet/View/Send/AmountView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,13 @@ struct AmountView: View {
)
.labelStyle(.iconOnly)
}
.buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))
.buttonStyle(
BitcoinOutlined(
width: 100,
tintColor: .primary,
isCapsule: true
)
)

}

Expand Down
7 changes: 4 additions & 3 deletions BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ struct BuildTransactionView: View {
.buttonStyle(
isSent
? BitcoinFilled(
tintColor: .bitcoinRed,
tintColor: .secondary,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
: BitcoinFilled(
tintColor: .bitcoinOrange,
tintColor: .primary,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
Expand Down Expand Up @@ -188,10 +188,11 @@ struct BuildTransactionView: View {
systemName: showCheckmark
? "checkmark" : "doc.on.doc"
)
.foregroundStyle(.primary)
}
}
.fontWeight(.semibold)
.foregroundStyle(Color.bitcoinOrange)
.foregroundStyle(.primary)
}
}
.fontDesign(.monospaced)
Expand Down
8 changes: 7 additions & 1 deletion BDKSwiftExampleWallet/View/Send/FeeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,13 @@ struct FeeView: View {
)
.labelStyle(.iconOnly)
}
.buttonStyle(BitcoinOutlined(width: 100, isCapsule: true))
.buttonStyle(
BitcoinOutlined(
width: 100,
tintColor: .primary,
isCapsule: true
)
)

}
.padding()
Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/View/Settings/SeedView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ struct SeedView: View {
BitcoinFilled(
width: 120,
height: 40,
tintColor: .bitcoinOrange,
tintColor: .primary,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
Expand Down
Loading