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

Merge branch 'feature/tilet' into 'develop'

Browse Source 
added default values in the decoder func

See merge request BPHV_MIPS/vds_ios!33
This commit is contained in:
Bruce, Matt R 2023-01-17 16:02:37 +00:00
commit 79dfc104fb
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
VDS/Components/Tilet/TiletIconModels.swift
View File

@ -20,6 +20,13 @@ extension Tilet {
self.size = size
self.surface = surface
}
public init(from decoder: Decoder) throws {
let container: KeyedDecodingContainer<Tilet.DescriptiveIcon.CodingKeys> = try decoder.container(keyedBy: Tilet.DescriptiveIcon.CodingKeys.self)
self.name = try container.decode(Icon.Name.self, forKey: Tilet.DescriptiveIcon.CodingKeys.name)
self.size = try container.decodeIfPresent(Icon.Size.self, forKey: Tilet.DescriptiveIcon.CodingKeys.size) ?? .medium
self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilet.DescriptiveIcon.CodingKeys.surface) ?? .dark
}
}
public struct DirectionalIcon: Codable {
@ -30,5 +37,11 @@ extension Tilet {
self.size = size
self.surface = surface
}
public init(from decoder: Decoder) throws {
let container: KeyedDecodingContainer<Tilet.DirectionalIcon.CodingKeys> = try decoder.container(keyedBy: Tilet.DirectionalIcon.CodingKeys.self)
self.size = try container.decodeIfPresent(Icon.Size.self, forKey: Tilet.DirectionalIcon.CodingKeys.size) ?? .medium
self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilet.DirectionalIcon.CodingKeys.surface) ?? .dark
}
}
}

7
VDS/Components/Tilet/TiletSubTitleModel.swift
View File

@ -50,5 +50,12 @@ extension Tilet {
textColor: textColor,
textAttributes: nil)
}
public init(from decoder: Decoder) throws {
let container: KeyedDecodingContainer<Tilet.SubTitleModel.CodingKeys> = try decoder.container(keyedBy: Tilet.SubTitleModel.CodingKeys.self)
self.text = try container.decode(String.self, forKey: Tilet.SubTitleModel.CodingKeys.text)
self.textStyle = try container.decodeIfPresent(Tilet.SubTitleModel.TextStyle.self, forKey: Tilet.SubTitleModel.CodingKeys.textStyle) ?? .bodySmall
self.textColor = try container.decodeIfPresent(Use.self, forKey: Tilet.SubTitleModel.CodingKeys.textColor) ?? .primary
}
}
}

6
VDS/Components/Tilet/TiletTitleModel.swift
View File

@ -48,5 +48,11 @@ extension Tilet {
textAttributes: nil,
textStyle: textStyle.value)
}
public init(from decoder: Decoder) throws {
let container: KeyedDecodingContainer<Tilet.TitleModel.CodingKeys> = try decoder.container(keyedBy: Tilet.TitleModel.CodingKeys.self)
self.text = try container.decode(String.self, forKey: Tilet.TitleModel.CodingKeys.text)
self.textStyle = try container.decodeIfPresent(Tilet.TitleModel.TextStyle.self, forKey: Tilet.TitleModel.CodingKeys.textStyle) ?? .boldTitleSmall
}
}
}