Mercurial > public > simoleon
diff Simoleon/Conversion.swift @ 27:d95582268b44
Fix bug CoreData and minor UI changes
author | Dennis Concepción Martín <dennisconcepcionmartin@gmail.com> |
---|---|
date | Wed, 21 Jul 2021 12:36:10 +0100 |
parents | 933d9ab04374 |
children | 4f862c618b44 |
line wrap: on
line diff
--- a/Simoleon/Conversion.swift Tue Jul 20 12:23:37 2021 +0100 +++ b/Simoleon/Conversion.swift Wed Jul 21 12:36:10 2021 +0100 @@ -18,7 +18,7 @@ @State private var isEditing = false @Environment(\.managedObjectContext) private var viewContext - @FetchRequest(sortDescriptors: []) private var userSettings: FetchedResults<UserSettings> + @FetchRequest(sortDescriptors: []) private var defaultCurrency: FetchedResults<DefaultCurrency> let currencyMetadata: [String: CurrencyMetadataModel] = parseJson("CurrencyMetadata.json") var body: some View { @@ -26,9 +26,9 @@ VStack(alignment: .leading) { HStack { Button(action: { showingCurrencySelector = true }) { - RoundedRectangle(cornerRadius: 25) + RoundedRectangle(cornerRadius: 15) .foregroundColor(Color(.secondarySystemBackground)) - .frame(height: 65) + .frame(height: 60) .overlay(CurrencyRow(currencyPair: currencyPair).padding(.horizontal)) } @@ -96,8 +96,8 @@ 2) Change State var currencyPair */ private func fetchingUserSettings() { - if let userSettings = userSettings.first { - self.currencyPair = userSettings.defaultCurrency ?? "USD/GBP" + if let defaultCurrency = defaultCurrency.first { + self.currencyPair = defaultCurrency.pair ?? "USD/GBP" } } }