From 790f440b382fb6a5fab035675802bbad03b98485 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 16 Aug 2022 18:16:04 -0500 Subject: [PATCH] updated for label viewcontroller --- VDSSample.xcodeproj/project.pbxproj | 4 + VDSSample/Protocols/PickerBase.swift | 4 +- .../Resources/Components.storyboard | 283 +++++++++++++++--- .../ViewControllers/LabelViewController.swift | 174 +++++++++++ .../ViewControllers/MenuViewController.swift | 1 + .../ToggleViewController.swift | 23 +- 6 files changed, 429 insertions(+), 60 deletions(-) create mode 100644 VDSSample/ViewControllers/LabelViewController.swift diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 55cea22..c9972e0 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ EAB1D2C528A6B11D00DAE764 /* TestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C428A6B11D00DAE764 /* TestViewController.swift */; }; EAB1D2C928AAAA1D00DAE764 /* ModelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* ModelViewController.swift */; }; EAB1D2CB28AAB9E200DAE764 /* TemplateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2CA28AAB9E200DAE764 /* TemplateViewController.swift */; }; + EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */; }; EAF7F07C2899698800B287F5 /* Components.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07A2899698800B287F5 /* Components.storyboard */; }; EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07B2899698800B287F5 /* Assets.xcassets */; }; EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */; }; @@ -101,6 +102,7 @@ EAB1D2C428A6B11D00DAE764 /* TestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestViewController.swift; sourceTree = ""; }; EAB1D2C828AAAA1D00DAE764 /* ModelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelViewController.swift; sourceTree = ""; }; EAB1D2CA28AAB9E200DAE764 /* TemplateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateViewController.swift; sourceTree = ""; }; + EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = ""; }; EAF7F07A2899698800B287F5 /* Components.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Components.storyboard; sourceTree = ""; }; EAF7F07B2899698800B287F5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxViewController.swift; sourceTree = ""; }; @@ -216,6 +218,7 @@ EAB1D2C428A6B11D00DAE764 /* TestViewController.swift */, EAB1D2C828AAAA1D00DAE764 /* ModelViewController.swift */, EAB1D2CA28AAB9E200DAE764 /* TemplateViewController.swift */, + EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */, ); path = ViewControllers; sourceTree = ""; @@ -371,6 +374,7 @@ EAB1D2C528A6B11D00DAE764 /* TestViewController.swift in Sources */, EAB1D2C928AAAA1D00DAE764 /* ModelViewController.swift in Sources */, EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */, + EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/VDSSample/Protocols/PickerBase.swift b/VDSSample/Protocols/PickerBase.swift index 1c18226..8ac8e2d 100644 --- a/VDSSample/Protocols/PickerBase.swift +++ b/VDSSample/Protocols/PickerBase.swift @@ -62,8 +62,8 @@ class TextSizePicker: PickerBase { } } -class FontWeightPicker: PickerBase { +class FontCategoryPicker: PickerBase { init(){ - super.init(items: [.regular, .bold]) + super.init(items: TypographicalStyle.FontCategory.allCases) } } diff --git a/VDSSample/Supporting Files/Resources/Components.storyboard b/VDSSample/Supporting Files/Resources/Components.storyboard index d21ccec..9af4965 100644 --- a/VDSSample/Supporting Files/Resources/Components.storyboard +++ b/VDSSample/Supporting Files/Resources/Components.storyboard @@ -28,7 +28,7 @@ - + @@ -98,10 +98,27 @@ - + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - + - +