Merge pull request #3 from ServerDriven/develop

Develop

Author: 0xLeif

Sources/ScreenData/Objects/SomeStyle.swift

@@ -1,12 +1,19 @@
 public struct SomeStyle: Codable {
-    public var backgroundColor: SomeColor?
     public var isHidden: Bool
+    public var cornerRadius: Int
+    
+    public var foregroundColor: SomeColor?
+    public var backgroundColor: SomeColor?
 
     public init(
-        backgroundColor: SomeColor? = nil,
-        isHidden: Bool = false
+        isHidden: Bool = false,
+        cornerRadius: Int = 0,
+        foregroundColor: SomeColor? = nil,
+        backgroundColor: SomeColor? = nil
     ) {
-        self.backgroundColor = backgroundColor
         self.isHidden = isHidden
+        self.cornerRadius = cornerRadius
+        self.foregroundColor = foregroundColor
+        self.backgroundColor = backgroundColor
     }
 }

Sources/ScreenData/Objects/SomeView.swift

@@ -4,6 +4,8 @@ public struct SomeView: Codable {
     public var container: SomeContainerView?
     public var someImage: SomeImage?
     public var someLabel: SomeLabel?
+    public var someText: SomeText?
+    public var someButton: SomeButton?
     public var someLabeledImage: SomeLabeledImage?
     public var someCustomView: SomeCustomView?
 
@@ -12,13 +14,17 @@ public struct SomeView: Codable {
         container: SomeContainerView? = nil,
         someImage: SomeImage? = nil,
         someLabel: SomeLabel? = nil,
+        someText: SomeText? = nil,
+        someButton: SomeButton? = nil,
         someLabeledImage: SomeLabeledImage? = nil,
         someCustomView: SomeCustomView? = nil
     ) {
         self.type = type
         self.container = container
         self.someImage = someImage
         self.someLabel = someLabel
+        self.someText = someText
+        self.someButton = someButton
         self.someLabeledImage = someLabeledImage
         self.someCustomView = someCustomView
     }

Sources/ScreenData/Types/ViewType.swift

@@ -1,7 +1,9 @@
 public enum ViewType: String, Codable {
-	case label
-	case image
-	case labeledImage
-	case container
+    case label
+    case text
+    case button
+    case image
+    case labeledImage
+    case container
     case custom
 }

Sources/ScreenData/Views/SomeButton.swift

@@ -0,0 +1,27 @@
+public struct SomeButton: Codable {
+    public var id: String?
+    
+    public var title: String
+    
+    public var actionID: String?
+    public var destination: Destination?
+    
+    public var style: SomeStyle?
+    
+    public var type: ViewType {
+        .button
+    }
+    
+    public init(
+        id: String? = nil,
+        title: String,
+        actionID: String? = nil,
+        destination: Destination? = nil,
+        style: SomeStyle? = nil
+    ) {
+        self.id = id
+        self.title = title
+        self.destination = destination
+        self.style = style
+    }
+}

Sources/ScreenData/Views/SomeContainerView.swift

@@ -14,7 +14,7 @@ public struct SomeContainerView: Codable {
         id: String? = nil,
         axis: ViewDirectionAxis,
         views: [SomeView],
-        style: SomeStyle?
+        style: SomeStyle? = nil
     ) {
         self.id = id
         self.axis = axis

Sources/ScreenData/Views/SomeCustomView.swift

@@ -20,10 +20,10 @@ public struct SomeCustomView: Codable {
     public init(
         id: String? = nil,
         title: String,
-        subtitle: String?,
-        style: SomeStyle?,
-        someImage: SomeImage?,
-        destination: Destination?,
+        subtitle: String? = nil,
+        style: SomeStyle? = nil,
+        someImage: SomeImage? = nil,
+        destination: Destination? = nil,
         axis: ViewDirectionAxis,
         views: [SomeView]
     ) {

Sources/ScreenData/Views/SomeImage.swift

@@ -14,8 +14,8 @@ public struct SomeImage: Codable {
     public init(
         id: String? = nil,
         url: String,
-        style: SomeStyle?,
-        destination: Destination?
+        style: SomeStyle? = nil,
+        destination: Destination? = nil
     ) {
         self.id = id
         self.url = url

Sources/ScreenData/Views/SomeLabel.swift

@@ -15,9 +15,9 @@ public struct SomeLabel: Codable {
     public init(
         id: String? = nil,
         title: String,
-        subtitle: String?,
-        style: SomeStyle?,
-        destination: Destination?
+        subtitle: String? = nil,
+        style: SomeStyle? = nil,
+        destination: Destination? = nil
     ) {
         self.id = id
         self.title = title

Sources/ScreenData/Views/SomeLabeledImage.swift

@@ -16,10 +16,10 @@ public struct SomeLabeledImage: Codable {
     public init(
         id: String? = nil,
         title: String,
-        subtitle: String?,
+        subtitle: String? = nil,
         someImage: SomeImage,
-        style: SomeStyle?,
-        destination: Destination?
+        style: SomeStyle? = nil,
+        destination: Destination? = nil
     ) {
         self.id = id
         self.title = title

Sources/ScreenData/Views/SomeText.swift

@@ -0,0 +1,21 @@
+public struct SomeText: Codable {
+    public var id: String?
+    
+    public var title: String
+    
+    public var style: SomeStyle?
+    
+    public var type: ViewType {
+        .text
+    }
+    
+    public init(
+        id: String? = nil,
+        title: String,
+        style: SomeStyle? = nil
+    ) {
+        self.id = id
+        self.title = title
+        self.style = style
+    }
+}