Skip to content

Commit 8409dde

Browse files
committed
Updated to match kotlin
1 parent 93c9c0f commit 8409dde

File tree

6 files changed

+82
-13
lines changed

6 files changed

+82
-13
lines changed

Sources/ScreenData/Objects/SomeColor.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
public struct SomeColor: Codable, Hashable {
2-
public var red: Int
3-
public var green: Int
4-
public var blue: Int
5-
public var alpha: Int
2+
public var red: Float
3+
public var green: Float
4+
public var blue: Float
5+
public var alpha: Float
66

77
public init(
8-
red: Int,
9-
green: Int,
10-
blue: Int,
11-
alpha: Int = 255
8+
red: Float,
9+
green: Float,
10+
blue: Float,
11+
alpha: Float = 1
1212
) {
1313
self.red = red
1414
self.green = green

Sources/ScreenData/Objects/SomeStyle.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ public struct SomeStyle: Codable, Hashable {
55
public var foregroundColor: SomeColor?
66
public var backgroundColor: SomeColor?
77

8+
public var padding: Int
9+
810
public init(
911
isHidden: Bool = false,
1012
cornerRadius: Int = 0,
1113
foregroundColor: SomeColor? = nil,
12-
backgroundColor: SomeColor? = nil
14+
backgroundColor: SomeColor? = nil,
15+
padding: Int = 0
1316
) {
1417
self.isHidden = isHidden
1518
self.cornerRadius = cornerRadius
1619
self.foregroundColor = foregroundColor
1720
self.backgroundColor = backgroundColor
21+
self.padding = padding
1822
}
1923
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
//
2+
// SomeView+.swift
3+
//
4+
//
5+
// Created by Zach Eriksen on 11/28/20.
6+
//
7+
8+
public extension SomeLabel {
9+
var someView: SomeView {
10+
SomeView(type: .label, someLabel: self)
11+
}
12+
}
13+
14+
public extension SomeText {
15+
var someView: SomeView {
16+
SomeView(type: .text, someText: self)
17+
}
18+
}
19+
20+
public extension SomeLabeledImage {
21+
var someView: SomeView {
22+
SomeView(type: .labeledImage, someLabeledImage: self)
23+
}
24+
}
25+
26+
public extension SomeImage {
27+
var someView: SomeView {
28+
SomeView(type: .image, someImage: self)
29+
}
30+
}
31+
32+
public extension SomeCustomView {
33+
var someView: SomeView {
34+
SomeView(type: .custom, someCustomView: self)
35+
}
36+
}
37+
38+
public extension SomeContainerView {
39+
var someView: SomeView {
40+
SomeView(type: .container, someContainer: self)
41+
}
42+
}
43+
44+
public extension SomeButton {
45+
var someView: SomeView {
46+
SomeView(type: .button, someButton: self)
47+
}
48+
}
49+
50+
public extension SomeSpacer {
51+
var someView: SomeView {
52+
SomeView(type: .spacer, someSpacer: self)
53+
}
54+
}
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
public struct SomeView: Codable, Hashable {
22
public var type: ViewType
33

4-
public var container: SomeContainerView?
4+
public var someContainer: SomeContainerView?
55
public var someImage: SomeImage?
66
public var someLabel: SomeLabel?
77
public var someText: SomeText?
88
public var someButton: SomeButton?
99
public var someLabeledImage: SomeLabeledImage?
1010
public var someCustomView: SomeCustomView?
11+
public var someSpacer: SomeSpacer?
1112

1213
public init(
1314
type: ViewType,
14-
container: SomeContainerView? = nil,
15+
someContainer: SomeContainerView? = nil,
1516
someImage: SomeImage? = nil,
1617
someLabel: SomeLabel? = nil,
1718
someText: SomeText? = nil,
1819
someButton: SomeButton? = nil,
1920
someLabeledImage: SomeLabeledImage? = nil,
20-
someCustomView: SomeCustomView? = nil
21+
someCustomView: SomeCustomView? = nil,
22+
someSpacer: SomeSpacer? = nil
2123
) {
2224
self.type = type
23-
self.container = container
25+
self.someContainer = someContainer
2426
self.someImage = someImage
2527
self.someLabel = someLabel
2628
self.someText = someText
2729
self.someButton = someButton
2830
self.someLabeledImage = someLabeledImage
2931
self.someCustomView = someCustomView
32+
self.someSpacer = someSpacer
3033
}
3134
}

Sources/ScreenData/Types/ViewType.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ public enum ViewType: String, Codable {
66
case labeledImage
77
case container
88
case custom
9+
case spacer
910
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
public struct SomeSpacer: Codable, Hashable {
2+
3+
public var type: ViewType {
4+
.spacer
5+
}
6+
7+
}

0 commit comments

Comments
 (0)