Merge pull request #4 from ServerDriven/develop

Develop

Author: 0xLeif

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>ScreenDataNavigation.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>ScreenDataNavigation</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>ScreenDataNavigationTests</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

.swiftpm/xcode/package.xcworkspace/xcuserdata/leif.xcuserdatad/UserInterfaceState.xcuserstate

@@ -18,7 +18,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(name: "ScreenData", url: "https://github.com/ServerDriven/ScreenData-swift", from: "0.2.1")
+        .package(name: "ScreenData", url: "https://github.com/ServerDriven/ScreenData-swift", from: "0.3.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

.swiftpm/xcode/xcuserdata/leif.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,28 +4,31 @@ import Foundation
 
 // MARK: ScreenProviding
 
+@available(iOS 13.0, OSX 10.15, *)
 public protocol ScreenProviding {
-    func screen(forID id: String) -> Future<SomeScreen, Error>
+    func screen(forID id: String) -> AnyPublisher<SomeScreen, Error>
 }
 
 // MARK: ScreenProviding Basic Implementation
-
+@available(iOS 13.0, OSX 10.15, *)
 public struct MockScreenProvider: ScreenProviding {
     public var mockScreen: SomeScreen
 
     public init(mockScreen: SomeScreen) {
         self.mockScreen = mockScreen
     }
 
-    public func screen(forID id: String) -> Future<SomeScreen, Error> {
+    public func screen(forID id: String) -> AnyPublisher<SomeScreen, Error> {
         Future { promise in
             var screen = mockScreen
             screen.id = id
             promise(.success(screen))
         }
+        .eraseToAnyPublisher()
     }
 }
 
+@available(iOS 13.0, OSX 10.15, *)
 public struct URLScreenProvider: ScreenProviding {
     public enum URLScreenProviderError: Error {
         case noResponse
@@ -38,7 +41,7 @@ public struct URLScreenProvider: ScreenProviding {
         self.baseURL = baseURL
     }
 
-    public func screen(forID id: String) -> Future<SomeScreen, Error> {
+    public func screen(forID id: String) -> AnyPublisher<SomeScreen, Error> {
         Future { promise in
             URLSession.shared.dataTask(with: baseURL.appendingPathComponent(id)) { (data, response, error) in
                 if let error = error {
@@ -62,9 +65,11 @@ public struct URLScreenProvider: ScreenProviding {
                 }
             }.resume()
         }
+        .eraseToAnyPublisher()
     }
 }
 
+@available(iOS 13.0, OSX 10.15, *)
 public struct UserDefaultScreenProvider: ScreenProviding {
     public enum UserDefaultScreenProviderError: Error {
         case noData
@@ -76,7 +81,7 @@ public struct UserDefaultScreenProvider: ScreenProviding {
         self.baseKey = baseKey
     }
 
-    public func screen(forID id: String) -> Future<SomeScreen, Error> {
+    public func screen(forID id: String) -> AnyPublisher<SomeScreen, Error> {
         Future { promise in
             guard let data = UserDefaults.standard.data(forKey: baseKey + id) else {
                 promise(.failure(UserDefaultScreenProviderError.noData))
@@ -89,24 +94,26 @@ public struct UserDefaultScreenProvider: ScreenProviding {
                 promise(.failure(error))
             }
         }
+        .eraseToAnyPublisher()
     }
 }
 
 // MARK: ScreenStoring
+@available(iOS 13.0, OSX 10.15, *)
 public protocol ScreenStoring {
-    func store(screens: [SomeScreen]) -> Future<Void, Error>
+    func store(screens: [SomeScreen]) -> AnyPublisher<Void, Error>
 }
 
 // MARK: ScreenStoring Basic Implementation
-
+@available(iOS 13.0, OSX 10.15, *)
 public struct UserDefaultScreenStorer: ScreenStoring {
     public var baseKey: String
 
     public init(baseKey: String) {
         self.baseKey = baseKey
     }
 
-    public func store(screens: [SomeScreen]) -> Future<Void, Error> {
+    public func store(screens: [SomeScreen]) -> AnyPublisher<Void, Error> {
         Future { promise in
             do {
                 try screens.forEach { screen in
@@ -120,45 +127,28 @@ public struct UserDefaultScreenStorer: ScreenStoring {
                 promise(.failure(error))
             }
         }
+        .eraseToAnyPublisher()
     }
 }
 
 // MARK: ScreenLoading
+@available(iOS 13.0, OSX 10.15, *)
 public protocol ScreenLoading {
-    func load(withProvider provider: ScreenProviding) -> Future<[SomeScreen], Error>
+    func load(withProvider provider: ScreenProviding) -> AnyPublisher<[SomeScreen], Error>
 }
 
-// MARK: ScreenLoading Basic Implementation [WIP]
-//
+//// MARK: ScreenLoading Basic Implementation [WIP]
+//@available(iOS 13.0, OSX 10.15, *)
 //extension SomeScreen: ScreenLoading {
 //    
-//    public func load(withProvider provider: ScreenProviding) -> Future<[SomeScreen], Error> {
-//        Future { promise in
-//            var bag = [AnyCancellable]()
-//            var screens = [SomeScreen]()
-//            
-//            Publishers.MergeMany(
-//                destinations
-//                    .filter { $0.type == .screen }
-//                    .map { destination in
-//                        provider.screen(forID: destination.toID)
-//                    }.lazy
-//                    .publisher
-//                    .collect()
-//            )
-//            .sink(receiveCompletion: { _ in }) { (result) in
-//                
-////                result.forEach { futureScreen in
-////                    futureScreen
-////                        .sink(receiveCompletion: { _ in }) { (screen) in
-////                            screens.append(screen)
-////                        }
-////                        .store(in: &bag)
-////                }
-//            }
-//            .store(in: &bag)
-//            
-//        }
+//    public func load(withProvider provider: ScreenProviding) -> AnyPublisher<[SomeScreen], Error> {
+//        Publishers.MergeMany(
+//            destinations
+//                .filter { $0.type == .screen }
+//                .map { destination in
+//                    provider.screen(forID: destination.toID)
+//                }
+//        )
 //    }
 //}
 
@@ -179,9 +169,11 @@ public extension SomeView {
                 let destinations = [someCustomView.destination,
                                     someCustomView.someImage?.destination]
                     .compactMap { $0 }
-                let subViewDestinations = someCustomView.views
-                    .map(\.destinations)
-                    .reduce([], +)
+                guard let subViewDestinations = someCustomView.views?
+                        .map(\.destinations)
+                        .reduce([], +) else {
+                    return destinations
+                }
 
                 return destinations + subViewDestinations
             }

Package.resolved

@@ -12,10 +12,10 @@ final class ScreenDataNavigationTests: XCTestCase {
         let screen = SomeScreen(title: "Title",
                                 subtitle: nil,
                                 backgroundColor: SomeColor(red: 0, green: 0, blue: 0),
-                                headerView: SomeView(type: .container, someContainer: SomeContainerView(axis: .vertical, views: [
-                                    SomeView(type: .label, someLabel: SomeLabel(title: "Hello World", subtitle: nil, style: nil, destination: Destination(type: .url, toID: "https://github.com/ServerDriven/ScreenData")))
+                                headerView: SomeView(type: .container, someContainer: SomeContainerView(isScrollable: true, axis: .vertical, views: [
+                                    SomeView(type: .label, someLabel: SomeLabel(title: "Hello World", subtitle: nil, font: .largeTitle, style: nil, destination: Destination(type: .url, toID: "https://github.com/ServerDriven/ScreenData")))
                                 ], style: nil)),
-                                someView: SomeView(type: .label, someLabel: SomeLabel(title: "Hello World", subtitle: nil, style: nil, destination: Destination(type: .screen, toID: "/some/data/5"))))
+                                someView: SomeView(type: .label, someLabel: SomeLabel(title: "Hello World", subtitle: nil, font: .largeTitle, style: nil, destination: Destination(type: .screen, toID: "/some/data/5"))))
 
         XCTAssertEqual(destinations.map { $0.toID },
                        screen.destinations.map { $0.toID })