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

fixed issue with decoding

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-05-23 11:18:23 -05:00
parent 758a7f686b
commit 97d7e1dba1
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
MVMCoreUI/Atomic/Extensions/VDS-Tilelet+Codable.swift
View File

@ -35,41 +35,67 @@ extension Tilelet.BadgeModel: Codable {
extension Tilelet.DescriptiveIcon: Codable { extension Tilelet.DescriptiveIcon: Codable {
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {
case name, size, surface case name, size, color, accessibleText
} }
public init(from decoder: Decoder) throws { public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self) let container = try decoder.container(keyedBy: CodingKeys.self)
let name = try container.decode(Icon.Name.self, forKey: .name) let name = try container.decode(Icon.Name.self, forKey: .name)
let size = try container.decodeIfPresent(Icon.Size.self, forKey: .size) ?? .medium let size = try container.decodeIfPresent(Icon.Size.self, forKey: .size) ?? .medium
let surface = try container.decodeIfPresent(Surface.self, forKey: .surface) ?? .dark let color = try container.decodeIfPresent(Color.self, forKey: .color)
self.init(name: name, size: size, surface: surface) let accessibleText = try? container.decode(String.self, forKey: .accessibleText)
if let uiColor = color?.uiColor {
self.init(name: name,
colorConfiguration: .init(uiColor, uiColor),
size: size,
accessibleText: accessibleText)
} else {
self.init(name: name,
size: size,
accessibleText: accessibleText)
}
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(name, forKey: .name) try container.encode(name, forKey: .name)
try container.encode(size, forKey: .size) try container.encode(size, forKey: .size)
try container.encode(surface, forKey: .surface) try container.encode(accessibleText, forKey: .accessibleText)
try container.encodeIfPresent(colorConfiguration.lightColor.hexString, forKey: .color)
} }
} }
extension Tilelet.DirectionalIcon.IconType : Codable {}
extension Tilelet.DirectionalIcon.IconSize : Codable {}
extension Tilelet.DirectionalIcon: Codable { extension Tilelet.DirectionalIcon: Codable {
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {
case size, surface case name, size, color, accessibleText
} }
public init(from decoder: Decoder) throws { public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self) let container = try decoder.container(keyedBy: CodingKeys.self)
let size = try container.decodeIfPresent(Icon.Size.self, forKey: .size) ?? .medium let iconType = try container.decodeIfPresent(IconType.self, forKey: .name) ?? .rightArrow
let surface = try container.decodeIfPresent(Surface.self, forKey: .surface) ?? .dark let size = try container.decodeIfPresent(IconSize.self, forKey: .size) ?? .medium
self.init(size: size, surface: surface) let color = try container.decodeIfPresent(Color.self, forKey: .color)
let accessibleText = try? container.decode(String.self, forKey: .accessibleText)
if let uiColor = color?.uiColor {
self.init(iconType: iconType,
colorConfiguration: .init(uiColor, uiColor),
size: size,
accessibleText: accessibleText)
} else {
self.init(iconType: iconType,
size: size,
accessibleText: accessibleText)
}
} }
public func encode(to encoder: Encoder) throws { public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(iconType, forKey: .name)
try container.encode(size, forKey: .size) try container.encode(size, forKey: .size)
try container.encode(surface, forKey: .surface) try container.encode(accessibleText, forKey: .accessibleText)
try container.encodeIfPresent(colorConfiguration.lightColor.hexString, forKey: .color)
} }
} }