view/refactor: remove redundant view structs

This commit is contained in:
William Casarin
2023-06-22 10:18:48 +02:00
parent 797762e7d2
commit 455f1f7e1f

View File

@@ -244,26 +244,43 @@ struct CustomizeZapView: View {
} }
var body: some View { var body: some View {
MainContent VStack(alignment: .center, spacing: 20) {
.sheet(isPresented: $show_zap_types) { ZapTypeButton()
if #available(iOS 16.0, *) { .padding(.top, 50)
ZapPicker
.presentationDetents([.medium]) Spacer()
.presentationDragIndicator(.visible)
} else { CustomZapTextField
ZapPicker
} AmountPicker
}
.sheet(isPresented: $showing_wallet_selector) { ZapReply
SelectWalletView(default_wallet: state.settings.default_wallet, showingSelectWallet: $showing_wallet_selector, our_pubkey: state.pubkey, invoice: invoice)
} ZapButton
.onReceive(handle_notify(.zapping)) { notif in
receive_zap(notif: notif) Spacer()
}
.background(fillColor().edgesIgnoringSafeArea(.all)) Spacer()
.onTapGesture { }
hideKeyboard() .sheet(isPresented: $show_zap_types) {
if #available(iOS 16.0, *) {
ZapPicker
.presentationDetents([.medium])
.presentationDragIndicator(.visible)
} else {
ZapPicker
} }
}
.sheet(isPresented: $showing_wallet_selector) {
SelectWalletView(default_wallet: state.settings.default_wallet, showingSelectWallet: $showing_wallet_selector, our_pubkey: state.pubkey, invoice: invoice)
}
.onReceive(handle_notify(.zapping)) { notif in
receive_zap(notif: notif)
}
.background(fillColor().edgesIgnoringSafeArea(.all))
.onTapGesture {
hideKeyboard()
}
} }
func ZapTypeButton() -> some View { func ZapTypeButton() -> some View {
@@ -292,35 +309,9 @@ struct CustomizeZapView: View {
.cornerRadius(15) .cornerRadius(15)
} }
var CustomZap: some View {
VStack(alignment: .center, spacing: 20) {
ZapTypeButton()
.padding(.top, 50)
Spacer()
CustomZapTextField
AmountPicker
ZapReply
ZapButton
Spacer()
Spacer()
}
}
var ZapPicker: some View { var ZapPicker: some View {
ZapTypePicker(zap_type: $zap_type, settings: state.settings, profiles: state.profiles, pubkey: target.pubkey) ZapTypePicker(zap_type: $zap_type, settings: state.settings, profiles: state.profiles, pubkey: target.pubkey)
} }
var MainContent: some View {
CustomZap
}
} }
extension View { extension View {