Merge pull request #3 from ralfebert/master

example updated for Beta 7
ra1028 · Sep 7, 2019 · 7a20076 · 7a20076
2 parents 4734d8c + eeb4036
commit 7a20076
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 85 deletions.
diff --git a/SwiftUI-Combine-Example.xcodeproj/project.pbxproj b/SwiftUI-Combine-Example.xcodeproj/project.pbxproj
@@ -18,8 +18,6 @@
 		6B194F1722A710E6001B3151 /* SearchUserResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B194F1622A710E6001B3151 /* SearchUserResponse.swift */; };
 		6B194F1922A710FF001B3151 /* SearchUserViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B194F1822A710FF001B3151 /* SearchUserViewModel.swift */; };
 		6B194F1B22A7112D001B3151 /* SearchUserBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B194F1A22A7112D001B3151 /* SearchUserBar.swift */; };
-		6B194F1D22A71154001B3151 /* FoundationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B194F1C22A71154001B3151 /* FoundationExtensions.swift */; };
-		6B194F1F22A71B0F001B3151 /* AnySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B194F1E22A71B0F001B3151 /* AnySubscription.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -36,8 +34,6 @@
 		6B194F1622A710E6001B3151 /* SearchUserResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUserResponse.swift; sourceTree = "<group>"; };
 		6B194F1822A710FF001B3151 /* SearchUserViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUserViewModel.swift; sourceTree = "<group>"; };
 		6B194F1A22A7112D001B3151 /* SearchUserBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUserBar.swift; sourceTree = "<group>"; };
-		6B194F1C22A71154001B3151 /* FoundationExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoundationExtensions.swift; sourceTree = "<group>"; };
-		6B194F1E22A71B0F001B3151 /* AnySubscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnySubscription.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,8 +72,6 @@
 				6B194F1222A7108C001B3151 /* SearchUserRow.swift */,
 				6B194F1622A710E6001B3151 /* SearchUserResponse.swift */,
 				6B194F1422A710AB001B3151 /* User.swift */,
-				6B194F1E22A71B0F001B3151 /* AnySubscription.swift */,
-				6B194F1C22A71154001B3151 /* FoundationExtensions.swift */,
 				6B194F0022A6BA07001B3151 /* SceneDelegate.swift */,
 				6B194EFE22A6BA07001B3151 /* AppDelegate.swift */,
 				6B194F0422A6BA08001B3151 /* Assets.xcassets */,
@@ -170,11 +164,9 @@
 				6B194F1B22A7112D001B3151 /* SearchUserBar.swift in Sources */,
 				6B194EFF22A6BA07001B3151 /* AppDelegate.swift in Sources */,
 				6B194F0122A6BA07001B3151 /* SceneDelegate.swift in Sources */,
-				6B194F1F22A71B0F001B3151 /* AnySubscription.swift in Sources */,
 				6B194F0322A6BA07001B3151 /* SearchUserView.swift in Sources */,
 				6B194F1922A710FF001B3151 /* SearchUserViewModel.swift in Sources */,
 				6B194F1722A710E6001B3151 /* SearchUserResponse.swift in Sources */,
-				6B194F1D22A71154001B3151 /* FoundationExtensions.swift in Sources */,
 				6B194F1522A710AB001B3151 /* User.swift in Sources */,
 				6B194F1322A7108C001B3151 /* SearchUserRow.swift in Sources */,
 			);

diff --git a/SwiftUI-Combine-Example/AnySubscription.swift b/SwiftUI-Combine-Example/AnySubscription.swift
diff --git a/SwiftUI-Combine-Example/FoundationExtensions.swift b/SwiftUI-Combine-Example/FoundationExtensions.swift
diff --git a/SwiftUI-Combine-Example/SceneDelegate.swift b/SwiftUI-Combine-Example/SceneDelegate.swift
@@ -5,11 +5,11 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(
-            rootView: SearchUserView()
-        )
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: SearchUserView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
     }
 }
diff --git a/SwiftUI-Combine-Example/SearchUserBar.swift b/SwiftUI-Combine-Example/SearchUserBar.swift
@@ -8,11 +8,7 @@ struct SearchUserBar: View {
         ZStack {
             Color.yellow
             HStack {
-                TextField(
-                    $text,
-                    placeholder: Text("Search User")
-                        .color(Color.gray)
-                    )
+                TextField("Search User", text: $text)
                     .padding([.leading, .trailing], 8)
                     .frame(height: 32)
                     .background(Color.white.opacity(0.4))

diff --git a/SwiftUI-Combine-Example/SearchUserRow.swift b/SwiftUI-Combine-Example/SearchUserRow.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 
 struct SearchUserRow: View {
-    @ObjectBinding var viewModel: SearchUserViewModel
+    @ObservedObject var viewModel: SearchUserViewModel
     @State var user: User
 
     var body: some View {

diff --git a/SwiftUI-Combine-Example/SearchUserView.swift b/SwiftUI-Combine-Example/SearchUserView.swift
@@ -1,12 +1,12 @@
 import SwiftUI
 
 struct SearchUserView: View {
-    @ObjectBinding var viewModel = SearchUserViewModel()
+    @ObservedObject var viewModel = SearchUserViewModel()
 
     var body: some View {
         NavigationView {
             VStack {
-                SearchUserBar(text: viewModel[\.name]) {
+                SearchUserBar(text: $viewModel.name) {
                     self.viewModel.search()
                 }
 

diff --git a/SwiftUI-Combine-Example/SearchUserViewModel.swift b/SwiftUI-Combine-Example/SearchUserViewModel.swift
@@ -1,20 +1,13 @@
 import SwiftUI
 import Combine
 
-final class SearchUserViewModel: BindableObject {
-    var didChange = PassthroughSubject<SearchUserViewModel, Never>()
+final class SearchUserViewModel: ObservableObject {
 
-    var name = "ra1028" {
-        didSet { didChange.send(self) }
-    }
+    @Published var name = "ra1028"
 
-    private(set) var users = [User]() {
-        didSet { didChange.send(self) }
-    }
+    @Published private(set) var users = [User]()
 
-    private(set) var userImages = [User: UIImage]() {
-        didSet { didChange.send(self) }
-    }
+    @Published private(set) var userImages = [User: UIImage]()
 
     private var searchCancellable: Cancellable? {
         didSet { oldValue?.cancel() }
@@ -37,10 +30,12 @@ final class SearchUserViewModel: BindableObject {
         var request = URLRequest(url: urlComponents.url!)
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 
-        searchCancellable = URLSession.shared.send(request: request)
+        searchCancellable = URLSession.shared.dataTaskPublisher(for: request)
+            .map { $0.data }
             .decode(type: SearchUserResponse.self, decoder: JSONDecoder())
             .map { $0.items }
             .replaceError(with: [])
+            .receive(on: RunLoop.main)
             .assign(to: \.users, on: self)
     }
 
@@ -50,9 +45,10 @@ final class SearchUserViewModel: BindableObject {
         }
 
         let request = URLRequest(url: user.avatar_url)
-        _ = URLSession.shared.send(request: request)
-            .map { UIImage(data: $0) }
+        _ = URLSession.shared.dataTaskPublisher(for: request)
+            .map { UIImage(data: $0.data) }
             .replaceError(with: nil)
+            .receive(on: RunLoop.main)
             .sink(receiveValue: { [weak self] image in
                 self?.userImages[user] = image
             })