Merge pull request #7 from ServerDriven/develop

Develop

Author: 0xLeif

Sources/ScreenData/Objects/SomeStyle.swift

@@ -5,19 +5,26 @@ public struct SomeStyle: Codable, Hashable {
     public var foregroundColor: SomeColor?
     public var backgroundColor: SomeColor?
 
+    public var width: Int?
+    public var height: Int?
+    
     public var padding: Int
 
     public init(
         isHidden: Bool = false,
         cornerRadius: Int = 0,
         foregroundColor: SomeColor? = nil,
         backgroundColor: SomeColor? = nil,
+        width: Int? = nil,
+        height: Int? = nil,
         padding: Int = 0
     ) {
         self.isHidden = isHidden
         self.cornerRadius = cornerRadius
         self.foregroundColor = foregroundColor
         self.backgroundColor = backgroundColor
+        self.width = width
+        self.height = height
         self.padding = padding
     }
 }

Sources/ScreenData/Views/SomeContainerView.swift

@@ -1,6 +1,7 @@
 public struct SomeContainerView: Codable, Hashable {
     public var id: String?
 
+    public var isScrollable: Bool
     public var axis: ViewDirectionAxis
     public var views: [SomeView]
 
@@ -12,11 +13,13 @@ public struct SomeContainerView: Codable, Hashable {
 
     public init(
         id: String? = nil,
+        isScrollable: Bool,
         axis: ViewDirectionAxis,
         views: [SomeView],
         style: SomeStyle? = nil
     ) {
         self.id = id
+        self.isScrollable = isScrollable
         self.axis = axis
         self.views = views
         self.style = style

Sources/ScreenData/Views/SomeCustomView.swift

@@ -1,31 +1,31 @@
 public struct SomeCustomView: Codable, Hashable {
     public var id: String?
 
-    public var title: String
+    public var title: String?
     public var subtitle: String?
 
     public var style: SomeStyle?
 
     public var someImage: SomeImage?
 
     public var destination: Destination?
-    public var axis: ViewDirectionAxis
+    public var axis: ViewDirectionAxis?
 
-    public var views: [SomeView]
+    public var views: [SomeView]?
 
     public var type: ViewType {
         .custom
     }
 
     public init(
         id: String? = nil,
-        title: String,
+        title: String? = nil,
         subtitle: String? = nil,
         style: SomeStyle? = nil,
         someImage: SomeImage? = nil,
         destination: Destination? = nil,
-        axis: ViewDirectionAxis,
-        views: [SomeView]
+        axis: ViewDirectionAxis? = nil,
+        views: [SomeView]? = nil
     ) {
         self.id = id
         self.title = title