Minimum changes for Xcode 11 beta 5

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/TabbarView.swift

@@ -15,9 +15,9 @@ struct TabbarView : View {
     var body: some View {
         TabbedView(selection: $selectedIndex) {
             UsersListView()
-                .tabItemLabel(Text("Users"))
+                .tabItem({ Text("Users") })
             MapView()
-                .tabItemLabel(Text("Map"))
+                .tabItem({ Text("Map") })
         }
     }
 }

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/UserDetailView.swift

@@ -13,15 +13,6 @@ struct UserDetailView : View {
     @EnvironmentObject var state: AppState
     let userId: Int
     
-    var editModal: Modal {
-        let user = state.usersState.users[userId]
-        return Modal(UserEditForm(userId: user.id, saveHandler: { saved in
-            self.state.dispatch(action: UserActions.stopEditUser)
-        }).environmentObject(state)) {
-            self.state.dispatch(action: UserActions.stopEditUser)
-        }
-    }
-    
     var body: some View {
         let user = state.usersState.users[userId]
         return VStack {
@@ -36,7 +27,11 @@ struct UserDetailView : View {
                 }) {
                     Text("Edit user")
                     }
-                    .presentation(self.state.usersState.isEditingUser ? self.editModal : nil))
+                .sheet(isPresented: $state.usersState.isEditingUser) {
+                    UserEditForm(userId: user.id, saveHandler: { saved in
+                                self.state.dispatch(action: UserActions.stopEditUser)
+                            })
+            })
     }
 }
 

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/UserEditForm.swift

@@ -24,11 +24,11 @@
         return NavigationView {
             VStack(alignment: .leading, spacing: 10) {
                 Text("User name")
-                TextField($newUserName, placeholder: Text("New name"))
+                TextField("New name", text: $newUserName)
                     .textFieldStyle(.roundedBorder)
                 Divider()
                 Text("Username")
-                TextField($newUserUsername, placeholder: Text("New username"))
+                TextField("New username", text: $newUserUsername)
                     .textFieldStyle(.roundedBorder)
                 }.padding(16)
             Button(action: save) {

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/component/Badge.swift

@@ -15,7 +15,7 @@ struct Badge : View {
     
     var animation: Animation {
         Animation
-            .spring(initialVelocity: 5)
+            .spring()
             .speed(2)
     }