diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 07d944e2..361f74eb 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -595,10 +595,10 @@ EA5124FF2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */; }; EA7E67742758310500ABF773 /* EnableFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7E67732758310500ABF773 /* EnableFormFieldEffectModel.swift */; }; EA7E67762758365300ABF773 /* UIUpdatableModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7E67752758365300ABF773 /* UIUpdatableModelProtocol.swift */; }; + EA985C3E2970938F00F2FF2E /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3D2970938F00F2FF2E /* Tilelet.swift */; }; + EA985C402970939A00F2FF2E /* TileletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3F2970939A00F2FF2E /* TileletModel.swift */; }; EA985C602970A3F000F2FF2E /* VDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C5F2970A3F000F2FF2E /* VDS.framework */; }; EA985C642970A40E00F2FF2E /* VDSTypographyTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */; }; - EA985C3E2970938F00F2FF2E /* Tilet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3D2970938F00F2FF2E /* Tilet.swift */; }; - EA985C402970939A00F2FF2E /* TiletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3F2970939A00F2FF2E /* TiletModel.swift */; }; EAA0CFAF275E7D8000D65EB0 /* FormFieldEffectProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA0CFAE275E7D8000D65EB0 /* FormFieldEffectProtocol.swift */; }; EAA0CFB1275E823A00D65EB0 /* HideFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA0CFB0275E823A00D65EB0 /* HideFormFieldEffectModel.swift */; }; EAA0CFB3275E831E00D65EB0 /* DisableFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA0CFB2275E831E00D65EB0 /* DisableFormFieldEffectModel.swift */; }; @@ -1202,10 +1202,10 @@ EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageHeadlineBodyButtonModel.swift; sourceTree = ""; }; EA7E67732758310500ABF773 /* EnableFormFieldEffectModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnableFormFieldEffectModel.swift; sourceTree = ""; }; EA7E67752758365300ABF773 /* UIUpdatableModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIUpdatableModelProtocol.swift; sourceTree = ""; }; + EA985C3D2970938F00F2FF2E /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = ""; }; + EA985C3F2970939A00F2FF2E /* TileletModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileletModel.swift; sourceTree = ""; }; EA985C5F2970A3F000F2FF2E /* VDS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = VDS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTypographyTokens.xcframework; path = ../SharedFrameworks/VDSTypographyTokens.xcframework; sourceTree = ""; }; - EA985C3D2970938F00F2FF2E /* Tilet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilet.swift; sourceTree = ""; }; - EA985C3F2970939A00F2FF2E /* TiletModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TiletModel.swift; sourceTree = ""; }; EAA0CFAE275E7D8000D65EB0 /* FormFieldEffectProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormFieldEffectProtocol.swift; sourceTree = ""; }; EAA0CFB0275E823A00D65EB0 /* HideFormFieldEffectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HideFormFieldEffectModel.swift; sourceTree = ""; }; EAA0CFB2275E831E00D65EB0 /* DisableFormFieldEffectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisableFormFieldEffectModel.swift; sourceTree = ""; }; @@ -2269,8 +2269,8 @@ AA37CBD42519072F0027344C /* Stars.swift */, AA07EA902510A442009A2AE3 /* StarModel.swift */, AA07EA922510A451009A2AE3 /* Star.swift */, - EA985C3D2970938F00F2FF2E /* Tilet.swift */, - EA985C3F2970939A00F2FF2E /* TiletModel.swift */, + EA985C3D2970938F00F2FF2E /* Tilelet.swift */, + EA985C3F2970939A00F2FF2E /* TileletModel.swift */, ); path = Views; sourceTree = ""; @@ -2794,7 +2794,7 @@ D2E2A99D23DA3217000B42E6 /* UIStackViewAlignment+Extension.swift in Sources */, 01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */, D2A92884241ACB25004E01C6 /* ProgrammaticScrollViewController.swift in Sources */, - EA985C3E2970938F00F2FF2E /* Tilet.swift in Sources */, + EA985C3E2970938F00F2FF2E /* Tilelet.swift in Sources */, D23A90002612347A007E14CE /* PageBehaviorHandlerModelProtocol.swift in Sources */, EAA78020290081320057DFDF /* VDSMoleculeViewProtocol.swift in Sources */, 0A21DB7F235DECC500C160A2 /* EntryField.swift in Sources */, @@ -3189,7 +3189,7 @@ D29E28DD23D7404C00ACEA85 /* ContainerHelper.swift in Sources */, 012A88C2238D7BCA00FE3DA1 /* CarouselItemModel.swift in Sources */, 27F6B08C26052AFF008529AA /* ParentMoleculeModelProtocol.swift in Sources */, - EA985C402970939A00F2FF2E /* TiletModel.swift in Sources */, + EA985C402970939A00F2FF2E /* TileletModel.swift in Sources */, 0AB764D324460FA400E7FE72 /* UIPickerView+Extension.swift in Sources */, D29DF29E21E7AE3B003B2FB9 /* MFStyler.m in Sources */, 94C661D923CCF4B400D9FE5B /* LeftRightLabelModel.swift in Sources */, diff --git a/MVMCoreUI/Atomic/Atoms/Views/Tilet.swift b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift similarity index 93% rename from MVMCoreUI/Atomic/Atoms/Views/Tilet.swift rename to MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift index 71fe0190..4d7a32e1 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Tilet.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift @@ -13,11 +13,11 @@ import VDS /** This class expects its height and width to be equal. */ -open class Tilet: VDS.Tilet, VDSMoleculeViewProtocol { +open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - public var viewModel: TiletModel! + public var viewModel: TileletModel! public var delegateObject: MVMCoreUIDelegateObject? public var additionalData: [AnyHashable: Any]? diff --git a/MVMCoreUI/Atomic/Atoms/Views/TiletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift similarity index 68% rename from MVMCoreUI/Atomic/Atoms/Views/TiletModel.swift rename to MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift index c3720b2b..f9a35c43 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TiletModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift @@ -9,21 +9,21 @@ import Foundation import VDS -open class TiletModel: MoleculeModelProtocol { +open class TileletModel: MoleculeModelProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - public static var identifier: String = "tilet" + public static var identifier: String = "tilelet" public var backgroundColor: Color? public var color: TileContainer.BackgroundColor public var padding: TileContainer.Padding public var aspectRatio: TileContainer.AspectRatio - public var badge: Tilet.BadgeModel? - public var title: Tilet.TitleModel? - public var subTitle: Tilet.SubTitleModel? - public var descriptiveIcon: Tilet.DescriptiveIcon? - public var directionalIcon: Tilet.DirectionalIcon? + public var badge: Tilelet.BadgeModel? + public var title: Tilelet.TitleModel? + public var subTitle: Tilelet.SubTitleModel? + public var descriptiveIcon: Tilelet.DescriptiveIcon? + public var directionalIcon: Tilelet.DirectionalIcon? public var width: CGFloat? public var textWidth: CGFloat? public var textPercentage: CGFloat? @@ -34,11 +34,11 @@ open class TiletModel: MoleculeModelProtocol { self.color = try container.decodeIfPresent(TileContainer.BackgroundColor.self, forKey: .color) ?? TileContainer.BackgroundColor.black self.padding = try container.decodeIfPresent(TileContainer.Padding.self, forKey: .padding) ?? TileContainer.Padding.padding4X self.aspectRatio = try container.decodeIfPresent(TileContainer.AspectRatio.self, forKey: .aspectRatio) ?? TileContainer.AspectRatio.none - self.badge = try container.decodeIfPresent(Tilet.BadgeModel.self, forKey: .badge) - self.title = try container.decodeIfPresent(Tilet.TitleModel.self, forKey: .title) - self.subTitle = try container.decodeIfPresent(Tilet.SubTitleModel.self, forKey: .subTitle) - self.descriptiveIcon = try container.decodeIfPresent(Tilet.DescriptiveIcon.self, forKey: .descriptiveIcon) - self.directionalIcon = try container.decodeIfPresent(Tilet.DirectionalIcon.self, forKey: .directionalIcon) ?? Tilet.DirectionalIcon.init(size: .medium, surface: .dark) + self.badge = try container.decodeIfPresent(Tilelet.BadgeModel.self, forKey: .badge) + self.title = try container.decodeIfPresent(Tilelet.TitleModel.self, forKey: .title) + self.subTitle = try container.decodeIfPresent(Tilelet.SubTitleModel.self, forKey: .subTitle) + self.descriptiveIcon = try container.decodeIfPresent(Tilelet.DescriptiveIcon.self, forKey: .descriptiveIcon) + self.directionalIcon = try container.decodeIfPresent(Tilelet.DirectionalIcon.self, forKey: .directionalIcon) self.width = try container.decodeIfPresent(CGFloat.self, forKey: .width) self.textWidth = try container.decodeIfPresent(CGFloat.self, forKey: .textWidth) self.textPercentage = try container.decodeIfPresent(CGFloat.self, forKey: .textPercentage) diff --git a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift index 49451313..c27553ec 100644 --- a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift +++ b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift @@ -71,7 +71,7 @@ open class CoreUIModelMapping: ModelMapping { ModelRegistry.register(handler: WebView.self, for: WebViewModel.self) ModelRegistry.register(handler: LoadingSpinner.self, for: LoadingSpinnerModel.self) ModelRegistry.register(handler: Video.self, for: VideoModel.self) - ModelRegistry.register(handler: Tilet.self, for: TiletModel.self) + ModelRegistry.register(handler: Tilelet.self, for: TileletModel.self) // MARK:- Horizontal Combination Molecules ModelRegistry.register(handler: StringAndMoleculeView.self, for: StringAndMoleculeModel.self)