mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tilelet-update' into 'develop'

Browse Source 
fixes in the enum change for vds tilelet

### Summary
Even though Tilelet was already implemented partially a while back, a update to the enums under the hood changed.

Co-authored-by: Matt Bruce <matt.bruce@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1087
This commit is contained in:
Hedden, Kyle Matthew 2024-03-26 19:16:50 +00:00
commit d024b3dd62
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift
View File

@ -17,9 +17,9 @@ open class TileletModel: MoleculeModelProtocol {
public static var identifier: String = "tilelet" public static var identifier: String = "tilelet"
public var id: String = UUID().uuidString public var id: String = UUID().uuidString
public var backgroundColor: Color? public var backgroundColor: Color?
public var color: TileContainer.BackgroundColor public var color: Tilelet.BackgroundColor
public var padding: TileContainer.Padding public var padding: Tilelet.Padding
public var aspectRatio: TileContainer.AspectRatio public var aspectRatio: Tilelet.AspectRatio
public var badge: Tilelet.BadgeModel? public var badge: Tilelet.BadgeModel?
public var title: LabelModel? public var title: LabelModel?
public var subTitle: LabelModel? public var subTitle: LabelModel?
@ -51,9 +51,9 @@ open class TileletModel: MoleculeModelProtocol {
let container = try decoder.container(keyedBy: CodingKeys.self) let container = try decoder.container(keyedBy: CodingKeys.self)
self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString self.id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
self.backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor) self.backgroundColor = try container.decodeIfPresent(Color.self, forKey: .backgroundColor)
self.color = try container.decodeIfPresent(TileContainer.BackgroundColor.self, forKey: .color) ?? TileContainer.BackgroundColor.black self.color = try container.decodeIfPresent(Tilelet.BackgroundColor.self, forKey: .color) ?? Tilelet.BackgroundColor.black
self.padding = try container.decodeIfPresent(TileContainer.Padding.self, forKey: .padding) ?? TileContainer.Padding.padding4X self.padding = try container.decodeIfPresent(Tilelet.Padding.self, forKey: .padding) ?? Tilelet.Padding.small
self.aspectRatio = try container.decodeIfPresent(TileContainer.AspectRatio.self, forKey: .aspectRatio) ?? TileContainer.AspectRatio.none self.aspectRatio = try container.decodeIfPresent(Tilelet.AspectRatio.self, forKey: .aspectRatio) ?? Tilelet.AspectRatio.none
self.badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge) self.badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge)
self.title = try container.decodeIfPresent(LabelModel.self, forKey: .title) self.title = try container.decodeIfPresent(LabelModel.self, forKey: .title)
self.subTitle = try container.decodeIfPresent(LabelModel.self, forKey: .subTitle) self.subTitle = try container.decodeIfPresent(LabelModel.self, forKey: .subTitle)

5
MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift
View File

@ -25,7 +25,8 @@ extension VDS.Tabs.Overflow: Codable {}
extension VDS.Tabs.Size: Codable {} extension VDS.Tabs.Size: Codable {}
extension VDS.TextLink.Size: Codable {} extension VDS.TextLink.Size: Codable {}
extension VDS.TextLinkCaret.IconPosition: Codable {} extension VDS.TextLinkCaret.IconPosition: Codable {}
extension VDS.TileContainer.AspectRatio: Codable {} extension VDS.TileContainerBase.AspectRatio: Codable {}
extension VDS.Tilelet.Padding: Codable {}
extension VDS.TitleLockup.TextAlignment: Codable {} extension VDS.TitleLockup.TextAlignment: Codable {}
extension VDS.Tooltip.FillColor: Codable {} extension VDS.Tooltip.FillColor: Codable {}
extension VDS.Tooltip.Size: Codable {} extension VDS.Tooltip.Size: Codable {}
@ -61,7 +62,7 @@ extension DecodableDefault {
public typealias Surface = Wrapper<Sources.Surface> public typealias Surface = Wrapper<Sources.Surface>
} }
extension VDS.TileContainer.BackgroundColor: Codable { extension VDS.TileContainerBase.BackgroundColor: Codable {
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer() var container = encoder.singleValueContainer()
switch self { switch self {