starred/SwiftUI
1
0
Fork 0
mirror of https://github.com/ivanvorobei/SwiftUI.git synced 2026-04-01 15:03:21 +02:00
Code Issues 8 Packages Projects Releases Wiki Activity

Xcode 11 beta 6

Browse Source
This commit is contained in:
John Holdsworth
2019-08-20 18:54:37 +02:00
parent a36ff1b7ca
commit 7de7e1e47b
40 changed files with 114 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Other Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift
View File

@@ -34,7 +34,7 @@ struct ConverterView : View {
var body: some View {
let inset = EdgeInsets(top: -8, leading: -20, bottom: -7, trailing: 5)
let doubleValue: Double = Double(self.$baseAmount.value) ?? 1.0
let doubleValue: Double = Double(self.$baseAmount.wrappedValue) ?? 1.0
return ZStack(alignment: Alignment.bottomTrailing) {
NavigationView {
@@ -56,7 +56,7 @@ struct ConverterView : View {
.background(
RoundedRectangle(cornerRadius: 5)
.fill(Color.clear)
.border(Color(red: 0.7, green: 0.7, blue: 0.7), width: 1 / UIScreen.main.scale, cornerRadius: 5)
.background(RoundedRectangle(cornerRadius: 5).strokeBorder(Color(red: 0.7, green: 0.7, blue: 0.7), lineWidth: 1 / UIScreen.main.scale))
.padding(inset)
)
}.background(Color.blue).cornerRadius(5)
@@ -64,7 +64,7 @@ struct ConverterView : View {
List {
// TODO: should filter out BaseCurrency from list
ForEach(userData.userCurrency) { currency in
CurrencyItemView(currency: currency, baseAmount: doubleValue, isEditing: self.$isEditing).tapAction {
CurrencyItemView(currency: currency, baseAmount: doubleValue, isEditing: self.$isEditing).onTapGesture {
// Swap this and base
self.userData.baseCurrency = currency
}
@@ -89,7 +89,7 @@ struct ConverterView : View {
.background(
RoundedRectangle(cornerRadius: 23)
.fill(Color.blue)
.border(Color(red: 0.7, green: 0.7, blue: 0.7), width: 1 / UIScreen.main.scale, cornerRadius: 23))
.background(RoundedRectangle(cornerRadius: 23).strokeBorder(Color(red: 0.7, green: 0.7, blue: 0.7), lineWidth: 1 / UIScreen.main.scale)))
.foregroundColor(.white).font(.largeTitle)
}.padding()
}

2
Other Projects/Currency-SwiftUI/Currency-SwiftUI/CurrencyItemView.swift
View File

@@ -42,7 +42,7 @@ struct CurrencyItemView: View {
HStack(alignment: .center){
Image(systemName: "minus.circle")
.foregroundColor(.red)
.tapAction(count: 1) {
.onTapGesture(count: 1) {
self.delete()
}

10
Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift
View File

@@ -51,27 +51,27 @@ struct UserDefaultValue<Value: Codable> {
}
}
final class UserData: BindableObject {
let willChange = PassthroughSubject<UserData, Never>()
final class UserData: ObservableObject {
let objectWillChange = PassthroughSubject<UserData, Never>()
@UserDefaultValue(key: "allCurrencies", defaultValue: defaultCurrencies)
var allCurrencies: [Currency] {
didSet {
willChange.send(self)
objectWillChange.send(self)
}
}
@UserDefaultValue(key: "baseCurrency", defaultValue: defaultCurrencies[0])
var baseCurrency: Currency {
didSet {
willChange.send(self)
objectWillChange.send(self)
}
}
@UserDefaultValue(key: "userCurrency", defaultValue: defaultCurrencies)
var userCurrency: [Currency] {
didSet {
willChange.send(self)
objectWillChange.send(self)
}
}
}