From f0ec48a691d0542796831226fcbbb32b85c46ed8 Mon Sep 17 00:00:00 2001 From: Lekshmi S Date: Tue, 28 Apr 2020 13:23:49 +0530 Subject: [PATCH] Code changes and renaming files after confluence update. --- MVMCoreUI.xcodeproj/project.pbxproj | 16 +++++------ MVMCoreUI/Atomic/MoleculeObjectMapping.swift | 2 +- ...swift => HeadersH1LandingPageHeader.swift} | 28 +++++++++---------- ... => HeadersH1LandingPageHeaderModel.swift} | 6 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) rename MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/{HeadersH1Bill.swift => HeadersH1LandingPageHeader.swift} (78%) rename MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/{HeadersH1BillModel.swift => HeadersH1LandingPageHeaderModel.swift} (93%) diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 09269ac5..bd90b40d 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -191,8 +191,8 @@ 94F6516D2437954100631BF9 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94F6516C2437954100631BF9 /* Tabs.swift */; }; 94FB966223D797DA003D482B /* MFTextButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 94FB966023D797DA003D482B /* MFTextButton.h */; settings = {ATTRIBUTES = (Public, ); }; }; 94FB966323D797DA003D482B /* MFTextButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 94FB966123D797DA003D482B /* MFTextButton.m */; }; - AA104ADA244734DB004D2810 /* HeadersH1Bill.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104AD9244734DB004D2810 /* HeadersH1Bill.swift */; }; - AA104ADC244734EA004D2810 /* HeadersH1BillModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104ADB244734EA004D2810 /* HeadersH1BillModel.swift */; }; + AA104ADA244734DB004D2810 /* HeadersH1LandingPageHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104AD9244734DB004D2810 /* HeadersH1LandingPageHeader.swift */; }; + AA104ADC244734EA004D2810 /* HeadersH1LandingPageHeaderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104ADB244734EA004D2810 /* HeadersH1LandingPageHeaderModel.swift */; }; AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */; }; AA11A42123F15D7000D7962F /* ListRightVariablePaymentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */; }; AA1EC59724373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */; }; @@ -647,8 +647,8 @@ 94F6516C2437954100631BF9 /* Tabs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tabs.swift; sourceTree = ""; }; 94FB966023D797DA003D482B /* MFTextButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFTextButton.h; sourceTree = ""; }; 94FB966123D797DA003D482B /* MFTextButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFTextButton.m; sourceTree = ""; }; - AA104AD9244734DB004D2810 /* HeadersH1Bill.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1Bill.swift; sourceTree = ""; }; - AA104ADB244734EA004D2810 /* HeadersH1BillModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1BillModel.swift; sourceTree = ""; }; + AA104AD9244734DB004D2810 /* HeadersH1LandingPageHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1LandingPageHeader.swift; sourceTree = ""; }; + AA104ADB244734EA004D2810 /* HeadersH1LandingPageHeaderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1LandingPageHeaderModel.swift; sourceTree = ""; }; AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePayments.swift; sourceTree = ""; }; AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePaymentsModel.swift; sourceTree = ""; }; AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnSpeedTestDividerModel.swift; sourceTree = ""; }; @@ -1055,8 +1055,8 @@ children = ( AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */, AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */, - AA104AD9244734DB004D2810 /* HeadersH1Bill.swift */, - AA104ADB244734EA004D2810 /* HeadersH1BillModel.swift */, + AA104AD9244734DB004D2810 /* HeadersH1LandingPageHeader.swift */, + AA104ADB244734EA004D2810 /* HeadersH1LandingPageHeaderModel.swift */, ); path = Headers; sourceTree = ""; @@ -2283,7 +2283,7 @@ D2A92886241ACD99004E01C6 /* ProgrammaticTableViewController.swift in Sources */, BBAA4F05243D8E3B005AAD5F /* RadioBoxesModel.swift in Sources */, 01509D952327ED1900EF99AA /* HeadlineBodyLinkToggle.swift in Sources */, - AA104ADA244734DB004D2810 /* HeadersH1Bill.swift in Sources */, + AA104ADA244734DB004D2810 /* HeadersH1LandingPageHeader.swift in Sources */, 31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */, D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */, 94F6516D2437954100631BF9 /* Tabs.swift in Sources */, @@ -2390,7 +2390,7 @@ 8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */, 0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */, 8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */, - AA104ADC244734EA004D2810 /* HeadersH1BillModel.swift in Sources */, + AA104ADC244734EA004D2810 /* HeadersH1LandingPageHeaderModel.swift in Sources */, BBAA4F03243D8E3B005AAD5F /* RadioBoxes.swift in Sources */, D2E1FAE12268E81D00AEFD8C /* MoleculeListTemplate.swift in Sources */, 525019E72406853600EED91C /* ListFourColumnDataUsageDivider.swift in Sources */, diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift index 3c60b5c7..0207c6f6 100644 --- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift +++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift @@ -169,7 +169,7 @@ import Foundation // Designed Headers MoleculeObjectMapping.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self) - MoleculeObjectMapping.shared()?.register(viewClass: HeadersH1Bill.self, viewModelClass: HeadersH1BillModel.self) + MoleculeObjectMapping.shared()?.register(viewClass: HeadersH1LandingPageHeader.self, viewModelClass: HeadersH1LandingPageHeaderModel.self) // Device Items MoleculeObjectMapping.shared()?.register(viewClass: ListDeviceComplexButtonMedium.self, viewModelClass: ListDeviceComplexButtonMediumModel.self) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Bill.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeader.swift similarity index 78% rename from MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Bill.swift rename to MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeader.swift index 73879617..8ab212b3 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Bill.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeader.swift @@ -1,5 +1,5 @@ // -// HeadersH1Bill.swift +// HeadersH1LandingPageHeader.swift // MVMCoreUI // // Created by Lekshmi S on 09/03/20. @@ -8,14 +8,14 @@ import Foundation -@objcMembers open class HeadersH1Bill: HeaderView { +@objcMembers open class HeadersH1LandingPageHeader: HeaderView { //-------------------------------------------------- // MARK: - Outlets //-------------------------------------------------- - let headline = Label.commonLabelH1(true) - let headline2 = Label.commonLabelH1(true) - let subHeadline = Label.commonLabelB3(true) - let body = Label.commonLabelB2(true) + let headline = Label.createLabelTitle2XLarge(true) + let headline2 = Label.createLabelTitle2XLarge(true) + let subHeadline = Label.createLabelBoldBodySmall(true) + let body = Label.createLabelRegularBodySmall(true) let link = Link() let buttons = TwoButtonView(frame: .zero) var stack = Stack(frame: .zero) @@ -23,10 +23,10 @@ import Foundation //-------------------------------------------------- // MARK: - Constants //-------------------------------------------------- - let spacingBetweenHeadlineHeadline2: CGFloat = 9.0 - let spacingBetweenHeadlin2esubHeadline: CGFloat = 24.0 + let spacingBetweenHeadlineHeadline2: CGFloat = 16.0 + let spacingBetweenHeadlin2esubHeadline: CGFloat = 32.0 let spacingBetweenSubHeadlineBodyLink: CGFloat = 8.0 - let spacingBetweenLinkButtons: CGFloat = 129.0 + let spacingBetweenLinkButtons: CGFloat = 128.0 //------------------------------------------------------- // MARK: - View Lifecycle @@ -44,7 +44,7 @@ import Foundation //------------------------------------------------------ open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { super.set(with: model, delegateObject, additionalData) - guard let model = model as? HeadersH1BillModel else { return } + guard let model = model as? HeadersH1LandingPageHeaderModel else { return } headline.set(with: model.headline, delegateObject, additionalData) headline2.set(with: model.headline2, delegateObject, additionalData) subHeadline.set(with: model.subHeadline, delegateObject, additionalData) @@ -59,10 +59,10 @@ import Foundation open override func reset() { super.reset() - headline.styleH1(true) - headline2.styleH1(true) - subHeadline.styleB3(true) - body.styleB2(true) + headline.styleTitle2XLarge(true) + headline2.styleTitle2XLarge(true) + subHeadline.styleBoldBodySmall(true) + body.styleRegularBodySmall(true) link.reset() buttons.reset() } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1BillModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeaderModel.swift similarity index 93% rename from MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1BillModel.swift rename to MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeaderModel.swift index d901b38c..d7603886 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1BillModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1LandingPageHeaderModel.swift @@ -1,5 +1,5 @@ // -// HeadersH1BillModel.swift +// HeadersH1LandingPageHeaderModel.swift // MVMCoreUI // // Created by Lekshmi S on 09/03/20. @@ -8,11 +8,11 @@ import Foundation -public class HeadersH1BillModel: HeaderModel, MoleculeModelProtocol { +public class HeadersH1LandingPageHeaderModel: HeaderModel, MoleculeModelProtocol { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - public static var identifier: String = "headerH1Bill" + public static var identifier: String = "headerH1Landing" public var headline: LabelModel public var headline2: LabelModel public var subHeadline: LabelModel