Merge pull request #14 from ServerDriven/develop

0.4.0

Author: 0xLeif

Sources/ScreenData/Objects/SomeView+.swift

@@ -17,12 +17,6 @@ public extension SomeText {
     }
 }
 
-public extension SomeLabeledImage {
-    var someView: SomeView {
-        SomeView(type: .labeledImage, someLabeledImage: self)
-    }
-}
-
 public extension SomeImage {
     var someView: SomeView {
         SomeView(type: .image, someImage: self)

Sources/ScreenData/Objects/SomeView.swift

@@ -6,7 +6,6 @@ public struct SomeView: Codable, Hashable {
     public var someLabel: SomeLabel?
     public var someText: SomeText?
     public var someButton: SomeButton?
-    public var someLabeledImage: SomeLabeledImage?
     public var someCustomView: SomeCustomView?
     public var someSpacer: SomeSpacer?
 
@@ -17,7 +16,6 @@ public struct SomeView: Codable, Hashable {
         someLabel: SomeLabel? = nil,
         someText: SomeText? = nil,
         someButton: SomeButton? = nil,
-        someLabeledImage: SomeLabeledImage? = nil,
         someCustomView: SomeCustomView? = nil,
         someSpacer: SomeSpacer? = nil
     ) {
@@ -27,7 +25,6 @@ public struct SomeView: Codable, Hashable {
         self.someLabel = someLabel
         self.someText = someText
         self.someButton = someButton
-        self.someLabeledImage = someLabeledImage
         self.someCustomView = someCustomView
         self.someSpacer = someSpacer
     }

Sources/ScreenData/Screens/SomeScreen.swift

@@ -2,7 +2,6 @@ public struct SomeScreen: Codable, Hashable {
     public var id: String?
 
     public var title: String
-    public var subtitle: String?
 
     public var backgroundColor: SomeColor
 
@@ -13,15 +12,13 @@ public struct SomeScreen: Codable, Hashable {
     public init(
         id: String? = nil,
         title: String,
-        subtitle: String?,
         backgroundColor: SomeColor,
         headerView: SomeView? = nil,
         someView: SomeView,
         footerView: SomeView? = nil
     ) {
         self.id = id
         self.title = title
-        self.subtitle = subtitle
         self.backgroundColor = backgroundColor
         self.headerView = headerView
         self.someView = someView

Sources/ScreenData/Types/ViewType.swift

@@ -3,7 +3,6 @@ public enum ViewType: String, Codable {
     case text
     case button
     case image
-    case labeledImage
     case container
     case custom
     case spacer