From 1242a10d4142b70dea73ab8beead011cd695ca27 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 12 Jan 2023 10:04:28 -0600 Subject: [PATCH 1/7] updated tilecontainer default background Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/TileContainerViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift index 013dc4e..7e8b1fb 100644 --- a/VDSSample/ViewControllers/TileContainerViewController.swift +++ b/VDSSample/ViewControllers/TileContainerViewController.swift @@ -51,6 +51,7 @@ class TileContainerViewController: BaseViewController { super.viewDidLoad() addContentTopView(view: .makeWrapper(for: tileContainer)) tileContainer.width = 150 + tileContainer.containerBackgroundColor = .black setupForm() setupPicker() setupModel() @@ -134,6 +135,7 @@ class TileContainerViewController: BaseViewController { func setupModel() { //setup UI surfacePickerSelectorView.text = tileContainer.surface.rawValue + backgroundColorPickerSelectorView.text = tileContainer.containerBackgroundColor.rawValue paddingPickerSelectorView.text = tileContainer.containerPadding.rawValue scalingTypePickerSelectorView.text = tileContainer.aspectRatio.rawValue widthTextField.text = tileContainer.width != nil ? "\(tileContainer.width!)" : "" From 2223945509dc3c7b182fc819d547c476729044f4 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 09:49:40 -0600 Subject: [PATCH 2/7] fixed enums Signed-off-by: Matt Bruce --- .../TileContainerViewController.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift index 7e8b1fb..73af2fc 100644 --- a/VDSSample/ViewControllers/TileContainerViewController.swift +++ b/VDSSample/ViewControllers/TileContainerViewController.swift @@ -16,7 +16,7 @@ class TileContainerViewController: BaseViewController { lazy var backgroundColorPickerSelectorView = { PickerSelectorView(title: "white", picker: self.picker, - items: TileContainer.ContainerBackgroundColor.allCases) + items: TileContainer.BackgroundColor.allCases) }() lazy var imageFallbackColorPickerSelectorView = { @@ -26,13 +26,13 @@ class TileContainerViewController: BaseViewController { lazy var paddingPickerSelectorView = { PickerSelectorView(title: "16", picker: self.picker, - items: TileContainer.ContainerPadding.allCases) + items: TileContainer.Padding.allCases) }() lazy var scalingTypePickerSelectorView = { PickerSelectorView(title: "white", picker: self.picker, - items: TileContainer.ContainerScalingType.allCases) + items: TileContainer.AspectRatio.allCases) }() var clickableSwitch = Toggle() @@ -51,7 +51,7 @@ class TileContainerViewController: BaseViewController { super.viewDidLoad() addContentTopView(view: .makeWrapper(for: tileContainer)) tileContainer.width = 150 - tileContainer.containerBackgroundColor = .black + tileContainer.color = .black setupForm() setupPicker() setupModel() @@ -135,8 +135,8 @@ class TileContainerViewController: BaseViewController { func setupModel() { //setup UI surfacePickerSelectorView.text = tileContainer.surface.rawValue - backgroundColorPickerSelectorView.text = tileContainer.containerBackgroundColor.rawValue - paddingPickerSelectorView.text = tileContainer.containerPadding.rawValue + backgroundColorPickerSelectorView.text = tileContainer.color.rawValue + paddingPickerSelectorView.text = tileContainer.padding.rawValue scalingTypePickerSelectorView.text = tileContainer.aspectRatio.rawValue widthTextField.text = tileContainer.width != nil ? "\(tileContainer.width!)" : "" heightTextField.text = tileContainer.height != nil ? "\(tileContainer.height!)" : "" @@ -150,7 +150,7 @@ class TileContainerViewController: BaseViewController { } backgroundColorPickerSelectorView.onPickerDidSelect = { [weak self] item in - self?.tileContainer.containerBackgroundColor = item + self?.tileContainer.color = item } scalingTypePickerSelectorView.onPickerDidSelect = { [weak self] item in @@ -158,7 +158,7 @@ class TileContainerViewController: BaseViewController { } paddingPickerSelectorView.onPickerDidSelect = { [weak self] item in - self?.tileContainer.containerPadding = item + self?.tileContainer.padding = item } imageFallbackColorPickerSelectorView.onPickerDidSelect = { [weak self] item in From ce0d759ca0ef7c837889c1b502596328633ff03c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 09:51:53 -0600 Subject: [PATCH 3/7] refactored enums for badge Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/BadgeViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift index 1ff1d0d..7b101df 100644 --- a/VDSSample/ViewControllers/BadgeViewController.swift +++ b/VDSSample/ViewControllers/BadgeViewController.swift @@ -40,7 +40,7 @@ class BadgeViewController: BaseViewController { lazy var fillColorPickerSelectorView = { PickerSelectorView(title: "red", picker: self.picker, - items: BadgeFillColor.allCases) + items: Badge.FillColor.allCases) }() lazy var numberOfLinesPickerSelectorView = { From 403dce1fe62bb9f5d28108668da47b70e56648d2 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 10:02:38 -0600 Subject: [PATCH 4/7] refactored enums Signed-off-by: Matt Bruce --- .../ViewControllers/ButtonGroupViewController.swift | 6 +++--- .../ViewControllers/TextLinkCaretViewController.swift | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift index c88dad1..c2cb635 100644 --- a/VDSSample/ViewControllers/ButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift @@ -48,9 +48,9 @@ class ButtonGroupViewController: BaseViewController { } lazy var buttonPositionSelectorView = { - PickerSelectorView(title: "", - picker: self.picker, - items: ButtonPosition.allCases) + PickerSelectorView(title: "", + picker: self.picker, + items: ButtonGroup.ButtonPosition.allCases) }() lazy var rowQuantitySelectorView = { diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift index 739e69d..389d0da 100644 --- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift +++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift @@ -14,17 +14,17 @@ class TextLinkCaretViewController: BaseViewController { lazy var caretPositionPickerSelectorView = { PickerSelectorView(title: "", - picker: self.picker, - items: TextLinkCaretPosition.allCases) + picker: self.picker, + items: TextLinkCaret.IconPosition.allCases) }() - + var label = Label() var disabledSwitch = Toggle() var textField = TextField() lazy var textLinkCaret: TextLinkCaret = { - makeTextLinkCaret("Text Link Caret", label: label) + makeTextLinkCaret("Text Link Caret", label: label) }() - + override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: .makeWrapper(for: textLinkCaret)) From 04561fb77906b707318e8d11f97ba3d2eda6eba9 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 13:33:02 -0600 Subject: [PATCH 5/7] refactored for the VDS changes of enums and such Signed-off-by: Matt Bruce --- VDSSample/Extensions/IconName.swift | 964 +++++++++--------- .../ViewControllers/IconViewController.swift | 20 +- .../InputFieldViewController.swift | 4 +- .../ViewControllers/TiletViewController.swift | 12 +- .../TitleLockupViewController.swift | 24 +- .../ToggleViewController.swift | 4 +- 6 files changed, 513 insertions(+), 515 deletions(-) diff --git a/VDSSample/Extensions/IconName.swift b/VDSSample/Extensions/IconName.swift index 07a817c..92cc565 100644 --- a/VDSSample/Extensions/IconName.swift +++ b/VDSSample/Extensions/IconName.swift @@ -1,5 +1,5 @@ // -// IconName.swift +// Name.swift // VDSSample // // Created by Matt Bruce on 1/10/23. @@ -7,512 +7,510 @@ import Foundation import VDS - -extension IconName { +extension Icon.Name { + //accessibility - static let accessibility = IconName(name: "accessibility") - static let americanSignLanguage = IconName(name: "american-sign-language") - static let assistedListeningSystems = IconName(name: "assisted-listening-systems") - static let audioDescription = IconName(name: "audio-description") - static let blind = IconName(name: "blind") - static let braille = IconName(name: "braille") - static let brightness = IconName(name: "brightness") - static let closedCaptioning = IconName(name: "closed-captioning") - static let closedCaptioningFill = IconName(name: "closed-captioning-fill") - static let cognitiveDisability = IconName(name: "cognitive-disability") - static let deaf = IconName(name: "deaf") - static let internationalSymbolOfAccess = IconName(name: "international-symbol-of-access") - static let openCaptioning = IconName(name: "open-captioning") - static let phoneVolume = IconName(name: "phone-volume") - static let teletype = IconName(name: "teletype") - static let textToSpeech = IconName(name: "text-to-speech") + static let accessibility = Icon.Name(name: "accessibility") + static let americanSignLanguage = Icon.Name(name: "american-sign-language") + static let assistedListeningSystems = Icon.Name(name: "assisted-listening-systems") + static let audioDescription = Icon.Name(name: "audio-description") + static let blind = Icon.Name(name: "blind") + static let braille = Icon.Name(name: "braille") + static let brightness = Icon.Name(name: "brightness") + static let closedCaptioning = Icon.Name(name: "closed-captioning") + static let closedCaptioningFill = Icon.Name(name: "closed-captioning-fill") + static let cognitiveDisability = Icon.Name(name: "cognitive-disability") + static let deaf = Icon.Name(name: "deaf") + static let internationalSymbolOfAccess = Icon.Name(name: "international-symbol-of-access") + static let openCaptioning = Icon.Name(name: "open-captioning") + static let phoneVolume = Icon.Name(name: "phone-volume") + static let teletype = Icon.Name(name: "teletype") + static let textToSpeech = Icon.Name(name: "text-to-speech") //b2b - static let assetTracking = IconName(name: "asset-tracking") - static let businessContinuity = IconName(name: "business-continuity") - static let conditionBasedMaintenance = IconName(name: "condition-based-maintenance") - static let conditionBasedWrench = IconName(name: "condition-based-wrench") - static let constructionHammer = IconName(name: "construction-hammer") - static let constructionTruck = IconName(name: "construction-truck") - static let digitalSignageCar = IconName(name: "digital-signage-car") - static let digitalSignage = IconName(name: "digital-signage") - static let droneCamera = IconName(name: "drone-camera") - static let educationCurriculum = IconName(name: "education-curriculum") - static let education = IconName(name: "education") - static let electricPower = IconName(name: "electric-power") - static let electricUtility = IconName(name: "electric-utility") - static let energyScience = IconName(name: "energy-science") - static let energyUtilities = IconName(name: "energy-utilities") - static let enterprise = IconName(name: "enterprise") - static let federalDefense = IconName(name: "federal-defense") - static let financial = IconName(name: "financial") - static let fleetTracking = IconName(name: "fleet-tracking") - static let fleet = IconName(name: "fleet") - static let gas = IconName(name: "gas") - static let government = IconName(name: "government") - static let group = IconName(name: "group") - static let growth = IconName(name: "growth") - static let hackers = IconName(name: "hackers") - static let healthcareCorporate = IconName(name: "healthcare-corporate") - static let healthcareGeneral = IconName(name: "healthcare-general") - static let healthcareWorker = IconName(name: "healthcare-worker") - static let ideasSolutions = IconName(name: "ideas-solutions") - static let inclusivity = IconName(name: "inclusivity") - static let industry = IconName(name: "industry") - static let insurance = IconName(name: "insurance") - static let intelligentTracking = IconName(name: "intelligent-tracking") - static let internetOfThings = IconName(name: "internet-of-things") - static let joinCall = IconName(name: "join-call") - static let k12Education = IconName(name: "k12-education") - static let laptopAntivirus = IconName(name: "laptop-antivirus") - static let laptopControls = IconName(name: "laptop-controls") - static let laptopGpsTracking = IconName(name: "laptop-gps-tracking") - static let laptopSettings = IconName(name: "laptop-settings") - static let laptopTrends = IconName(name: "laptop-trends") - static let laptopWireless = IconName(name: "laptop-wireless") - static let law = IconName(name: "law") - static let lmr = IconName(name: "lmr") - static let loyaltyRetention = IconName(name: "loyalty-retention") - static let manufacturing = IconName(name: "manufacturing") - static let mediaEntertainment = IconName(name: "media-entertainment") - static let mediumBusiness = IconName(name: "medium-business") - static let mobileCommandCenter = IconName(name: "mobile-command-center") - static let mobileKioskInfo = IconName(name: "mobile-kiosk-info") - static let mobileKioskWireless = IconName(name: "mobile-kiosk-wireless") - static let mobileRetail = IconName(name: "mobile-retail") - static let mobileSearch = IconName(name: "mobile-search") - static let mobileWorkforceManagement = IconName(name: "mobile-workforce-management") - static let network = IconName(name: "network") - static let networkAttachedStorage = IconName(name: "network-attached-storage") - static let officePhoneSystem = IconName(name: "office-phone-system") - static let oilIndustry = IconName(name: "oil-industry") - static let operationalTransformation = IconName(name: "operational-transformation") - static let pharmaceutical = IconName(name: "pharmaceutical") - static let pharmacy = IconName(name: "pharmacy") - static let planner = IconName(name: "planner") - static let powerUtility = IconName(name: "power-utility") - static let professionalServices = IconName(name: "professional-services") - static let qualityAssurance = IconName(name: "quality-assurance") - static let realEstate = IconName(name: "real-estate") - static let regulatoryCompliance = IconName(name: "regulatory-compliance") - static let retail = IconName(name: "retail") - static let security = IconName(name: "security") - static let securitySolution = IconName(name: "security-solution") - static let smarthouse = IconName(name: "smarthouse") - static let socialMedia = IconName(name: "social-media") - static let software = IconName(name: "software") - static let solarPower = IconName(name: "solar-power") - static let solutions = IconName(name: "solutions") - static let supplyChain = IconName(name: "supply-chain") - static let systemIntegration = IconName(name: "system-integration") - static let telecommunications = IconName(name: "telecommunications") - static let telemedicine = IconName(name: "telemedicine") - static let telemetry = IconName(name: "telemetry") - static let thermodynamics = IconName(name: "thermodynamics") - static let trends = IconName(name: "trends") - static let utilityWorker = IconName(name: "utility-worker") - static let vehicleTracking = IconName(name: "vehicle-tracking") - static let warehouseManagement = IconName(name: "warehouse-management") - static let waterIndustry = IconName(name: "water-industry") - static let wellness = IconName(name: "wellness") + static let assetTracking = Icon.Name(name: "asset-tracking") + static let businessContinuity = Icon.Name(name: "business-continuity") + static let conditionBasedMaintenance = Icon.Name(name: "condition-based-maintenance") + static let conditionBasedWrench = Icon.Name(name: "condition-based-wrench") + static let constructionHammer = Icon.Name(name: "construction-hammer") + static let constructionTruck = Icon.Name(name: "construction-truck") + static let digitalSignageCar = Icon.Name(name: "digital-signage-car") + static let digitalSignage = Icon.Name(name: "digital-signage") + static let droneCamera = Icon.Name(name: "drone-camera") + static let educationCurriculum = Icon.Name(name: "education-curriculum") + static let education = Icon.Name(name: "education") + static let electricPower = Icon.Name(name: "electric-power") + static let electricUtility = Icon.Name(name: "electric-utility") + static let energyScience = Icon.Name(name: "energy-science") + static let energyUtilities = Icon.Name(name: "energy-utilities") + static let enterprise = Icon.Name(name: "enterprise") + static let federalDefense = Icon.Name(name: "federal-defense") + static let financial = Icon.Name(name: "financial") + static let fleetTracking = Icon.Name(name: "fleet-tracking") + static let fleet = Icon.Name(name: "fleet") + static let gas = Icon.Name(name: "gas") + static let government = Icon.Name(name: "government") + static let group = Icon.Name(name: "group") + static let growth = Icon.Name(name: "growth") + static let hackers = Icon.Name(name: "hackers") + static let healthcareCorporate = Icon.Name(name: "healthcare-corporate") + static let healthcareGeneral = Icon.Name(name: "healthcare-general") + static let healthcareWorker = Icon.Name(name: "healthcare-worker") + static let ideasSolutions = Icon.Name(name: "ideas-solutions") + static let inclusivity = Icon.Name(name: "inclusivity") + static let industry = Icon.Name(name: "industry") + static let insurance = Icon.Name(name: "insurance") + static let intelligentTracking = Icon.Name(name: "intelligent-tracking") + static let internetOfThings = Icon.Name(name: "internet-of-things") + static let joinCall = Icon.Name(name: "join-call") + static let k12Education = Icon.Name(name: "k12-education") + static let laptopAntivirus = Icon.Name(name: "laptop-antivirus") + static let laptopControls = Icon.Name(name: "laptop-controls") + static let laptopGpsTracking = Icon.Name(name: "laptop-gps-tracking") + static let laptopSettings = Icon.Name(name: "laptop-settings") + static let laptopTrends = Icon.Name(name: "laptop-trends") + static let laptopWireless = Icon.Name(name: "laptop-wireless") + static let law = Icon.Name(name: "law") + static let lmr = Icon.Name(name: "lmr") + static let loyaltyRetention = Icon.Name(name: "loyalty-retention") + static let manufacturing = Icon.Name(name: "manufacturing") + static let mediaEntertainment = Icon.Name(name: "media-entertainment") + static let mediumBusiness = Icon.Name(name: "medium-business") + static let mobileCommandCenter = Icon.Name(name: "mobile-command-center") + static let mobileKioskInfo = Icon.Name(name: "mobile-kiosk-info") + static let mobileKioskWireless = Icon.Name(name: "mobile-kiosk-wireless") + static let mobileRetail = Icon.Name(name: "mobile-retail") + static let mobileSearch = Icon.Name(name: "mobile-search") + static let mobileWorkforceManagement = Icon.Name(name: "mobile-workforce-management") + static let network = Icon.Name(name: "network") + static let networkAttachedStorage = Icon.Name(name: "network-attached-storage") + static let officePhoneSystem = Icon.Name(name: "office-phone-system") + static let oilIndustry = Icon.Name(name: "oil-industry") + static let operationalTransformation = Icon.Name(name: "operational-transformation") + static let pharmaceutical = Icon.Name(name: "pharmaceutical") + static let pharmacy = Icon.Name(name: "pharmacy") + static let planner = Icon.Name(name: "planner") + static let powerUtility = Icon.Name(name: "power-utility") + static let professionalServices = Icon.Name(name: "professional-services") + static let qualityAssurance = Icon.Name(name: "quality-assurance") + static let realEstate = Icon.Name(name: "real-estate") + static let regulatoryCompliance = Icon.Name(name: "regulatory-compliance") + static let retail = Icon.Name(name: "retail") + static let security = Icon.Name(name: "security") + static let securitySolution = Icon.Name(name: "security-solution") + static let smarthouse = Icon.Name(name: "smarthouse") + static let socialMedia = Icon.Name(name: "social-media") + static let software = Icon.Name(name: "software") + static let solarPower = Icon.Name(name: "solar-power") + static let solutions = Icon.Name(name: "solutions") + static let supplyChain = Icon.Name(name: "supply-chain") + static let systemIntegration = Icon.Name(name: "system-integration") + static let telecommunications = Icon.Name(name: "telecommunications") + static let telemedicine = Icon.Name(name: "telemedicine") + static let telemetry = Icon.Name(name: "telemetry") + static let thermodynamics = Icon.Name(name: "thermodynamics") + static let trends = Icon.Name(name: "trends") + static let utilityWorker = Icon.Name(name: "utility-worker") + static let vehicleTracking = Icon.Name(name: "vehicle-tracking") + static let warehouseManagement = Icon.Name(name: "warehouse-management") + static let waterIndustry = Icon.Name(name: "water-industry") + static let wellness = Icon.Name(name: "wellness") //directional - static let upCaret = IconName(name: "up-caret") - static let closeAlt = IconName(name: "close-alt") - static let close = IconName(name: "close") - static let downArrow = IconName(name: "down-arrow") - static let downCaret = IconName(name: "down-caret") - static let evenMoreFlexibility = IconName(name: "even-more-flexibility") - static let flexibilityRectangles = IconName(name: "flexibility-rectangles") - static let flexibility = IconName(name: "flexibility") - static let gateway = IconName(name: "gateway") - static let minus = IconName(name: "minus") - static let moreFlexibility = IconName(name: "more-flexibility") - static let noOff = IconName(name: "no-off") - static let no = IconName(name: "no") - static let plus = IconName(name: "plus") - static let swipeLeft = IconName(name: "swipe-left") - static let swipeRight = IconName(name: "swipe-right") - static let swipe = IconName(name: "swipe") - static let `switch` = IconName(name: "switch") - static let upArrow = IconName(name: "up-arrow") + static let upCaret = Icon.Name(name: "up-caret") + static let closeAlt = Icon.Name(name: "close-alt") + static let close = Icon.Name(name: "close") + static let downArrow = Icon.Name(name: "down-arrow") + static let downCaret = Icon.Name(name: "down-caret") + static let evenMoreFlexibility = Icon.Name(name: "even-more-flexibility") + static let flexibilityRectangles = Icon.Name(name: "flexibility-rectangles") + static let flexibility = Icon.Name(name: "flexibility") + static let gateway = Icon.Name(name: "gateway") + static let minus = Icon.Name(name: "minus") + static let moreFlexibility = Icon.Name(name: "more-flexibility") + static let noOff = Icon.Name(name: "no-off") + static let no = Icon.Name(name: "no") + static let plus = Icon.Name(name: "plus") + static let swipeLeft = Icon.Name(name: "swipe-left") + static let swipeRight = Icon.Name(name: "swipe-right") + static let swipe = Icon.Name(name: "swipe") + static let `switch` = Icon.Name(name: "switch") + static let upArrow = Icon.Name(name: "up-arrow") //international - static let internationalLongDistance = IconName(name: "international-long-distance") - static let international = IconName(name: "international") - static let travelPass = IconName(name: "travel-pass") - static let tripPlanner = IconName(name: "trip-planner") + static let internationalLongDistance = Icon.Name(name: "international-long-distance") + static let international = Icon.Name(name: "international") + static let travelPass = Icon.Name(name: "travel-pass") + static let tripPlanner = Icon.Name(name: "trip-planner") //navigational - static let advancedSettings = IconName(name: "advanced-settings") - static let agentChat = IconName(name: "agent-chat") - static let bookmark = IconName(name: "bookmark") - static let chat = IconName(name: "chat") - static let filterOff = IconName(name: "filter-off") - static let filter = IconName(name: "filter") - static let list = IconName(name: "list") - static let lockClosed = IconName(name: "lock-closed") - static let lockOpen = IconName(name: "lock-open") - static let logout = IconName(name: "logout") - static let menu = IconName(name: "menu") - static let moreHorizontal = IconName(name: "more-horizontal") - static let myAccount = IconName(name: "my-account") - static let realTimeTracking = IconName(name: "real-time-tracking") - static let search = IconName(name: "search") - static let settings = IconName(name: "settings") - static let supportDrawer = IconName(name: "support-drawer") - static let support = IconName(name: "support") - static let userRegistration = IconName(name: "user-registration") + static let advancedSettings = Icon.Name(name: "advanced-settings") + static let agentChat = Icon.Name(name: "agent-chat") + static let bookmark = Icon.Name(name: "bookmark") + static let chat = Icon.Name(name: "chat") + static let filterOff = Icon.Name(name: "filter-off") + static let filter = Icon.Name(name: "filter") + static let list = Icon.Name(name: "list") + static let lockClosed = Icon.Name(name: "lock-closed") + static let lockOpen = Icon.Name(name: "lock-open") + static let logout = Icon.Name(name: "logout") + static let menu = Icon.Name(name: "menu") + static let moreHorizontal = Icon.Name(name: "more-horizontal") + static let myAccount = Icon.Name(name: "my-account") + static let realTimeTracking = Icon.Name(name: "real-time-tracking") + static let search = Icon.Name(name: "search") + static let settings = Icon.Name(name: "settings") + static let supportDrawer = Icon.Name(name: "support-drawer") + static let support = Icon.Name(name: "support") + static let userRegistration = Icon.Name(name: "user-registration") //nofication_feedback - static let alertNotification = IconName(name: "alert-notification") - static let checkmarkAlt = IconName(name: "checkmark-alt") - static let checkmark = IconName(name: "checkmark") - static let clock = IconName(name: "clock") - static let error = IconName(name: "error") - static let feedback = IconName(name: "feedback") - static let loader = IconName(name: "loader") - static let notification = IconName(name: "notification") - static let notificationsOff = IconName(name: "notifications-off") - static let notifyMe = IconName(name: "notify-me") - static let pushNotification = IconName(name: "push-notification") - static let remindMe = IconName(name: "remind-me") - static let reminder = IconName(name: "reminder") - static let securityAlert = IconName(name: "security-alert") - static let securityCheck = IconName(name: "security-check") - static let securityKeyhole = IconName(name: "security-keyhole") - static let securityWireless = IconName(name: "security-wireless") - static let snooze = IconName(name: "snooze") - static let speedMonitoring = IconName(name: "speed-monitoring") - static let starOff = IconName(name: "star-off") - static let star = IconName(name: "star") - static let sync = IconName(name: "sync") - static let timer = IconName(name: "timer") - static let warning = IconName(name: "warning") + static let alertNotification = Icon.Name(name: "alert-notification") + static let checkmarkAlt = Icon.Name(name: "checkmark-alt") + static let checkmark = Icon.Name(name: "checkmark") + static let clock = Icon.Name(name: "clock") + static let error = Icon.Name(name: "error") + static let feedback = Icon.Name(name: "feedback") + static let loader = Icon.Name(name: "loader") + static let notification = Icon.Name(name: "notification") + static let notificationsOff = Icon.Name(name: "notifications-off") + static let notifyMe = Icon.Name(name: "notify-me") + static let pushNotification = Icon.Name(name: "push-notification") + static let remindMe = Icon.Name(name: "remind-me") + static let reminder = Icon.Name(name: "reminder") + static let securityAlert = Icon.Name(name: "security-alert") + static let securityCheck = Icon.Name(name: "security-check") + static let securityKeyhole = Icon.Name(name: "security-keyhole") + static let securityWireless = Icon.Name(name: "security-wireless") + static let snooze = Icon.Name(name: "snooze") + static let speedMonitoring = Icon.Name(name: "speed-monitoring") + static let starOff = Icon.Name(name: "star-off") + static let star = Icon.Name(name: "star") + static let sync = Icon.Name(name: "sync") + static let timer = Icon.Name(name: "timer") + static let warning = Icon.Name(name: "warning") //objects_industry - static let ctr = IconName(name: "ctr") - static let passenger = IconName(name: "passenger") - static let tvContent = IconName(name: "tv-content") - static let urlTransparency = IconName(name: "url-transparency") - static let adaptiveSpeaker = IconName(name: "adaptive-speaker") - static let adTechStack = IconName(name: "ad-tech-stack") - static let agricultureLeaves = IconName(name: "agriculture-leaves") - static let agricultureTractor = IconName(name: "agriculture-tractor") - static let agricultureVineyard = IconName(name: "agriculture-vineyard") - static let airport = IconName(name: "airport") - static let airConditioner = IconName(name: "air-conditioner") - static let audienceTargetedSearch = IconName(name: "audience-targeted-search") - static let award = IconName(name: "award") - static let babyMonitor = IconName(name: "baby-monitor") - static let bestPractices = IconName(name: "best-practices") - static let bid = IconName(name: "bid") - static let bot = IconName(name: "bot") - static let cellTower = IconName(name: "cell-tower") - static let cloudDocument = IconName(name: "cloud-document") - static let coffee = IconName(name: "coffee") - static let coin = IconName(name: "coin") - static let complianceDocument = IconName(name: "compliance-document") - static let conversion = IconName(name: "conversion") - static let countDown = IconName(name: "count-down") - static let crossDeviceTargeting = IconName(name: "cross-device-targeting") - static let crossDevice = IconName(name: "cross-device") - static let customAudience = IconName(name: "custom-audience") - static let digitalContent = IconName(name: "digital-content") - static let dining = IconName(name: "dining") - static let display = IconName(name: "display") - static let domainTargeting = IconName(name: "domain-targeting") - static let doorbell = IconName(name: "doorbell") - static let driver = IconName(name: "driver") - static let euro = IconName(name: "euro") - static let expense = IconName(name: "expense") - static let faceCovering = IconName(name: "face-covering") - static let fineArt = IconName(name: "fine-art") - static let flag = IconName(name: "flag") - static let flurry = IconName(name: "flurry") - static let fridge = IconName(name: "fridge") - static let gaming = IconName(name: "gaming") - static let geofence = IconName(name: "geofence") - static let home = IconName(name: "home") - static let identityGraph = IconName(name: "identity-graph") - static let impressionVideo = IconName(name: "impression-video") - static let inferredIdentity = IconName(name: "inferred-identity") - static let irobot = IconName(name: "irobot") - static let ironingBoard = IconName(name: "ironing-board") - static let kidsStroller = IconName(name: "kids-stroller") - static let levers = IconName(name: "levers") - static let mobilePlusTv = IconName(name: "mobile-plus-tv") - static let mobileRetargeting = IconName(name: "mobile-retargeting") - static let motionDetector = IconName(name: "motion-detector") - static let music = IconName(name: "music") - static let nativeVideo = IconName(name: "native-video") - static let native = IconName(name: "native") - static let onGoCar = IconName(name: "on-go-car") - static let packBackpack = IconName(name: "pack-backpack") - static let packLuggage = IconName(name: "pack-luggage") - static let packPurse = IconName(name: "pack-purse") - static let petsCollar = IconName(name: "pets-collar") - static let realTime = IconName(name: "real-time") - static let research = IconName(name: "research") - static let retailStore = IconName(name: "retail-store") - static let retargeting = IconName(name: "retargeting") - static let schoolNotebook = IconName(name: "school-notebook") - static let singleDocument = IconName(name: "single-document") - static let smartFamilyChildAddressBook = IconName(name: "smart-family-child-address-book") - static let smartScooter = IconName(name: "smart-scooter") - static let smokeDetector = IconName(name: "smoke-detector") - static let solarPanel = IconName(name: "solar-panel") - static let sportsBike = IconName(name: "sports-bike") - static let sportsSkis = IconName(name: "sports-skis") - static let sportsSoccer = IconName(name: "sports-soccer") - static let sportsTennis = IconName(name: "sports-tennis") - static let stadiumAlt = IconName(name: "stadium-alt") - static let stadiumFlag = IconName(name: "stadium-flag") - static let thermostatTech = IconName(name: "thermostat-tech") - static let ticket = IconName(name: "ticket") - static let tradingDeck = IconName(name: "trading-deck") - static let traffic = IconName(name: "traffic") - static let travelKeys = IconName(name: "travel-keys") - static let trumpet = IconName(name: "trumpet") - static let unification = IconName(name: "unification") - static let visibility = IconName(name: "visibility") - static let weights = IconName(name: "weights") - static let yield = IconName(name: "yield") + static let ctr = Icon.Name(name: "ctr") + static let passenger = Icon.Name(name: "passenger") + static let tvContent = Icon.Name(name: "tv-content") + static let urlTransparency = Icon.Name(name: "url-transparency") + static let adaptiveSpeaker = Icon.Name(name: "adaptive-speaker") + static let adTechStack = Icon.Name(name: "ad-tech-stack") + static let agricultureLeaves = Icon.Name(name: "agriculture-leaves") + static let agricultureTractor = Icon.Name(name: "agriculture-tractor") + static let agricultureVineyard = Icon.Name(name: "agriculture-vineyard") + static let airport = Icon.Name(name: "airport") + static let airConditioner = Icon.Name(name: "air-conditioner") + static let audienceTargetedSearch = Icon.Name(name: "audience-targeted-search") + static let award = Icon.Name(name: "award") + static let babyMonitor = Icon.Name(name: "baby-monitor") + static let bestPractices = Icon.Name(name: "best-practices") + static let bid = Icon.Name(name: "bid") + static let bot = Icon.Name(name: "bot") + static let cellTower = Icon.Name(name: "cell-tower") + static let cloudDocument = Icon.Name(name: "cloud-document") + static let coffee = Icon.Name(name: "coffee") + static let coin = Icon.Name(name: "coin") + static let complianceDocument = Icon.Name(name: "compliance-document") + static let conversion = Icon.Name(name: "conversion") + static let countDown = Icon.Name(name: "count-down") + static let crossDeviceTargeting = Icon.Name(name: "cross-device-targeting") + static let crossDevice = Icon.Name(name: "cross-device") + static let customAudience = Icon.Name(name: "custom-audience") + static let digitalContent = Icon.Name(name: "digital-content") + static let dining = Icon.Name(name: "dining") + static let display = Icon.Name(name: "display") + static let domainTargeting = Icon.Name(name: "domain-targeting") + static let doorbell = Icon.Name(name: "doorbell") + static let driver = Icon.Name(name: "driver") + static let euro = Icon.Name(name: "euro") + static let expense = Icon.Name(name: "expense") + static let faceCovering = Icon.Name(name: "face-covering") + static let fineArt = Icon.Name(name: "fine-art") + static let flag = Icon.Name(name: "flag") + static let flurry = Icon.Name(name: "flurry") + static let fridge = Icon.Name(name: "fridge") + static let gaming = Icon.Name(name: "gaming") + static let geofence = Icon.Name(name: "geofence") + static let home = Icon.Name(name: "home") + static let identityGraph = Icon.Name(name: "identity-graph") + static let impressionVideo = Icon.Name(name: "impression-video") + static let inferredIdentity = Icon.Name(name: "inferred-identity") + static let irobot = Icon.Name(name: "irobot") + static let ironingBoard = Icon.Name(name: "ironing-board") + static let kidsStroller = Icon.Name(name: "kids-stroller") + static let levers = Icon.Name(name: "levers") + static let mobilePlusTv = Icon.Name(name: "mobile-plus-tv") + static let mobileRetargeting = Icon.Name(name: "mobile-retargeting") + static let motionDetector = Icon.Name(name: "motion-detector") + static let music = Icon.Name(name: "music") + static let nativeVideo = Icon.Name(name: "native-video") + static let native = Icon.Name(name: "native") + static let onGoCar = Icon.Name(name: "on-go-car") + static let packBackpack = Icon.Name(name: "pack-backpack") + static let packLuggage = Icon.Name(name: "pack-luggage") + static let packPurse = Icon.Name(name: "pack-purse") + static let petsCollar = Icon.Name(name: "pets-collar") + static let realTime = Icon.Name(name: "real-time") + static let research = Icon.Name(name: "research") + static let retailStore = Icon.Name(name: "retail-store") + static let retargeting = Icon.Name(name: "retargeting") + static let schoolNotebook = Icon.Name(name: "school-notebook") + static let singleDocument = Icon.Name(name: "single-document") + static let smartFamilyChildAddressBook = Icon.Name(name: "smart-family-child-address-book") + static let smartScooter = Icon.Name(name: "smart-scooter") + static let smokeDetector = Icon.Name(name: "smoke-detector") + static let solarPanel = Icon.Name(name: "solar-panel") + static let sportsBike = Icon.Name(name: "sports-bike") + static let sportsSkis = Icon.Name(name: "sports-skis") + static let sportsSoccer = Icon.Name(name: "sports-soccer") + static let sportsTennis = Icon.Name(name: "sports-tennis") + static let stadiumAlt = Icon.Name(name: "stadium-alt") + static let stadiumFlag = Icon.Name(name: "stadium-flag") + static let thermostatTech = Icon.Name(name: "thermostat-tech") + static let ticket = Icon.Name(name: "ticket") + static let tradingDeck = Icon.Name(name: "trading-deck") + static let traffic = Icon.Name(name: "traffic") + static let travelKeys = Icon.Name(name: "travel-keys") + static let trumpet = Icon.Name(name: "trumpet") + static let unification = Icon.Name(name: "unification") + static let visibility = Icon.Name(name: "visibility") + static let weights = Icon.Name(name: "weights") + static let yield = Icon.Name(name: "yield") //orders_pricing - static let addToFavorite = IconName(name: "add-to-favorite") - static let addedToFavorite = IconName(name: "added-to-favorite") - static let billDown = IconName(name: "bill-down") - static let billUp = IconName(name: "bill-up") - static let camera = IconName(name: "camera") - static let creditCard = IconName(name: "credit-card") - static let gift = IconName(name: "gift") - static let inStorePickup = IconName(name: "in-store-pickup") - static let noFee = IconName(name: "no-fee") - static let oneYear = IconName(name: "one-year") - static let orders = IconName(name: "orders") - static let outOfStock = IconName(name: "out-of-stock") - static let reoccuringPayment = IconName(name: "reoccuring-payment") - static let reservations = IconName(name: "reservations") - static let returns = IconName(name: "returns") - static let rewards = IconName(name: "rewards") - static let shipping = IconName(name: "shipping") - static let shoppingBag = IconName(name: "shopping-bag") - static let shopping = IconName(name: "shopping") - static let tag = IconName(name: "tag") - static let taxes = IconName(name: "taxes") + static let addToFavorite = Icon.Name(name: "add-to-favorite") + static let addedToFavorite = Icon.Name(name: "added-to-favorite") + static let billDown = Icon.Name(name: "bill-down") + static let billUp = Icon.Name(name: "bill-up") + static let camera = Icon.Name(name: "camera") + static let creditCard = Icon.Name(name: "credit-card") + static let gift = Icon.Name(name: "gift") + static let inStorePickup = Icon.Name(name: "in-store-pickup") + static let noFee = Icon.Name(name: "no-fee") + static let oneYear = Icon.Name(name: "one-year") + static let orders = Icon.Name(name: "orders") + static let outOfStock = Icon.Name(name: "out-of-stock") + static let reoccuringPayment = Icon.Name(name: "reoccuring-payment") + static let reservations = Icon.Name(name: "reservations") + static let returns = Icon.Name(name: "returns") + static let rewards = Icon.Name(name: "rewards") + static let shipping = Icon.Name(name: "shipping") + static let shoppingBag = Icon.Name(name: "shopping-bag") + static let shopping = Icon.Name(name: "shopping") + static let tag = Icon.Name(name: "tag") + static let taxes = Icon.Name(name: "taxes") //other - static let growthOpportunities = IconName(name: "growth-opportunities") - static let noSmoking = IconName(name: "no-smoking") - static let socialDistancing = IconName(name: "social-distancing") + static let growthOpportunities = Icon.Name(name: "growth-opportunities") + static let noSmoking = Icon.Name(name: "no-smoking") + static let socialDistancing = Icon.Name(name: "social-distancing") //plans_other - static let battery = IconName(name: "battery") - static let bonusData = IconName(name: "bonus-data") - static let bringYourOwnDevice = IconName(name: "bring-your-own-device") - static let callerId = IconName(name: "caller-id") - static let carryoverData = IconName(name: "carryover-data") - static let compass = IconName(name: "compass") - static let connect = IconName(name: "connect") - static let dataBoost = IconName(name: "data-boost") - static let deviceProtection = IconName(name: "device-protection") - static let devicesAddons = IconName(name: "devices-addons") - static let embeddedSound = IconName(name: "embedded-sound") - static let findMyRemote = IconName(name: "find-my-remote") - static let giftedData = IconName(name: "gifted-data") - static let homeInternet = IconName(name: "home-internet") - static let internetDevices = IconName(name: "internet-devices") - static let largePlan = IconName(name: "large-plan") - static let mediumPlan = IconName(name: "medium-plan") - static let mobileApps = IconName(name: "mobile-apps") - static let mobileHotspot = IconName(name: "mobile-hotspot") - static let multipleDeviceProtection = IconName(name: "multiple-device-protection") - static let multipleDevices = IconName(name: "multiple-devices") - static let nationWide = IconName(name: "nation-wide") - static let phoneAlt = IconName(name: "phone-alt") - static let purchaseData = IconName(name: "purchase-data") - static let router = IconName(name: "router") - static let simCard = IconName(name: "sim-card") - static let smallPlan = IconName(name: "small-plan") - static let smartAssistant = IconName(name: "smart-assistant") - static let sound = IconName(name: "sound") - static let tablet = IconName(name: "tablet") - static let techLaptop = IconName(name: "tech-laptop") - static let techPhone = IconName(name: "tech-phone") - static let totalMobileProtection = IconName(name: "total-mobile-protection") - static let unlimitedPlan = IconName(name: "unlimited-plan") - static let uplink = IconName(name: "uplink") - static let videoOnTablet = IconName(name: "video-on-tablet") - static let waterResistant = IconName(name: "water-resistant") - static let wearable = IconName(name: "wearable") + static let battery = Icon.Name(name: "battery") + static let bonusData = Icon.Name(name: "bonus-data") + static let bringYourOwnDevice = Icon.Name(name: "bring-your-own-device") + static let callerId = Icon.Name(name: "caller-id") + static let carryoverData = Icon.Name(name: "carryover-data") + static let compass = Icon.Name(name: "compass") + static let connect = Icon.Name(name: "connect") + static let dataBoost = Icon.Name(name: "data-boost") + static let deviceProtection = Icon.Name(name: "device-protection") + static let devicesAddons = Icon.Name(name: "devices-addons") + static let embeddedSound = Icon.Name(name: "embedded-sound") + static let findMyRemote = Icon.Name(name: "find-my-remote") + static let giftedData = Icon.Name(name: "gifted-data") + static let homeInternet = Icon.Name(name: "home-internet") + static let internetDevices = Icon.Name(name: "internet-devices") + static let largePlan = Icon.Name(name: "large-plan") + static let mediumPlan = Icon.Name(name: "medium-plan") + static let mobileApps = Icon.Name(name: "mobile-apps") + static let mobileHotspot = Icon.Name(name: "mobile-hotspot") + static let multipleDeviceProtection = Icon.Name(name: "multiple-device-protection") + static let multipleDevices = Icon.Name(name: "multiple-devices") + static let nationWide = Icon.Name(name: "nation-wide") + static let phoneAlt = Icon.Name(name: "phone-alt") + static let purchaseData = Icon.Name(name: "purchase-data") + static let router = Icon.Name(name: "router") + static let simCard = Icon.Name(name: "sim-card") + static let smallPlan = Icon.Name(name: "small-plan") + static let smartAssistant = Icon.Name(name: "smart-assistant") + static let sound = Icon.Name(name: "sound") + static let tablet = Icon.Name(name: "tablet") + static let techLaptop = Icon.Name(name: "tech-laptop") + static let techPhone = Icon.Name(name: "tech-phone") + static let totalMobileProtection = Icon.Name(name: "total-mobile-protection") + static let unlimitedPlan = Icon.Name(name: "unlimited-plan") + static let uplink = Icon.Name(name: "uplink") + static let videoOnTablet = Icon.Name(name: "video-on-tablet") + static let waterResistant = Icon.Name(name: "water-resistant") + static let wearable = Icon.Name(name: "wearable") //social - static let at = IconName(name: "at") - static let facebook = IconName(name: "facebook") - static let instagram = IconName(name: "instagram") - static let twitter = IconName(name: "twitter") - static let youtube = IconName(name: "youtube") + static let at = Icon.Name(name: "at") + static let facebook = Icon.Name(name: "facebook") + static let instagram = Icon.Name(name: "instagram") + static let twitter = Icon.Name(name: "twitter") + static let youtube = Icon.Name(name: "youtube") //utilities - static let ThreeDAd = IconName(name: "3d-ad") - static let ar = IconName(name: "ar") - static let addFolder = IconName(name: "add-folder") - static let addUser = IconName(name: "add-user") - static let analytics = IconName(name: "analytics") - static let announcement = IconName(name: "announcement") - static let archive = IconName(name: "archive") - static let artboard = IconName(name: "artboard") - static let attach = IconName(name: "attach") - static let awareness = IconName(name: "awareness") - static let barcode = IconName(name: "barcode") - static let bluetooth = IconName(name: "bluetooth") - static let boxOpen = IconName(name: "box-open") - static let calendar = IconName(name: "calendar") - static let calibrate = IconName(name: "calibrate") - static let callDisconnected = IconName(name: "call-disconnected") - static let cleanSurface = IconName(name: "clean-surface") - static let cloudAlt = IconName(name: "cloud-alt") - static let cloud = IconName(name: "cloud") - static let comparison = IconName(name: "comparison") - static let compose = IconName(name: "compose") - static let connectParts = IconName(name: "connect-parts") - static let consultativeTransfer = IconName(name: "consultative-transfer") - static let convergence = IconName(name: "convergence") - static let crop = IconName(name: "crop") - static let cta = IconName(name: "cta") - static let customize = IconName(name: "customize") - static let data = IconName(name: "data") - static let decrease = IconName(name: "decrease") - static let deviceActivity = IconName(name: "device-activity") - static let directCarrierBilling = IconName(name: "direct-carrier-billing") - static let directory = IconName(name: "directory") - static let displayUtilities = IconName(name: "display-utilities") - static let distribution = IconName(name: "distribution") - static let download = IconName(name: "download") - static let dragAndDrop = IconName(name: "drag-and-drop") - static let dropShipment = IconName(name: "drop-shipment") - static let duplicate = IconName(name: "duplicate") - static let edit = IconName(name: "edit") - static let email = IconName(name: "email") - static let emergencyContact = IconName(name: "emergency-contact") - static let emoji = IconName(name: "emoji") - static let externalLink = IconName(name: "external-link") - static let fallDetected = IconName(name: "fall-detected") - static let favorite = IconName(name: "favorite") - static let fax = IconName(name: "fax") - static let fingerprintSensor = IconName(name: "fingerprint-sensor") - static let fire = IconName(name: "fire") - static let fitToZone = IconName(name: "fit-to-zone") - static let flipCamera = IconName(name: "flip-camera") - static let forwardedCall = IconName(name: "forwarded-call") - static let fullscreen = IconName(name: "fullscreen") - static let getHelp = IconName(name: "get-help") - static let gridView = IconName(name: "grid-view") - static let history = IconName(name: "history") - static let humidity = IconName(name: "humidity") - static let incomingCall = IconName(name: "incoming-call") - static let increase = IconName(name: "increase") - static let info = IconName(name: "info") - static let inventory = IconName(name: "inventory") - static let invitationAccepted = IconName(name: "invitation-accepted") - static let invitationExpired = IconName(name: "invitation-expired") - static let invitationRejected = IconName(name: "invitation-rejected") - static let landscape = IconName(name: "landscape") - static let light = IconName(name: "light") - static let link = IconName(name: "link") - static let location = IconName(name: "location") - static let locationPin = IconName(name: "location-pin") - static let mapView = IconName(name: "map-view") - static let masonryView = IconName(name: "masonry-view") - static let maximize = IconName(name: "maximize") - static let mergeCalls = IconName(name: "merge-calls") - static let microphoneAlt = IconName(name: "microphone-alt") - static let microphone = IconName(name: "microphone") - static let missedCall = IconName(name: "missed-call") - static let moveTo = IconName(name: "move-to") - static let multicast = IconName(name: "multicast") - static let mute = IconName(name: "mute") - static let networkConnection = IconName(name: "network-connection") - static let news = IconName(name: "news") - static let next = IconName(name: "next") - static let nfcTag = IconName(name: "nfc-tag") - static let night = IconName(name: "night") - static let noVideo = IconName(name: "no-video") - static let onDemand = IconName(name: "on-demand") - static let outgoingCall = IconName(name: "outgoing-call") - static let paperFreeBilling = IconName(name: "paper-free-billing") - static let pauseInternet = IconName(name: "pause-internet") - static let pause = IconName(name: "pause") - static let peelSticker = IconName(name: "peel-sticker") - static let photo = IconName(name: "photo") - static let platform = IconName(name: "platform") - static let playAlt = IconName(name: "play-alt") - static let playWith = IconName(name: "play-with") - static let play = IconName(name: "play") - static let portrait = IconName(name: "portrait") - static let pressure = IconName(name: "pressure") - static let previous = IconName(name: "previous") - static let print = IconName(name: "print") - static let question = IconName(name: "question") - static let recycle = IconName(name: "recycle") - static let removeItem = IconName(name: "remove-item") - static let replaceAPhoto = IconName(name: "replace-a-photo") - static let reply = IconName(name: "reply") - static let ringing = IconName(name: "ringing") - static let ringtone = IconName(name: "ringtone") - static let riskMonitor = IconName(name: "risk-monitor") - static let rss = IconName(name: "rss") - static let satelliteOff = IconName(name: "satellite-off") - static let satellite = IconName(name: "satellite") - static let save = IconName(name: "save") - static let scaleAlt = IconName(name: "scale-alt") - static let scale = IconName(name: "scale") - static let sendMessage = IconName(name: "send-message") - static let setFallbackImage = IconName(name: "set-fallback-image") - static let setGalleryImage = IconName(name: "set-gallery-image") - static let share = IconName(name: "share") - static let shock = IconName(name: "shock") - static let signalBroadcast = IconName(name: "signal-broadcast") - static let speakerMute = IconName(name: "speaker-mute") - static let speakerPhone = IconName(name: "speaker-phone") - static let speed = IconName(name: "speed") - static let stakeholder = IconName(name: "stakeholder") - static let steps = IconName(name: "steps") - static let stop = IconName(name: "stop") - static let stopAlt = IconName(name: "stop-alt") - static let survey = IconName(name: "survey") - static let talking = IconName(name: "talking") - static let teamLeader = IconName(name: "team-leader") - static let temperature = IconName(name: "temperature") - static let template = IconName(name: "template") - static let theme = IconName(name: "theme") - static let thumbsDown = IconName(name: "thumbs-down") - static let thumbsUp = IconName(name: "thumbs-up") - static let tiles = IconName(name: "tiles") - static let tilt = IconName(name: "tilt") - static let tools = IconName(name: "tools") - static let trash = IconName(name: "trash") - static let turnonOff = IconName(name: "turnon-off") - static let tv = IconName(name: "tv") - static let upload = IconName(name: "upload") - static let userSettings = IconName(name: "user-settings") - static let vibration = IconName(name: "vibration") - static let video = IconName(name: "video") - static let volume = IconName(name: "volume") - static let volunteer = IconName(name: "volunteer") - static let virtualReality = IconName(name: "virtual-reality") - static let voiceHd = IconName(name: "voice-hd") - static let voiceMail = IconName(name: "voice-mail") - static let weather = IconName(name: "weather") - static let whiteBlackList = IconName(name: "white-black-list") - static let wifi = IconName(name: "wifi") - static let zoomIn = IconName(name: "zoom-in") - static let zoomOut = IconName(name: "zoom-out") -} + static let ThreeDAd = Icon.Name(name: "3d-ad") + static let ar = Icon.Name(name: "ar") + static let addFolder = Icon.Name(name: "add-folder") + static let addUser = Icon.Name(name: "add-user") + static let analytics = Icon.Name(name: "analytics") + static let announcement = Icon.Name(name: "announcement") + static let archive = Icon.Name(name: "archive") + static let artboard = Icon.Name(name: "artboard") + static let attach = Icon.Name(name: "attach") + static let awareness = Icon.Name(name: "awareness") + static let barcode = Icon.Name(name: "barcode") + static let bluetooth = Icon.Name(name: "bluetooth") + static let boxOpen = Icon.Name(name: "box-open") + static let calendar = Icon.Name(name: "calendar") + static let calibrate = Icon.Name(name: "calibrate") + static let callDisconnected = Icon.Name(name: "call-disconnected") + static let cleanSurface = Icon.Name(name: "clean-surface") + static let cloudAlt = Icon.Name(name: "cloud-alt") + static let cloud = Icon.Name(name: "cloud") + static let comparison = Icon.Name(name: "comparison") + static let compose = Icon.Name(name: "compose") + static let connectParts = Icon.Name(name: "connect-parts") + static let consultativeTransfer = Icon.Name(name: "consultative-transfer") + static let convergence = Icon.Name(name: "convergence") + static let crop = Icon.Name(name: "crop") + static let cta = Icon.Name(name: "cta") + static let customize = Icon.Name(name: "customize") + static let data = Icon.Name(name: "data") + static let decrease = Icon.Name(name: "decrease") + static let deviceActivity = Icon.Name(name: "device-activity") + static let directCarrierBilling = Icon.Name(name: "direct-carrier-billing") + static let directory = Icon.Name(name: "directory") + static let displayUtilities = Icon.Name(name: "display-utilities") + static let distribution = Icon.Name(name: "distribution") + static let download = Icon.Name(name: "download") + static let dragAndDrop = Icon.Name(name: "drag-and-drop") + static let dropShipment = Icon.Name(name: "drop-shipment") + static let duplicate = Icon.Name(name: "duplicate") + static let edit = Icon.Name(name: "edit") + static let email = Icon.Name(name: "email") + static let emergencyContact = Icon.Name(name: "emergency-contact") + static let emoji = Icon.Name(name: "emoji") + static let externalLink = Icon.Name(name: "external-link") + static let fallDetected = Icon.Name(name: "fall-detected") + static let favorite = Icon.Name(name: "favorite") + static let fax = Icon.Name(name: "fax") + static let fingerprintSensor = Icon.Name(name: "fingerprint-sensor") + static let fire = Icon.Name(name: "fire") + static let fitToZone = Icon.Name(name: "fit-to-zone") + static let flipCamera = Icon.Name(name: "flip-camera") + static let forwardedCall = Icon.Name(name: "forwarded-call") + static let fullscreen = Icon.Name(name: "fullscreen") + static let getHelp = Icon.Name(name: "get-help") + static let gridView = Icon.Name(name: "grid-view") + static let history = Icon.Name(name: "history") + static let humidity = Icon.Name(name: "humidity") + static let incomingCall = Icon.Name(name: "incoming-call") + static let increase = Icon.Name(name: "increase") + static let info = Icon.Name(name: "info") + static let inventory = Icon.Name(name: "inventory") + static let invitationAccepted = Icon.Name(name: "invitation-accepted") + static let invitationExpired = Icon.Name(name: "invitation-expired") + static let invitationRejected = Icon.Name(name: "invitation-rejected") + static let landscape = Icon.Name(name: "landscape") + static let light = Icon.Name(name: "light") + static let link = Icon.Name(name: "link") + static let location = Icon.Name(name: "location") + static let locationPin = Icon.Name(name: "location-pin") + static let mapView = Icon.Name(name: "map-view") + static let masonryView = Icon.Name(name: "masonry-view") + static let maximize = Icon.Name(name: "maximize") + static let mergeCalls = Icon.Name(name: "merge-calls") + static let microphoneAlt = Icon.Name(name: "microphone-alt") + static let microphone = Icon.Name(name: "microphone") + static let missedCall = Icon.Name(name: "missed-call") + static let moveTo = Icon.Name(name: "move-to") + static let multicast = Icon.Name(name: "multicast") + static let mute = Icon.Name(name: "mute") + static let networkConnection = Icon.Name(name: "network-connection") + static let news = Icon.Name(name: "news") + static let next = Icon.Name(name: "next") + static let nfcTag = Icon.Name(name: "nfc-tag") + static let night = Icon.Name(name: "night") + static let noVideo = Icon.Name(name: "no-video") + static let onDemand = Icon.Name(name: "on-demand") + static let outgoingCall = Icon.Name(name: "outgoing-call") + static let paperFreeBilling = Icon.Name(name: "paper-free-billing") + static let pauseInternet = Icon.Name(name: "pause-internet") + static let pause = Icon.Name(name: "pause") + static let peelSticker = Icon.Name(name: "peel-sticker") + static let photo = Icon.Name(name: "photo") + static let platform = Icon.Name(name: "platform") + static let playAlt = Icon.Name(name: "play-alt") + static let playWith = Icon.Name(name: "play-with") + static let play = Icon.Name(name: "play") + static let portrait = Icon.Name(name: "portrait") + static let pressure = Icon.Name(name: "pressure") + static let previous = Icon.Name(name: "previous") + static let print = Icon.Name(name: "print") + static let question = Icon.Name(name: "question") + static let recycle = Icon.Name(name: "recycle") + static let removeItem = Icon.Name(name: "remove-item") + static let replaceAPhoto = Icon.Name(name: "replace-a-photo") + static let reply = Icon.Name(name: "reply") + static let ringing = Icon.Name(name: "ringing") + static let ringtone = Icon.Name(name: "ringtone") + static let riskMonitor = Icon.Name(name: "risk-monitor") + static let rss = Icon.Name(name: "rss") + static let satelliteOff = Icon.Name(name: "satellite-off") + static let satellite = Icon.Name(name: "satellite") + static let save = Icon.Name(name: "save") + static let scaleAlt = Icon.Name(name: "scale-alt") + static let scale = Icon.Name(name: "scale") + static let sendMessage = Icon.Name(name: "send-message") + static let setFallbackImage = Icon.Name(name: "set-fallback-image") + static let setGalleryImage = Icon.Name(name: "set-gallery-image") + static let share = Icon.Name(name: "share") + static let shock = Icon.Name(name: "shock") + static let signalBroadcast = Icon.Name(name: "signal-broadcast") + static let speakerMute = Icon.Name(name: "speaker-mute") + static let speakerPhone = Icon.Name(name: "speaker-phone") + static let speed = Icon.Name(name: "speed") + static let stakeholder = Icon.Name(name: "stakeholder") + static let steps = Icon.Name(name: "steps") + static let stop = Icon.Name(name: "stop") + static let stopAlt = Icon.Name(name: "stop-alt") + static let survey = Icon.Name(name: "survey") + static let talking = Icon.Name(name: "talking") + static let teamLeader = Icon.Name(name: "team-leader") + static let temperature = Icon.Name(name: "temperature") + static let template = Icon.Name(name: "template") + static let theme = Icon.Name(name: "theme") + static let thumbsDown = Icon.Name(name: "thumbs-down") + static let thumbsUp = Icon.Name(name: "thumbs-up") + static let tiles = Icon.Name(name: "tiles") + static let tilt = Icon.Name(name: "tilt") + static let tools = Icon.Name(name: "tools") + static let trash = Icon.Name(name: "trash") + static let turnonOff = Icon.Name(name: "turnon-off") + static let tv = Icon.Name(name: "tv") + static let upload = Icon.Name(name: "upload") + static let userSettings = Icon.Name(name: "user-settings") + static let vibration = Icon.Name(name: "vibration") + static let video = Icon.Name(name: "video") + static let volume = Icon.Name(name: "volume") + static let volunteer = Icon.Name(name: "volunteer") + static let virtualReality = Icon.Name(name: "virtual-reality") + static let voiceHd = Icon.Name(name: "voice-hd") + static let voiceMail = Icon.Name(name: "voice-mail") + static let weather = Icon.Name(name: "weather") + static let whiteBlackList = Icon.Name(name: "white-black-list") + static let wifi = Icon.Name(name: "wifi") + static let zoomIn = Icon.Name(name: "zoom-in") + static let zoomOut = Icon.Name(name: "zoom-out") -extension IconName { - static let all: [IconName] = [ + static let all: [Icon.Name] = [ //accessibility .accessibility, .americanSignLanguage, .assistedListeningSystems, .audioDescription, .blind, .braille, .brightness, .closedCaptioning, .closedCaptioningFill, .cognitiveDisability, .deaf, .internationalSymbolOfAccess, .openCaptioning, .phoneVolume, .teletype, .textToSpeech, diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift index 63a0acd..8b63602 100644 --- a/VDSSample/ViewControllers/IconViewController.swift +++ b/VDSSample/ViewControllers/IconViewController.swift @@ -14,24 +14,24 @@ class IconViewController: BaseViewController { lazy var colorPickerSelectorView = { PickerSelectorView(title: "", - picker: self.picker, - items: IconColor.allCases) + picker: self.picker, + items: Icon.Color.allCases) }() lazy var namePickerSelectorView = { - PickerSelectorView(title: "", - picker: self.picker, - items: IconName.all.sorted{ $0.rawValue < $1.rawValue }) + PickerSelectorView(title: "", + picker: self.picker, + items: Icon.Name.all.sorted{ $0.rawValue < $1.rawValue }) }() - + lazy var sizePickerSelectorView = { PickerSelectorView(title: "", - picker: self.picker, - items: IconSize.allCases) + picker: self.picker, + items: Icon.Size.allCases) }() var icon = Icon() - + override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: .makeWrapper(for: icon)) @@ -48,7 +48,7 @@ class IconViewController: BaseViewController { } func setupModel() { - let name = IconName.accessibility + let name = Icon.Name.accessibility icon.color = .black icon.name = name diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift index 006573d..28197ee 100644 --- a/VDSSample/ViewControllers/InputFieldViewController.swift +++ b/VDSSample/ViewControllers/InputFieldViewController.swift @@ -15,8 +15,8 @@ class InputFieldViewController: BaseViewController { lazy var helperTextPlacementPickerSelectorView = { PickerSelectorView(title: "", - picker: self.picker, - items: HelperTextPlacement.allCases) + picker: self.picker, + items: InputField.HelperTextPlacement.allCases) }() var disabledSwitch = Toggle() diff --git a/VDSSample/ViewControllers/TiletViewController.swift b/VDSSample/ViewControllers/TiletViewController.swift index 57b5621..143094d 100644 --- a/VDSSample/ViewControllers/TiletViewController.swift +++ b/VDSSample/ViewControllers/TiletViewController.swift @@ -16,13 +16,13 @@ class TiletViewController: BaseViewController { lazy var titleTextStylePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: TiletTitleModel.TitleTypographicalStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) + items: TiletTitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) }() lazy var otherTextStylePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: TiletSubTitleModel.SubTitleTypographicalStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) + items: TiletSubTitleModel.TextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) }() lazy var subtitleColorPickerSelectorView = { @@ -183,8 +183,8 @@ class TiletViewController: BaseViewController { //setup UI surfacePickerSelectorView.text = tilet.surface.rawValue - otherTextStylePickerSelectorView.text = subTitleModel.typographicalStyle.rawValue - titleTextStylePickerSelectorView.text = titleModel.typographicalStyle.rawValue + otherTextStylePickerSelectorView.text = subTitleModel.textStyle.rawValue + titleTextStylePickerSelectorView.text = titleModel.textStyle.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue titleTextField.text = titleModel.text subTitleTextField.text = subTitleModel.text @@ -202,7 +202,7 @@ class TiletViewController: BaseViewController { func setTitleModel() { if let text = titleTextField.text, !text.isEmpty { - tilet.titleModel = TiletTitleModel(text: text, typographicalStyle: titleTextStylePickerSelectorView.selectedItem) + tilet.titleModel = TiletTitleModel(text: text, textStyle: titleTextStylePickerSelectorView.selectedItem) } else { tilet.titleModel = nil } @@ -210,7 +210,7 @@ class TiletViewController: BaseViewController { func setSubTitleModel() { if let text = subTitleTextField.text, !text.isEmpty { - tilet.subTitleModel = TiletSubTitleModel(text: text, typographicalStyle: otherTextStylePickerSelectorView.selectedItem) + tilet.subTitleModel = TiletSubTitleModel(text: text, textStyle: otherTextStylePickerSelectorView.selectedItem) } else { tilet.subTitleModel = nil } diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift index b8df89a..a5789f7 100644 --- a/VDSSample/ViewControllers/TitleLockupViewController.swift +++ b/VDSSample/ViewControllers/TitleLockupViewController.swift @@ -15,19 +15,19 @@ class TitleLockupViewController: BaseViewController { lazy var textPositionPickerSelectorView = { PickerSelectorView(title: "left", picker: self.picker, - items: TitleLockupTextPosition.allCases) + items: TitleLockup.TextPosition.allCases) }() lazy var titleTextStylePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: TitleLockupTitleTypographicalStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) + items: TitleLockup.TitleTextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) }() lazy var otherTextStylePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: TitleLockupOtherTypographicalStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) + items: TitleLockup.OtherTextStyle.allCases.sorted{ $0.rawValue < $1.rawValue }) }() lazy var subtitleColorPickerSelectorView = { @@ -86,9 +86,9 @@ class TitleLockupViewController: BaseViewController { } func setupModel() { - let eyebrowModel = TitleLockupEyebrowModel(text: "Today only.") - let titleModel = TitleLockupTitleModel(text: "Get more of our best") - let subTitleModel = TitleLockupSubTitleModel(text: "Get both of our best and pay less. Pair 5G Home Internet with Verizon mobile to save every month.") + let eyebrowModel = TitleLockup.EyebrowModel(text: "Today only.") + let titleModel = TitleLockup.TitleModel(text: "Get more of our best") + let subTitleModel = TitleLockup.SubTitleModel(text: "Get both of our best and pay less. Pair 5G Home Internet with Verizon mobile to save every month.") titleLockup.eyebrowModel = eyebrowModel titleLockup.titleModel = titleModel @@ -97,8 +97,8 @@ class TitleLockupViewController: BaseViewController { //setup UI surfacePickerSelectorView.text = titleLockup.surface.rawValue textPositionPickerSelectorView.text = titleLockup.textPosition.rawValue - otherTextStylePickerSelectorView.text = titleLockup.otherTypograpicalStyle.rawValue - titleTextStylePickerSelectorView.text = titleModel.typographicalStyle.rawValue + otherTextStylePickerSelectorView.text = titleLockup.otherTextStyle.rawValue + titleTextStylePickerSelectorView.text = titleModel.textStyle.rawValue subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue eyebrowTextField.text = eyebrowModel.text titleTextField.text = titleModel.text @@ -107,7 +107,7 @@ class TitleLockupViewController: BaseViewController { func setEyebrowModel() { if let text = eyebrowTextField.text, !text.isEmpty { - titleLockup.eyebrowModel = TitleLockupEyebrowModel(text: text) + titleLockup.eyebrowModel = TitleLockup.EyebrowModel(text: text) } else { titleLockup.eyebrowModel = nil } @@ -115,7 +115,7 @@ class TitleLockupViewController: BaseViewController { func setTitleModel() { if let text = titleTextField.text, !text.isEmpty { - titleLockup.titleModel = TitleLockupTitleModel(text: text, typographicalStyle: titleTextStylePickerSelectorView.selectedItem) + titleLockup.titleModel = TitleLockup.TitleModel(text: text, textStyle: titleTextStylePickerSelectorView.selectedItem) } else { titleLockup.titleModel = nil } @@ -123,7 +123,7 @@ class TitleLockupViewController: BaseViewController { func setSubTitleModel() { if let text = subTitleTextField.text, !text.isEmpty { - titleLockup.subTitleModel = TitleLockupSubTitleModel(text: text, textColor: subtitleColorPickerSelectorView.selectedItem) + titleLockup.subTitleModel = TitleLockup.SubTitleModel(text: text, textColor: subtitleColorPickerSelectorView.selectedItem) } else { titleLockup.subTitleModel = nil } @@ -145,7 +145,7 @@ class TitleLockupViewController: BaseViewController { } otherTextStylePickerSelectorView.onPickerDidSelect = { [weak self] item in - self?.titleLockup.otherTypograpicalStyle = item + self?.titleLockup.otherTextStyle = item } subtitleColorPickerSelectorView.onPickerDidSelect = { [weak self] item in diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift index 6bd5e63..9fbab2d 100644 --- a/VDSSample/ViewControllers/ToggleViewController.swift +++ b/VDSSample/ViewControllers/ToggleViewController.swift @@ -15,14 +15,14 @@ class ToggleViewController: BaseViewController { lazy var textSizePickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: ToggleTextSize.allCases) + items: Toggle.TextSize.allCases) }() lazy var textPositionPickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: ToggleTextPosition.allCases) + items: Toggle.TextPosition.allCases) }() var disabledSwitch = Toggle() From b7c250809bca7e3782c50faa1406c276adf8dd38 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 13:36:40 -0600 Subject: [PATCH 6/7] refactored to change typograpicalStyle to textStyle Signed-off-by: Matt Bruce --- VDSSample/Protocols/PickerBase.swift | 2 +- VDSSample/ViewControllers/BaseViewController.swift | 2 +- VDSSample/ViewControllers/ButtonGroupViewController.swift | 4 ++-- VDSSample/ViewControllers/LabelViewController.swift | 4 ++-- VDSSample/ViewControllers/MenuViewController.swift | 2 +- VDSSample/ViewControllers/TileContainerViewController.swift | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VDSSample/Protocols/PickerBase.swift b/VDSSample/Protocols/PickerBase.swift index ad564e2..23d83aa 100644 --- a/VDSSample/Protocols/PickerBase.swift +++ b/VDSSample/Protocols/PickerBase.swift @@ -37,7 +37,7 @@ public class PickerSelectorView: UIStackView, Picker fileprivate var selectedIndex = 0 private var subscribers = Set() private var label = Label().with { - $0.typograpicalStyle = .BodyLarge + $0.textStyle = .BodyLarge } public var selectedItem: EnumType { diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift index 1337731..321d394 100644 --- a/VDSSample/ViewControllers/BaseViewController.swift +++ b/VDSSample/ViewControllers/BaseViewController.swift @@ -170,7 +170,7 @@ public class BaseViewController: UIViewController, Initable { let label = Label().with { $0.text = label - $0.typograpicalStyle = .BodyLarge + $0.textStyle = .BodyLarge } formRow.addArrangedSubview(label) diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift index c2cb635..0949b7f 100644 --- a/VDSSample/ViewControllers/ButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift @@ -66,8 +66,8 @@ class ButtonGroupViewController: BaseViewController { let largeButtonGroup = ButtonGroup() let smallButtonGroup = ButtonGroup() - let largeLabel = Label().with{ $0.text = "Large Button Group"; $0.typograpicalStyle = .BoldTitleSmall } - let smallLabel = Label().with{ $0.text = "Small Button Group"; $0.typograpicalStyle = .BoldTitleSmall } + let largeLabel = Label().with{ $0.text = "Large Button Group"; $0.textStyle = .BoldTitleSmall } + let smallLabel = Label().with{ $0.text = "Small Button Group"; $0.textStyle = .BoldTitleSmall } override func allTextFields() -> [TextField]? { [widthTextField, percentageTextField] } diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift index ce40745..e372199 100644 --- a/VDSSample/ViewControllers/LabelViewController.swift +++ b/VDSSample/ViewControllers/LabelViewController.swift @@ -70,7 +70,7 @@ class LabelViewController: BaseViewController { func setupModel() { label.text = "Label Component" - label.typograpicalStyle = .FeatureSmall + label.textStyle = .FeatureSmall //setup UI surfacePickerSelectorView.text = label.surface.rawValue @@ -109,7 +109,7 @@ class LabelViewController: BaseViewController { func updateLabelStyle(){ if let style = fontCategory.style(for: textSize, isBold: isBold) { - label.typograpicalStyle = style + label.textStyle = style } } diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index ae0283c..8438b94 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -37,7 +37,7 @@ class MenuCell: UITableViewCell { $0.translatesAutoresizingMaskIntoConstraints = false } var label = Label().with { - $0.typograpicalStyle = .BodyLarge + $0.textStyle = .BodyLarge } override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift index 73af2fc..28bfeb9 100644 --- a/VDSSample/ViewControllers/TileContainerViewController.swift +++ b/VDSSample/ViewControllers/TileContainerViewController.swift @@ -60,7 +60,7 @@ class TileContainerViewController: BaseViewController { override func allTextFields() -> [TextField]? { [widthTextField, heightTextField] } func setupForm(){ formStackView.addArrangedSubview(Label().with{ - $0.typograpicalStyle = .BoldBodyLarge + $0.textStyle = .BoldBodyLarge $0.text = "This object does NOT reflect normal \"surface\" changes, all properties are maually set" }) addFormRow(label: "Surface", view: surfacePickerSelectorView) From 90d83a2ab7692cf31ac5e98ea6850143abaf3b40 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 13 Jan 2023 14:04:28 -0600 Subject: [PATCH 7/7] converted to textStyle Signed-off-by: Matt Bruce --- VDSSample/Classes/TextField.swift | 2 +- VDSSample/Protocols/PickerBase.swift | 8 ++++---- VDSSample/ViewControllers/LabelViewController.swift | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VDSSample/Classes/TextField.swift b/VDSSample/Classes/TextField.swift index 34f7ed7..05d1488 100644 --- a/VDSSample/Classes/TextField.swift +++ b/VDSSample/Classes/TextField.swift @@ -22,7 +22,7 @@ public class TextField: UITextField { public override init(frame: CGRect) { super.init(frame: frame) - font = TypographicalStyle.BodyLarge.font + font = TextStyle.BodyLarge.font } public required init?(coder: NSCoder) { diff --git a/VDSSample/Protocols/PickerBase.swift b/VDSSample/Protocols/PickerBase.swift index 23d83aa..5b8be88 100644 --- a/VDSSample/Protocols/PickerBase.swift +++ b/VDSSample/Protocols/PickerBase.swift @@ -113,7 +113,7 @@ public class PickerSelectorView: UIStackView, Picker public func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView { var label = UILabel() if let v = view as? UILabel { label = v } - label.font = TypographicalStyle.TitleMedium.font + label.font = TextStyle.TitleMedium.font label.text = title(for: row) label.textAlignment = .center return label @@ -146,7 +146,7 @@ public class TextPositionPickerSelectorView: PickerSelectorView{ } } -public class TextSizePickerSelectorView: PickerSelectorView{ +public class TextSizePickerSelectorView: PickerSelectorView{ init(title: String, picker: UIPickerView? = nil){ super.init(title: title, picker: picker, items: [.small, .large]) } @@ -156,9 +156,9 @@ public class TextSizePickerSelectorView: PickerSelectorView{ +public class FontCategoryPickerSelectorView: PickerSelectorView{ init(title: String, picker: UIPickerView? = nil){ - super.init(title: title, picker: picker, items: TypographicalStyle.FontCategory.allCases) + super.init(title: title, picker: picker, items: TextStyle.FontCategory.allCases) } required init(coder: NSCoder) { diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift index e372199..121253e 100644 --- a/VDSSample/ViewControllers/LabelViewController.swift +++ b/VDSSample/ViewControllers/LabelViewController.swift @@ -86,7 +86,7 @@ class LabelViewController: BaseViewController { } //Picker - private var fontCategory: TypographicalStyle.FontCategory = .feature { + private var fontCategory: TextStyle.FontCategory = .feature { didSet { fontCategoryPickerSelectorView.text = fontCategory.rawValue textSizePickerSelectorView.items = fontCategory.sizes @@ -99,7 +99,7 @@ class LabelViewController: BaseViewController { } } - private var textSize: TypographicalStyle.FontSize? = .large { + private var textSize: TextStyle.FontSize? = .large { didSet { textSizePickerSelectorView.text = textSize?.rawValue ?? "" updateLabelStyle()