Merge pull request #6 from ServerDriven/develop

0xLeif · web-flow · commit a7e063b20602 · 2021-01-08T08:53:36.000-06:00
Develop
diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/leif.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/leif.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Sources/ScreenData/Views/SomeButton.swift b/Sources/ScreenData/Views/SomeButton.swift
@@ -21,6 +21,7 @@ public struct SomeButton: Codable, Hashable {
     ) {
         self.id = id
         self.title = title
+        self.actionID = actionID
         self.destination = destination
         self.style = style
     }
diff --git a/Sources/ScreenData/Views/SomeSpacer.swift b/Sources/ScreenData/Views/SomeSpacer.swift
@@ -1,7 +1,12 @@
 public struct SomeSpacer: Codable, Hashable {
+    public var size: Int
     
     public var type: ViewType {
         .spacer
     }
     
+    public init(size: Int) {
+        self.size = size
+    }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public struct SomeButton: Codable, Hashable {`
`21`	`21`	`) {`
`22`	`22`	`self.id = id`
`23`	`23`	`self.title = title`
	`24`	`+ self.actionID = actionID`
`24`	`25`	`self.destination = destination`
`25`	`26`	`self.style = style`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,12 @@`
`1`	`1`	`public struct SomeSpacer: Codable, Hashable {`
	`2`	`+ public var size: Int`
`2`	`3`
`3`	`4`	`public var type: ViewType {`
`4`	`5`	`.spacer`
`5`	`6`	`}`
`6`	`7`
	`8`	`+ public init(size: Int) {`
	`9`	`+ self.size = size`
	`10`	`+ }`
`7`	`11`	`}`
	`12`	`+`