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

ui: buildtransactionview layout #216

Merged
merged 1 commit into from
Sep 28, 2024
Merged

ui: buildtransactionview layout #216

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
1 change: 1 addition & 0 deletions BDKSwiftExampleWallet/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,7 @@
}
},
"To" : {
"extractionState" : "stale",
"localizations" : {
"fr" : {
"stringUnit" : {
Expand Down
292 changes: 168 additions & 124 deletions BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SwiftUI
struct BuildTransactionView: View {
@Bindable var viewModel: BuildTransactionViewModel
@Binding var navigationPath: NavigationPath
@Environment(\.colorScheme) var colorScheme
@State private var isCopied = false
@State var isError: Bool = false
@State var isSent: Bool = false
Expand All @@ -29,159 +30,202 @@ struct BuildTransactionView: View {

Spacer()

VStack {
HStack {
Text("To")
Spacer()
Text(
address.count > 10
? "\(address.prefix(6))...\(address.suffix(4))" : address
)
.lineLimit(1)
.truncationMode(.middle)
}
HStack {
Text("Send")
Spacer()
Text(amount.formattedWithSeparator)
}
HStack {
Text("Fee")
Spacer()
if let fee = viewModel.calculateFee {
Text(fee.formattedWithSeparator)
} else {
Text("...")
}
}
HStack {
Text("Total")
Spacer()
VStack(spacing: 20) {

Spacer()

VStack(spacing: 40) {

if let sentAmount = UInt64(amount),
let feeAmountString = viewModel.calculateFee,
let feeAmount = UInt64(feeAmountString)
{
let total = sentAmount + feeAmount
Text(String(total).formattedWithSeparator)
let totalFormatted = String(total).formattedWithSeparator
Text("\(totalFormatted) sats")
.font(.largeTitle)
.fontWeight(.bold)
.fontDesign(.rounded)
.foregroundColor(.primary)
} else {
Text("...")
}
}
}
.font(.caption)
.fontWeight(.light)
.foregroundColor(.secondary)
.padding()

Spacer()
VStack(spacing: 0) {
HStack {
Text("Send")
Spacer()
Text(amount.formattedWithSeparator)
}
.padding(.bottom, 8)

if !isSent {
Button {
if let amt = UInt64(amount) {
viewModel.buildTransactionViewError = nil
viewModel.send(
address: address,
amount: amt,
feeRate: UInt64(fee)
)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
if self.viewModel.buildTransactionViewError == nil {
self.isSent = true
DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
self.navigationPath.removeLast(self.navigationPath.count)
}
Divider()
.background(Color(uiColor: .systemGray6))

HStack {
Text("Fee")
Spacer()
if let fee = viewModel.calculateFee {
Text(fee.formattedWithSeparator)
} else {
self.isSent = false
self.isError = true
Text("...")
}
}
} else {
self.isError = true
.padding(.vertical, 8)

Divider()
.background(Color(uiColor: .systemGray6))

HStack {
Text("Total")
Spacer()
if let sentAmount = UInt64(amount),
let feeAmountString = viewModel.calculateFee,
let feeAmount = UInt64(feeAmountString)
{
let total = sentAmount + feeAmount
Text(String(total).formattedWithSeparator)
} else {
Text("...")
}
}
.padding(.top, 8)
.fontWeight(.semibold)
}
} label: {
Text("Send")
.bold()
.frame(maxWidth: .infinity)
.padding(.all, 8)
.padding()
.background(
Color(uiColor: .secondarySystemBackground)
.opacity(colorScheme == .dark ? 0.5 : 0.2)
)
.cornerRadius(10)
.overlay(
RoundedRectangle(cornerRadius: 10)
.stroke(Color(uiColor: .systemGray6), lineWidth: 1)
)

AddressFormattedView(
address: address,
columns: 4,
spacing: 20.0,
gridItemSize: 60.0
)

}
.buttonStyle(
isSent
? BitcoinFilled(
tintColor: .bitcoinRed,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
: BitcoinFilled(
tintColor: .bitcoinOrange,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)

)
.padding()
.accessibilityLabel("Send Transaction")

} else if isSent && viewModel.buildTransactionViewError == nil {
VStack {
Image(systemName: "checkmark")
.foregroundColor(.green)
if let transaction = viewModel.extractTransaction() {
HStack {
Text(transaction.computeTxid())
.lineLimit(1)
.truncationMode(.middle)
Spacer()
Button {
UIPasteboard.general.string = transaction.computeTxid()
isCopied = true
showCheckmark = true
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
isCopied = false
showCheckmark = false
}
} label: {
HStack {
withAnimation {
Image(
systemName: showCheckmark
? "checkmark" : "doc.on.doc"
Spacer()

if !isSent {
Button {
if let amt = UInt64(amount) {
viewModel.buildTransactionViewError = nil
viewModel.send(
address: address,
amount: amt,
feeRate: UInt64(fee)
)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
if self.viewModel.buildTransactionViewError == nil {
self.isSent = true
DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
self.navigationPath.removeLast(
self.navigationPath.count
)
}
} else {
self.isSent = false
self.isError = true
}
.fontWeight(.semibold)
.foregroundColor(.bitcoinOrange)
}
} else {
self.isError = true
}
.fontDesign(.monospaced)
.font(.caption)
.padding()
} label: {
Text("Send")
.bold()
.frame(maxWidth: .infinity)
.padding(.all, 8)
}
.buttonStyle(
isSent
? BitcoinFilled(
tintColor: .bitcoinRed,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)
: BitcoinFilled(
tintColor: .bitcoinOrange,
textColor: Color(uiColor: .systemBackground),
isCapsule: true
)

)
.padding()
.accessibilityLabel("Send Transaction")

} else if isSent && viewModel.buildTransactionViewError == nil {
VStack {
Image(systemName: "checkmark")
.foregroundColor(.green)
if let transaction = viewModel.extractTransaction() {
HStack {
Text(transaction.computeTxid())
.lineLimit(1)
.truncationMode(.middle)
Spacer()
Button {
UIPasteboard.general.string = transaction.computeTxid()
isCopied = true
showCheckmark = true
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
isCopied = false
showCheckmark = false
}
} label: {
HStack {
withAnimation {
Image(
systemName: showCheckmark
? "checkmark" : "doc.on.doc"
)
}
}
.fontWeight(.semibold)
.foregroundColor(.bitcoinOrange)
}
}
.fontDesign(.monospaced)
.font(.caption)
.padding()
}

}
}
}
}

}
.padding()
.navigationTitle("Transaction")
.onAppear {
viewModel.buildTransaction(
address: address,
amount: UInt64(amount) ?? 0,
feeRate: UInt64(fee)
)
if let tx = viewModel.extractTransaction() {
viewModel.getCalulateFee(tx: tx)
}
}
.alert(isPresented: $viewModel.showingBuildTransactionViewErrorAlert) {
Alert(
title: Text("Build Transaction Error"),
message: Text(viewModel.buildTransactionViewError?.description ?? "Unknown"),
dismissButton: .default(Text("OK")) {
viewModel.buildTransactionViewError = nil
.padding()
.navigationTitle("Transaction")
.onAppear {
viewModel.buildTransaction(
address: address,
amount: UInt64(amount) ?? 0,
feeRate: UInt64(fee)
)
if let tx = viewModel.extractTransaction() {
viewModel.getCalulateFee(tx: tx)
}
)
}
.alert(isPresented: $viewModel.showingBuildTransactionViewErrorAlert) {
Alert(
title: Text("Build Transaction Error"),
message: Text(viewModel.buildTransactionViewError?.description ?? "Unknown"),
dismissButton: .default(Text("OK")) {
viewModel.buildTransactionViewError = nil
}
)
}

}

}
Expand Down
Loading