codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extracted TanProcedurePicker

This commit is contained in:
dankito 2020-08-06 23:33:44 +02:00
parent 087e596171
commit c1bd70085a
2 changed files with 71 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ui/BankingiOSApp/BankingiOSApp/ui/TanProcedurePicker.swift Normal file
View File

@ -0,0 +1,69 @@
import SwiftUI
import BankingUiSwift
struct TanProcedurePicker: View {
private let bank: Customer
private let selectedTanProcedureChanged: (TanProcedure) -> Void
private var customersTanProcedures: [TanProcedure] = []
@State private var selectedTanProcedureIndex: Int
private var selectedTanProcedureIndexBinding: Binding<Int> {
Binding<Int>(
get: { self.selectedTanProcedureIndex },
set: {
if (self.selectedTanProcedureIndex != $0) { // only if TAN procedure has really changed
self.selectedTanProcedureIndex = $0
self.dispatchSelectedTanProcedureChanged(self.customersTanProcedures[$0])
}
})
}
init(_ bank: Customer, _ initiallySelectedTanProcedure: TanProcedure? = nil, selectedTanProcedureChanged: @escaping (TanProcedure) -> Void) {
self.bank = bank
self.selectedTanProcedureChanged = selectedTanProcedureChanged
self.customersTanProcedures = bank.supportedTanProcedures.filter( {$0.type != .chiptanusb } ) // USB tan generators are not supported on iOS
let selectedTanProcedureType = initiallySelectedTanProcedure?.type ?? bank.selectedTanProcedure?.type
_selectedTanProcedureIndex = State(initialValue: customersTanProcedures.firstIndex(where: { $0.type == selectedTanProcedureType } )
?? bank.supportedTanProcedures.firstIndex(where: { $0.type != .chiptanmanuell && $0.type != .chiptanusb } )
?? 0)
}
var body: some View {
Picker("TAN procedure", selection: selectedTanProcedureIndexBinding) {
ForEach(0 ..< self.customersTanProcedures.count) { index in
Text(self.customersTanProcedures[index].displayName)
}
}
}
private func dispatchSelectedTanProcedureChanged(_ selectedTanProcedure: TanProcedure) {
// do async as at this point Picker dialog gets dismissed -> this EnterTanDialog would never get dismissed (and dismiss has to be called before callback.changeTanProcedure())
DispatchQueue.main.async {
self.selectedTanProcedureChanged(selectedTanProcedure)
}
}
}
struct TanProcedurePicker_Previews: PreviewProvider {
static var previews: some View {
TanProcedurePicker(previewBanks[0]) { _ in }
}
}

27
ui/BankingiOSApp/BankingiOSApp/ui/views/EnterTanDialog.swift
View File

@ -13,21 +13,6 @@ struct EnterTanDialog: View {
private var customer: Customer
private var customersTanProcedures: [TanProcedure] = []
@State private var selectedTanProcedureIndex: Int
private var selectedTanProcedureIndexBinding: Binding<Int> {
Binding<Int>(
get: { self.selectedTanProcedureIndex },
set: {
if (self.selectedTanProcedureIndex != $0) { // only if TAN procedure has really changed
self.selectedTanProcedureIndex = $0
self.selectedTanProcedureChanged(self.customersTanProcedures[$0])
}
})
}
private var customersTanMedia: [TanMedium] = []
@State private var selectedTanMediumIndex = 0
@ -65,12 +50,6 @@ struct EnterTanDialog: View {
self.tanChallenge = state.tanChallenge
self.customer = state.customer
self.customersTanProcedures = customer.supportedTanProcedures.filter( {$0.type != .chiptanusb } ) // USB tan generators are not supported on iOS
_selectedTanProcedureIndex = State(initialValue: customersTanProcedures.firstIndex(where: { $0.type == state.tanChallenge.tanProcedure.type } )
?? state.customer.supportedTanProcedures.firstIndex(where: { $0.type != .chiptanmanuell && $0.type != .chiptanusb } )
?? 0)
self.customersTanMedia = customer.tanMediaSorted
self.showSelectTanMediumView = self.customersTanMedia.count > 1 // TODO: use isOpticalTanProcedure && tanMedia.count > 1
@ -90,10 +69,8 @@ struct EnterTanDialog: View {
var body: some View {
Form {
Section {
Picker("TAN procedure", selection: selectedTanProcedureIndexBinding) {
ForEach(0 ..< self.customersTanProcedures.count) { index in
Text(self.customersTanProcedures[index].displayName)
}
TanProcedurePicker(customer, state.tanChallenge.tanProcedure) { selectedTanProcedure in
self.selectedTanProcedureChanged(selectedTanProcedure)
}
if showSelectTanMediumView {