From 1d8e7016de899afcbf907f06dafdd4f5d8f65664 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 17 Jan 2023 10:52:46 -0600 Subject: [PATCH 1/3] update models for default values Signed-off-by: Matt Bruce --- VDS/Components/Tilet/TiletBadgeModel.swift | 14 ++++++++++++-- VDS/Components/Tilet/TiletIconModels.swift | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/VDS/Components/Tilet/TiletBadgeModel.swift b/VDS/Components/Tilet/TiletBadgeModel.swift index 521958a4..43e68abb 100644 --- a/VDS/Components/Tilet/TiletBadgeModel.swift +++ b/VDS/Components/Tilet/TiletBadgeModel.swift @@ -10,10 +10,11 @@ import Foundation extension Tilet { public struct BadgeModel: Codable { public var text: String = "" - public var fillColor:Badge.FillColor - public var surface: Surface + public var fillColor: Badge.FillColor = .red + public var surface: Surface = .light public var numberOfLines: Int public var maxWidth: CGFloat? + public init(text: String, fillColor: Badge.FillColor = .red, surface: Surface = .light, numberOfLines: Int = 0, maxWidth: CGFloat? = nil) { self.text = text self.fillColor = fillColor @@ -21,5 +22,14 @@ extension Tilet { self.numberOfLines = numberOfLines self.maxWidth = maxWidth } + + public init(from decoder: Decoder) throws { + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilet.BadgeModel.CodingKeys.self) + self.text = try container.decode(String.self, forKey: Tilet.BadgeModel.CodingKeys.text) + self.fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: Tilet.BadgeModel.CodingKeys.fillColor) ?? .red + self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilet.BadgeModel.CodingKeys.surface) ?? .light + self.numberOfLines = try container.decodeIfPresent(Int.self, forKey: Tilet.BadgeModel.CodingKeys.numberOfLines) ?? 0 + self.maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: Tilet.BadgeModel.CodingKeys.maxWidth) + } } } diff --git a/VDS/Components/Tilet/TiletIconModels.swift b/VDS/Components/Tilet/TiletIconModels.swift index 36c3f5b4..a462199b 100644 --- a/VDS/Components/Tilet/TiletIconModels.swift +++ b/VDS/Components/Tilet/TiletIconModels.swift @@ -23,7 +23,7 @@ extension Tilet { public init(from decoder: Decoder) throws { let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilet.DescriptiveIcon.CodingKeys.self) - self.name = try container.decode(Icon.Name.self, forKey: Tilet.DescriptiveIcon.CodingKeys.name) + self.name = try container.decodeIfPresent(Icon.Name.self, forKey: Tilet.DescriptiveIcon.CodingKeys.name) ?? .multipleDocuments 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 } From e5a1ca798835f39c9507776f0c2a9c47e8df7db0 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 17 Jan 2023 12:58:49 -0600 Subject: [PATCH 2/3] undo userinteractive Signed-off-by: Matt Bruce --- VDS/Components/TileContainer/TileContainer.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index bd56dcdd..e8ebe3f4 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -166,7 +166,6 @@ open class TileContainer: Control { backgroundImageView.isUserInteractionEnabled = false backgroundImageView.isHidden = true - containerView.isUserInteractionEnabled = false containerView.backgroundColor = .clear containerTopConstraint = containerView.topAnchor.constraint(equalTo: topAnchor, constant: padding.value) @@ -179,7 +178,6 @@ open class TileContainer: Control { containerTrailingConstraint?.isActive = true highlightView.pinToSuperView() - highlightView.isUserInteractionEnabled = false highlightView.isHidden = true highlightView.backgroundColor = .clear From 994d0eccd7dad837b0b92e180a436afd4e6aea94 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 17 Jan 2023 15:15:34 -0600 Subject: [PATCH 3/3] wrong name Signed-off-by: Matt Bruce --- VDS.xcodeproj/project.pbxproj | 46 +++++++++---------- .../Tilet.swift => Tilelet/Tilelet.swift} | 4 +- .../TileletBadgeModel.swift} | 14 +++--- .../TileletIconModels.swift} | 16 +++---- .../TileletSubTitleModel.swift} | 10 ++-- .../TileletTitleModel.swift} | 8 ++-- 6 files changed, 49 insertions(+), 49 deletions(-) rename VDS/Components/{Tilet/Tilet.swift => Tilelet/Tilelet.swift} (99%) rename VDS/Components/{Tilet/TiletBadgeModel.swift => Tilelet/TileletBadgeModel.swift} (70%) rename VDS/Components/{Tilet/TiletIconModels.swift => Tilelet/TileletIconModels.swift} (65%) rename VDS/Components/{Tilet/TiletSubTitleModel.swift => Tilelet/TileletSubTitleModel.swift} (82%) rename VDS/Components/{Tilet/TiletTitleModel.swift => Tilelet/TileletTitleModel.swift} (83%) diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj index a1b56f0e..1a162287 100644 --- a/VDS.xcodeproj/project.pbxproj +++ b/VDS.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ EA5E304C294CBDD00082B959 /* TileContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304B294CBDD00082B959 /* TileContainer.swift */; }; EA5E304E294CC7F00082B959 /* VDSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304D294CC7F00082B959 /* VDSColor.swift */; }; EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E30522950DDA60082B959 /* TitleLockup.swift */; }; - EA5E3058295105A40082B959 /* Tilet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E3057295105A40082B959 /* Tilet.swift */; }; + EA5E3058295105A40082B959 /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E3057295105A40082B959 /* Tilelet.swift */; }; EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305929510F8B0082B959 /* EnumSubset.swift */; }; EA89200228AECF2A006B9984 /* UIButton+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200128AECF2A006B9984 /* UIButton+Publisher.swift */; }; EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */; }; @@ -51,9 +51,9 @@ EA89201328B568D8006B9984 /* RadioBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201228B568D8006B9984 /* RadioBox.swift */; }; EA89201528B56CF4006B9984 /* RadioBoxGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201428B56CF4006B9984 /* RadioBoxGroup.swift */; }; EA978EC5291D6AFE00ACC883 /* AnyLabelAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA978EC4291D6AFE00ACC883 /* AnyLabelAttribute.swift */; }; - EA985BE629688F6A00F2FF2E /* TiletBadgeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE529688F6A00F2FF2E /* TiletBadgeModel.swift */; }; - EA985BE82968951C00F2FF2E /* TiletTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE72968951C00F2FF2E /* TiletTitleModel.swift */; }; - EA985BEA29689B6D00F2FF2E /* TiletSubTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE929689B6D00F2FF2E /* TiletSubTitleModel.swift */; }; + EA985BE629688F6A00F2FF2E /* TileletBadgeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE529688F6A00F2FF2E /* TileletBadgeModel.swift */; }; + EA985BE82968951C00F2FF2E /* TileletTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE72968951C00F2FF2E /* TileletTitleModel.swift */; }; + EA985BEA29689B6D00F2FF2E /* TileletSubTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BE929689B6D00F2FF2E /* TileletSubTitleModel.swift */; }; EA985BEC2968A91200F2FF2E /* TitleLockupTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BEB2968A91200F2FF2E /* TitleLockupTitleModel.swift */; }; EA985BEE2968A92400F2FF2E /* TitleLockupSubTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BED2968A92400F2FF2E /* TitleLockupSubTitleModel.swift */; }; EA985BF02968A93600F2FF2E /* TitleLockupEyebrowModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BEF2968A93600F2FF2E /* TitleLockupEyebrowModel.swift */; }; @@ -63,7 +63,7 @@ EA985BF9296C710100F2FF2E /* IconColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985BF8296C710100F2FF2E /* IconColor.swift */; }; EA985C1D296CD13600F2FF2E /* BundleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C1C296CD13600F2FF2E /* BundleManager.swift */; }; EA985C23296E033A00F2FF2E /* TextArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C22296E033A00F2FF2E /* TextArea.swift */; }; - EA985C2D296F03FE00F2FF2E /* TiletIconModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C2C296F03FE00F2FF2E /* TiletIconModels.swift */; }; + EA985C2D296F03FE00F2FF2E /* TileletIconModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C2C296F03FE00F2FF2E /* TileletIconModels.swift */; }; EA985C672970C21600F2FF2E /* VDSLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C662970C21600F2FF2E /* VDSLayout.swift */; }; EA985C692971B90B00F2FF2E /* IconSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C682971B90B00F2FF2E /* IconSize.swift */; }; EAA5EEB528ECBFB4003B3210 /* ImageLabelAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEB428ECBFB4003B3210 /* ImageLabelAttribute.swift */; }; @@ -158,7 +158,7 @@ EA5E304B294CBDD00082B959 /* TileContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainer.swift; sourceTree = ""; }; EA5E304D294CC7F00082B959 /* VDSColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSColor.swift; sourceTree = ""; }; EA5E30522950DDA60082B959 /* TitleLockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockup.swift; sourceTree = ""; }; - EA5E3057295105A40082B959 /* Tilet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilet.swift; sourceTree = ""; }; + EA5E3057295105A40082B959 /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = ""; }; EA5E305929510F8B0082B959 /* EnumSubset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumSubset.swift; sourceTree = ""; }; EA89200128AECF2A006B9984 /* UIButton+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Publisher.swift"; sourceTree = ""; }; EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Publisher.swift"; sourceTree = ""; }; @@ -166,9 +166,9 @@ EA89201228B568D8006B9984 /* RadioBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBox.swift; sourceTree = ""; }; EA89201428B56CF4006B9984 /* RadioBoxGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBoxGroup.swift; sourceTree = ""; }; EA978EC4291D6AFE00ACC883 /* AnyLabelAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyLabelAttribute.swift; sourceTree = ""; }; - EA985BE529688F6A00F2FF2E /* TiletBadgeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletBadgeModel.swift; sourceTree = ""; }; - EA985BE72968951C00F2FF2E /* TiletTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletTitleModel.swift; sourceTree = ""; }; - EA985BE929689B6D00F2FF2E /* TiletSubTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletSubTitleModel.swift; sourceTree = ""; }; + EA985BE529688F6A00F2FF2E /* TileletBadgeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletBadgeModel.swift; sourceTree = ""; }; + EA985BE72968951C00F2FF2E /* TileletTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletTitleModel.swift; sourceTree = ""; }; + EA985BE929689B6D00F2FF2E /* TileletSubTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletSubTitleModel.swift; sourceTree = ""; }; EA985BEB2968A91200F2FF2E /* TitleLockupTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupTitleModel.swift; sourceTree = ""; }; EA985BED2968A92400F2FF2E /* TitleLockupSubTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupSubTitleModel.swift; sourceTree = ""; }; EA985BEF2968A93600F2FF2E /* TitleLockupEyebrowModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupEyebrowModel.swift; sourceTree = ""; }; @@ -178,7 +178,7 @@ EA985BF8296C710100F2FF2E /* IconColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconColor.swift; sourceTree = ""; }; EA985C1C296CD13600F2FF2E /* BundleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleManager.swift; sourceTree = ""; }; EA985C22296E033A00F2FF2E /* TextArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextArea.swift; sourceTree = ""; }; - EA985C2C296F03FE00F2FF2E /* TiletIconModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletIconModels.swift; sourceTree = ""; }; + EA985C2C296F03FE00F2FF2E /* TileletIconModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletIconModels.swift; sourceTree = ""; }; EA985C662970C21600F2FF2E /* VDSLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSLayout.swift; sourceTree = ""; }; EA985C682971B90B00F2FF2E /* IconSize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconSize.swift; sourceTree = ""; }; EAA5EEB428ECBFB4003B3210 /* ImageLabelAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageLabelAttribute.swift; sourceTree = ""; }; @@ -355,7 +355,7 @@ EAF7F11428A1470D00B287F5 /* RadioButton */, EAC925852911C9DE00091998 /* TextFields */, EA5E304A294CBDBB0082B959 /* TileContainer */, - EA5E3056295105930082B959 /* Tilet */, + EA5E3056295105930082B959 /* Tilelet */, EA5E30512950DD8D0082B959 /* TitleLockup */, EA3361A0288B1E6F0071C351 /* Toggle */, ); @@ -498,16 +498,16 @@ path = TitleLockup; sourceTree = ""; }; - EA5E3056295105930082B959 /* Tilet */ = { + EA5E3056295105930082B959 /* Tilelet */ = { isa = PBXGroup; children = ( - EA5E3057295105A40082B959 /* Tilet.swift */, - EA985BE529688F6A00F2FF2E /* TiletBadgeModel.swift */, - EA985BE929689B6D00F2FF2E /* TiletSubTitleModel.swift */, - EA985BE72968951C00F2FF2E /* TiletTitleModel.swift */, - EA985C2C296F03FE00F2FF2E /* TiletIconModels.swift */, + EA5E3057295105A40082B959 /* Tilelet.swift */, + EA985BE529688F6A00F2FF2E /* TileletBadgeModel.swift */, + EA985BE929689B6D00F2FF2E /* TileletSubTitleModel.swift */, + EA985BE72968951C00F2FF2E /* TileletTitleModel.swift */, + EA985C2C296F03FE00F2FF2E /* TileletIconModels.swift */, ); - path = Tilet; + path = Tilelet; sourceTree = ""; }; EA89200B28B530F0006B9984 /* RadioBox */ = { @@ -753,7 +753,7 @@ EAF7F0B5289C126F00B287F5 /* UILabel.swift in Sources */, EA5E304C294CBDD00082B959 /* TileContainer.swift in Sources */, EAF7F0A6289B0CE000B287F5 /* Resetable.swift in Sources */, - EA985C2D296F03FE00F2FF2E /* TiletIconModels.swift in Sources */, + EA985C2D296F03FE00F2FF2E /* TileletIconModels.swift in Sources */, EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */, EA3361C328902D960071C351 /* Toggle.swift in Sources */, EAF7F0A0289AB7EC00B287F5 /* View.swift in Sources */, @@ -780,8 +780,8 @@ EAB1D2CD28ABE76100DAE764 /* Withable.swift in Sources */, EAC846F3294B95CE00F685BA /* ButtonGroupCollectionViewCell.swift in Sources */, EAF7F0952899861000B287F5 /* Checkbox.swift in Sources */, - EA985BE82968951C00F2FF2E /* TiletTitleModel.swift in Sources */, - EA985BEA29689B6D00F2FF2E /* TiletSubTitleModel.swift in Sources */, + EA985BE82968951C00F2FF2E /* TileletTitleModel.swift in Sources */, + EA985BEA29689B6D00F2FF2E /* TileletSubTitleModel.swift in Sources */, EA3361C9289054C50071C351 /* Surfaceable.swift in Sources */, EAB5FEED2927E1B200998C17 /* ButtonGroupPositionLayout.swift in Sources */, EA4DB30228DCBCA500103EE3 /* Badge.swift in Sources */, @@ -801,7 +801,7 @@ EAF7F0A2289AFB3900B287F5 /* Errorable.swift in Sources */, EAB5FEF829393A7200998C17 /* ButtonGroupConstants.swift in Sources */, EA3361AF288B26310071C351 /* FormFieldable.swift in Sources */, - EA5E3058295105A40082B959 /* Tilet.swift in Sources */, + EA5E3058295105A40082B959 /* Tilelet.swift in Sources */, EA5E304E294CC7F00082B959 /* VDSColor.swift in Sources */, EA89201528B56CF4006B9984 /* RadioBoxGroup.swift in Sources */, EAF7F09E289AAEC000B287F5 /* Constants.swift in Sources */, @@ -811,7 +811,7 @@ EA89200228AECF2A006B9984 /* UIButton+Publisher.swift in Sources */, EAF7F0AB289B13FD00B287F5 /* TextStyleLabelAttribute.swift in Sources */, EAB1D29C28A5618900DAE764 /* RadioButtonGroup.swift in Sources */, - EA985BE629688F6A00F2FF2E /* TiletBadgeModel.swift in Sources */, + EA985BE629688F6A00F2FF2E /* TileletBadgeModel.swift in Sources */, EA336171288B19200071C351 /* VDS.docc in Sources */, EA985BF02968A93600F2FF2E /* TitleLockupEyebrowModel.swift in Sources */, EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */, diff --git a/VDS/Components/Tilet/Tilet.swift b/VDS/Components/Tilelet/Tilelet.swift similarity index 99% rename from VDS/Components/Tilet/Tilet.swift rename to VDS/Components/Tilelet/Tilelet.swift index 700a9f38..8ad347e8 100644 --- a/VDS/Components/Tilet/Tilet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -10,8 +10,8 @@ import Foundation import VDSColorTokens import UIKit -@objc(VDSTilet) -open class Tilet: TileContainer { +@objc(VDSTilelet) +open class Tilelet: TileContainer { //-------------------------------------------------- // MARK: - Enums //-------------------------------------------------- diff --git a/VDS/Components/Tilet/TiletBadgeModel.swift b/VDS/Components/Tilelet/TileletBadgeModel.swift similarity index 70% rename from VDS/Components/Tilet/TiletBadgeModel.swift rename to VDS/Components/Tilelet/TileletBadgeModel.swift index 43e68abb..a9dbd875 100644 --- a/VDS/Components/Tilet/TiletBadgeModel.swift +++ b/VDS/Components/Tilelet/TileletBadgeModel.swift @@ -7,7 +7,7 @@ import Foundation -extension Tilet { +extension Tilelet { public struct BadgeModel: Codable { public var text: String = "" public var fillColor: Badge.FillColor = .red @@ -24,12 +24,12 @@ extension Tilet { } public init(from decoder: Decoder) throws { - let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilet.BadgeModel.CodingKeys.self) - self.text = try container.decode(String.self, forKey: Tilet.BadgeModel.CodingKeys.text) - self.fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: Tilet.BadgeModel.CodingKeys.fillColor) ?? .red - self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilet.BadgeModel.CodingKeys.surface) ?? .light - self.numberOfLines = try container.decodeIfPresent(Int.self, forKey: Tilet.BadgeModel.CodingKeys.numberOfLines) ?? 0 - self.maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: Tilet.BadgeModel.CodingKeys.maxWidth) + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilelet.BadgeModel.CodingKeys.self) + self.text = try container.decode(String.self, forKey: Tilelet.BadgeModel.CodingKeys.text) + self.fillColor = try container.decodeIfPresent(Badge.FillColor.self, forKey: Tilelet.BadgeModel.CodingKeys.fillColor) ?? .red + self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilelet.BadgeModel.CodingKeys.surface) ?? .light + self.numberOfLines = try container.decodeIfPresent(Int.self, forKey: Tilelet.BadgeModel.CodingKeys.numberOfLines) ?? 0 + self.maxWidth = try container.decodeIfPresent(CGFloat.self, forKey: Tilelet.BadgeModel.CodingKeys.maxWidth) } } } diff --git a/VDS/Components/Tilet/TiletIconModels.swift b/VDS/Components/Tilelet/TileletIconModels.swift similarity index 65% rename from VDS/Components/Tilet/TiletIconModels.swift rename to VDS/Components/Tilelet/TileletIconModels.swift index a462199b..d4f8caf1 100644 --- a/VDS/Components/Tilet/TiletIconModels.swift +++ b/VDS/Components/Tilelet/TileletIconModels.swift @@ -8,7 +8,7 @@ import Foundation import UIKit -extension Tilet { +extension Tilelet { public struct DescriptiveIcon: Codable { public var name: Icon.Name = .multipleDocuments @@ -22,10 +22,10 @@ extension Tilet { } public init(from decoder: Decoder) throws { - let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilet.DescriptiveIcon.CodingKeys.self) - self.name = try container.decodeIfPresent(Icon.Name.self, forKey: Tilet.DescriptiveIcon.CodingKeys.name) ?? .multipleDocuments - 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 + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilelet.DescriptiveIcon.CodingKeys.self) + self.name = try container.decodeIfPresent(Icon.Name.self, forKey: Tilelet.DescriptiveIcon.CodingKeys.name) ?? .multipleDocuments + self.size = try container.decodeIfPresent(Icon.Size.self, forKey: Tilelet.DescriptiveIcon.CodingKeys.size) ?? .medium + self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilelet.DescriptiveIcon.CodingKeys.surface) ?? .dark } } @@ -39,9 +39,9 @@ extension Tilet { } public init(from decoder: Decoder) throws { - let container: KeyedDecodingContainer = 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 + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilelet.DirectionalIcon.CodingKeys.self) + self.size = try container.decodeIfPresent(Icon.Size.self, forKey: Tilelet.DirectionalIcon.CodingKeys.size) ?? .medium + self.surface = try container.decodeIfPresent(Surface.self, forKey: Tilelet.DirectionalIcon.CodingKeys.surface) ?? .dark } } } diff --git a/VDS/Components/Tilet/TiletSubTitleModel.swift b/VDS/Components/Tilelet/TileletSubTitleModel.swift similarity index 82% rename from VDS/Components/Tilet/TiletSubTitleModel.swift rename to VDS/Components/Tilelet/TileletSubTitleModel.swift index 52213926..0c9078c3 100644 --- a/VDS/Components/Tilet/TiletSubTitleModel.swift +++ b/VDS/Components/Tilelet/TileletSubTitleModel.swift @@ -7,7 +7,7 @@ import Foundation -extension Tilet { +extension Tilelet { public struct SubTitleModel: Codable { //-------------------------------------------------- // MARK: - Enums @@ -52,10 +52,10 @@ extension Tilet { } public init(from decoder: Decoder) throws { - let container: KeyedDecodingContainer = 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 + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilelet.SubTitleModel.CodingKeys.self) + self.text = try container.decode(String.self, forKey: Tilelet.SubTitleModel.CodingKeys.text) + self.textStyle = try container.decodeIfPresent(Tilelet.SubTitleModel.TextStyle.self, forKey: Tilelet.SubTitleModel.CodingKeys.textStyle) ?? .bodySmall + self.textColor = try container.decodeIfPresent(Use.self, forKey: Tilelet.SubTitleModel.CodingKeys.textColor) ?? .primary } } } diff --git a/VDS/Components/Tilet/TiletTitleModel.swift b/VDS/Components/Tilelet/TileletTitleModel.swift similarity index 83% rename from VDS/Components/Tilet/TiletTitleModel.swift rename to VDS/Components/Tilelet/TileletTitleModel.swift index dbb89289..404574e5 100644 --- a/VDS/Components/Tilet/TiletTitleModel.swift +++ b/VDS/Components/Tilelet/TileletTitleModel.swift @@ -7,7 +7,7 @@ import Foundation -extension Tilet { +extension Tilelet { public struct TitleModel: Codable { //-------------------------------------------------- // MARK: - Enums @@ -50,9 +50,9 @@ extension Tilet { } public init(from decoder: Decoder) throws { - let container: KeyedDecodingContainer = 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 + let container: KeyedDecodingContainer = try decoder.container(keyedBy: Tilelet.TitleModel.CodingKeys.self) + self.text = try container.decode(String.self, forKey: Tilelet.TitleModel.CodingKeys.text) + self.textStyle = try container.decodeIfPresent(Tilelet.TitleModel.TextStyle.self, forKey: Tilelet.TitleModel.CodingKeys.textStyle) ?? .boldTitleSmall } } }