comparison Simoleon/Helpers/CurrencySelector.swift @ 106:599fe95307f6

Fixes minor bugs
author Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
date Wed, 04 Aug 2021 21:33:52 +0100
parents 529feb1fc8d5
children 587924519d3b
comparison
equal deleted inserted replaced
105:5c7b675ede8f 106:599fe95307f6
38 var body: some View { 38 var body: some View {
39 NavigationView { 39 NavigationView {
40 VStack { 40 VStack {
41 SearchBar(placeholder: "Search...", text: $searchCurrency) 41 SearchBar(placeholder: "Search...", text: $searchCurrency)
42 .padding() 42 .padding()
43 .accessibilityIdentifier("SearchBar")
44 43
45 if entitlementIsActive { 44 List {
46 List(searchResults, id: \.self) { currencyPair in 45 if entitlementIsActive {
47 Button(action: { 46 ForEach(searchResults, id: \.self) { currencyPair in
48 self.currencyPair = currencyPair.name 47 Button(action: {
49 showingCurrencySelector = false 48 self.currencyPair = currencyPair.name
50 }) { 49 showingCurrencySelector = false
51 CurrencyRow(currencyPairName: currencyPair.name) 50 }) {
51 CurrencyRow(currencyPairName: currencyPair.name)
52 }
53 .accessibility(identifier: "CurrencyRow")
52 } 54 }
53 .accessibilityIdentifier("CurrencyRow") 55 } else {
54 } 56 ForEach(searchResults, id: \.self) { currencyPair in
55 .listStyle() 57 Button(action: { select(currencyPair) }) {
56 } else { 58 CurrencyRow(currencyPairName: currencyPair.name, isLocked: currencyPair.isLocked)
57 List(searchResults, id: \.self) { currencyPair in 59 }
58 Button(action: { select(currencyPair) }) {
59 CurrencyRow(currencyPairName: currencyPair.name, isLocked: currencyPair.isLocked)
60 } 60 }
61 } 61 }
62 .listStyle()
63 } 62 }
63 .id(UUID())
64 } 64 }
65 .navigationTitle("Currencies") 65 .navigationTitle("Currencies")
66 .navigationBarTitleDisplayMode(.inline) 66 .navigationBarTitleDisplayMode(.inline)
67 .toolbar { 67 .toolbar {
68 ToolbarItem(placement: .cancellationAction) { 68 ToolbarItem(placement: .cancellationAction) {
128 currencyPair: .constant("USD/GBP"), 128 currencyPair: .constant("USD/GBP"),
129 showingCurrencySelector: .constant(false) 129 showingCurrencySelector: .constant(false)
130 ) 130 )
131 } 131 }
132 } 132 }
133
134
135
136 //if entitlementIsActive {
137 // List(searchResults, id: \.self) { currencyPair in
138 // Button(action: {
139 // self.currencyPair = currencyPair.name
140 // showingCurrencySelector = false
141 // }) {
142 // CurrencyRow(currencyPairName: currencyPair.name)
143 // }
144 // }
145 // .listStyle()
146 // } else {
147 // List(searchResults, id: \.self) { currencyPair in
148 // Button(action: { select(currencyPair) }) {
149 // CurrencyRow(currencyPairName: currencyPair.name, isLocked: currencyPair.isLocked)
150 // }
151 // }
152 // .listStyle()
153 // }