Xcode 11.1 Update

moflo · Oct 13, 2019 · cc06b44 · cc06b44
1 parent a1f94d7
commit cc06b44
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 31 deletions.
diff --git a/SwiftUI-Todo-Redux/states/AppState.swift b/SwiftUI-Todo-Redux/states/AppState.swift
@@ -10,7 +10,7 @@ import Combine
 import Foundation
 import SwiftUI
 
-final class AppState: BindableObject {
+final class AppState: ObservableObject {
     var didChange = PassthroughSubject<AppState, Never>()
 
     var usersState: UsersState

diff --git a/SwiftUI-Todo-Redux/views/HomeView.swift b/SwiftUI-Todo-Redux/views/HomeView.swift
@@ -19,7 +19,7 @@ struct HomeView: View {
 
     var body: some View {
         ZStack(alignment: .bottom) {
-        TabbedView(selection: self.$selectedTab) {
+        TabView(selection: self.$selectedTab) {
             TasksList().tabItem{ VStack { Image("tab_task"); Text("Tasks") } }.tag(Tab.tasks)
             UsersList().tabItem{ VStack { Image("tab_user"); Text("Team") } }.tag(Tab.users)
             }

diff --git a/SwiftUI-Todo-Redux/views/common/FormButtons.swift b/SwiftUI-Todo-Redux/views/common/FormButtons.swift
@@ -20,9 +20,9 @@ struct FieldSetText: View {
         VStack(alignment: .leading) {
             Text(label)
                 .font(.headline)
-            TextField($textItem, placeholder: Text(placeHolder))
+            TextField(placeHolder, text: $textItem)
                 .padding(.all)
-                .background(Color("form-field-background"), cornerRadius: 5.0)
+                .background(Color("form-field-background")) //, cornerRadius: 5.0)
         }
         .padding(.horizontal, 15)
     }
@@ -35,12 +35,13 @@ struct RoundedButton: View {
                 Spacer()
                 Text("Save")
                     .font(.headline)
-                    .color(Color.white)
+                    .foregroundColor(Color.white)
                 Spacer()
             }
         }
         .padding(.vertical, 10.0)
-        .background(Color.green, cornerRadius: 8.0)
+        .background(Color.green)
+        //, cornerRadius: 8.0)
         .padding(.horizontal, 40)
     }
 }
@@ -54,7 +55,7 @@ struct NotificationBadge: View {
 
     var animation: Animation {
         Animation
-            .spring(initialVelocity: 5)
+            .spring(dampingFraction: 0.5)
             .speed(2)
             .delay(0.3)
     }
@@ -69,7 +70,7 @@ struct NotificationBadge: View {
         }
 
         return Text(text)
-            .color(.white)
+            .foregroundColor(.white)
             .padding()
             .background(color)
             .cornerRadius(8)

diff --git a/SwiftUI-Todo-Redux/views/common/KeyboardObserver.swift b/SwiftUI-Todo-Redux/views/common/KeyboardObserver.swift
@@ -11,7 +11,7 @@ import SwiftUI
 
 // Class to respond to keyboard events
 
-final class KeyboardObserver: BindableObject {
+final class KeyboardObserver: ObservableObject {
     let didChange = PassthroughSubject<Void, Never>()
 
     public var rects: [CGRect]
@@ -21,7 +21,7 @@ final class KeyboardObserver: BindableObject {
     // this flag makes sure we only act once per keyboard appearance
     public var keyboardIsHidden = true
 
-    public var slide: Length = 0 {
+    public var slide: CGFloat = 0.0 {
         didSet {
             didChange.send()
         }

diff --git a/SwiftUI-Todo-Redux/views/tasks/TaskDetail.swift b/SwiftUI-Todo-Redux/views/tasks/TaskDetail.swift
@@ -61,9 +61,9 @@ struct TaskDetail: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 20) {
             HStack {
-                if self.mode?.value == .active {
+                if self.mode?.wrappedValue == .active {
                     Button(action: {
-                        self.mode?.animation().value = .inactive
+                        self.mode?.animation().wrappedValue = .inactive
                         // Update current taskID
                         self.task = self.draftTask
                         // store.dispatch(aciton: TaskActions.updateTask(id: task.id, task: draftTask))
@@ -78,7 +78,7 @@ struct TaskDetail: View {
 
                 EditButton()
             }
-            if self.mode?.value == .inactive {
+            if self.mode?.wrappedValue == .inactive {
                 TaskSummary
             } else {
                 TaskEdit

diff --git a/SwiftUI-Todo-Redux/views/tasks/TasksList.swift b/SwiftUI-Todo-Redux/views/tasks/TasksList.swift
@@ -27,9 +27,9 @@ struct TasksList: View {
         }
     }
 
-    var taskCreateModal: Modal {
-        return Modal(TaskCreate(isEditing: $showEdit).environmentObject(store))
-    }
+//    var taskCreateModal: Modal {
+//        return Modal(TaskCreate(isEditing: $showEdit).environmentObject(store))
+//    }
 
     var body: some View {
         NavigationView {
@@ -51,7 +51,9 @@ struct TasksList: View {
                                         label: { Text("Add2") }
                                     )
             })
-            .presentation(self.showEdit ? self.taskCreateModal : nil)
+            .sheet(isPresented: $showEdit) {
+                TaskCreate(isEditing: self.$showEdit).environmentObject(self.store)
+            }
             .onAppear {
                 self.loadPage()
             }

diff --git a/SwiftUI-Todo-Redux/views/tasks/TasksRow.swift b/SwiftUI-Todo-Redux/views/tasks/TasksRow.swift
@@ -16,18 +16,20 @@ struct TasksRow: View {
         HStack {
             if task.isDone {
                 Image(systemName: "checkmark.circle.fill")
-                    .font(.system(size: 60))
+//                    .font(.largeTitle)
+                    .imageScale(.large)
                     .foregroundColor(.green)
             } else {
                 Image(systemName: "checkmark.circle")
-                    .font(.system(size: 60))
+//                    .font(.largeTitle)
+                    .imageScale(.large)
                     .foregroundColor(.gray)
             }
-            VStack(alignment: .leading, spacing: 8) {
+            VStack(alignment: .leading, spacing: CGFloat(8.0)) {
                 Text(task.title).font(.title)
                 Text(task.id)
-                    .color(.secondary)
-            }.padding(.leading, 8)
+                    .foregroundColor(.secondary)
+            }.padding(.leading, CGFloat(8.0))
         }.padding(8)
     }
 }

diff --git a/SwiftUI-Todo-Redux/views/users/UserDetail.swift b/SwiftUI-Todo-Redux/views/users/UserDetail.swift
@@ -49,9 +49,9 @@ struct UserDetail: View {
     var body: some View {
         VStack(alignment: .leading) {
             HStack {
-                if self.mode?.value == .active {
+                if self.mode?.wrappedValue == .active {
                     Button(action: {
-                        self.mode?.animation().value = .inactive
+                        self.mode?.animation().wrappedValue = .inactive
                         // Update current userID
                         self.user = self.draftUser
                         // store.dispatch(aciton: UserActions.updateUser(id: user.id, user: draftUser))
@@ -66,7 +66,7 @@ struct UserDetail: View {
 
                 EditButton()
             }
-            if self.mode?.value == .inactive {
+            if self.mode?.wrappedValue == .inactive {
                 UserSummary
             } else {
                 UserEdit

diff --git a/SwiftUI-Todo-Redux/views/users/UsersList.swift b/SwiftUI-Todo-Redux/views/users/UsersList.swift
@@ -27,9 +27,9 @@ struct UsersList: View {
         }
     }
 
-    var taskCreateModal: Modal {
-        return Modal(UserCreate(isEditing: $showEdit).environmentObject(store))
-    }
+//    var taskCreateModal: Modal {
+//        return Modal(UserCreate(isEditing: $showEdit).environmentObject(store))
+//    }
 
     var body: some View {
         NavigationView {
@@ -47,7 +47,9 @@ struct UsersList: View {
                                 HStack {
                                     Button(action: { self.showEdit.toggle() }, label: { Text("Add") })
             })
-            .presentation(self.showEdit ? self.taskCreateModal : nil)
+            .sheet(isPresented: $showEdit) {
+                UserCreate(isEditing: self.$showEdit).environmentObject(self.store)
+            }
             .onAppear {
                 self.loadPage()
             }

diff --git a/SwiftUI-Todo-Redux/views/users/UsersRow.swift b/SwiftUI-Todo-Redux/views/users/UsersRow.swift
@@ -14,10 +14,10 @@ struct UsersRow: View {
 
     var body: some View {
         HStack {
-            VStack(alignment: .leading, spacing: 8) {
+            VStack(alignment: .leading, spacing: CGFloat(8.0)) {
                 Text(user.name).font(.title)
                 Text(user.username)
-                    .color(.secondary)
+                    .foregroundColor(.secondary)
             }.padding(.leading, 8)
         }.padding(8)
     }