mbrucedogs/vds_ios_sample
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/datePicker

Browse Source 
# Conflicts:
#	VDSSample.xcodeproj/project.pbxproj

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-04-12 12:51:37 -05:00
commit 77a3c37717
35 changed files with 42 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
VDSSample.xcodeproj/project.pbxproj
View File

@ -43,6 +43,8 @@
EA0D1C312A673F3500E5C127 /* RadioButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */; };
EA0D1C332A673FD400E5C127 /* RadioButtonItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */; };
EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */; };
EA21C5D82B600E4200CFC139 /* VDSTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; };
EA21C5D92B600E4200CFC139 /* VDSTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
EA1758462BC8893700A5C0D9 /* DatePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */; };
EA297A682A02F5320031ED56 /* TableViewTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A672A02F5320031ED56 /* TableViewTestController.swift */; };
EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; };
@ -96,12 +98,6 @@
EAF7F0CC289DA24F00B287F5 /* DownloadArtifactoryItems.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */; };
EAF7F0CD289DA24F00B287F5 /* Artifactory.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */; };
EAF7F11A28A14A0E00B287F5 /* RadioButtonGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */; };
EAF7F11B28A1585000B287F5 /* VDSTypographyTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */; };
EAF7F11C28A1585000B287F5 /* VDSTypographyTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
EAF7F11D28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */; };
EAF7F11E28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
EAF7F12328A1585000B287F5 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */; };
EAF7F12428A1585000B287F5 /* VDSColorTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -111,10 +107,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
EAF7F11E28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Embed Frameworks */,
EAF7F12428A1585000B287F5 /* VDSColorTokens.xcframework in Embed Frameworks */,
EA978EC3291AC62200ACC883 /* VDS.framework in Embed Frameworks */,
EAF7F11C28A1585000B287F5 /* VDSTypographyTokens.xcframework in Embed Frameworks */,
EA21C5D92B600E4200CFC139 /* VDSTokens.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -143,6 +137,7 @@
EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonViewController.swift; sourceTree = "<group>"; };
EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonItemViewController.swift; sourceTree = "<group>"; };
EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaretViewController.swift; sourceTree = "<group>"; };
EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTokens.xcframework; path = SharedFrameworks/VDSTokens.xcframework; sourceTree = "<group>"; };
EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerViewController.swift; sourceTree = "<group>"; };
EA297A672A02F5320031ED56 /* TableViewTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewTestController.swift; sourceTree = "<group>"; };
EA3C3B99289966EF000CA526 /* VDSSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VDSSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -196,9 +191,6 @@
EAF7F0C5289DA24F00B287F5 /* ArtifactoryItems.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ArtifactoryItems.txt; sourceTree = "<group>"; };
EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = DownloadArtifactoryItems.sh; sourceTree = "<group>"; };
EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Artifactory.sh; sourceTree = "<group>"; };
EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTypographyTokens.xcframework; path = SharedFrameworks/VDSTypographyTokens.xcframework; sourceTree = "<group>"; };
EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSFormControlsTokens.xcframework; path = SharedFrameworks/VDSFormControlsTokens.xcframework; sourceTree = "<group>"; };
EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = SharedFrameworks/VDSColorTokens.xcframework; sourceTree = "<group>"; };
EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioButtonGroupViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -207,10 +199,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
EAF7F11D28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Frameworks */,
EAF7F12328A1585000B287F5 /* VDSColorTokens.xcframework in Frameworks */,
EA978EC2291AC62200ACC883 /* VDS.framework in Frameworks */,
EAF7F11B28A1585000B287F5 /* VDSTypographyTokens.xcframework in Frameworks */,
EA21C5D82B600E4200CFC139 /* VDSTokens.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -252,10 +242,8 @@
EA3C3BB8289968A0000CA526 /* Frameworks */ = {
isa = PBXGroup;
children = (
EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */,
EA978EC1291AC62200ACC883 /* VDS.framework */,
EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */,
EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */,
EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";

6
VDSSample/Classes/TextField.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSFormControlsTokens
import VDSTokens
import Combine
open class TextField: UITextField {
@ -47,14 +47,14 @@ open class TextField: UITextField {
public override func textRect(forBounds bounds: CGRect) -> CGRect {
layer.borderColor = UIColor.black.cgColor
layer.borderWidth = VDSFormControls.widthBorder
layer.borderWidth = VDSFormControls.borderWidth
let rect = super.textRect(forBounds: bounds)
return rect.inset(by: textPadding)
}
public override func editingRect(forBounds bounds: CGRect) -> CGRect {
layer.borderColor = UIColor.black.cgColor
layer.borderWidth = VDSFormControls.widthBorder
layer.borderWidth = VDSFormControls.borderWidth
let rect = super.editingRect(forBounds: bounds)
return rect.inset(by: textPadding)
}

4
VDSSample/Supporting Files/Artifactory/ArtifactoryItems.txt
View File

@ -1,3 +1 @@
${PROJECT_DIR}/SharedFrameworks/VDSTypographyTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTypographyTokens.2.0.0.xcframework.zip
${PROJECT_DIR}/SharedFrameworks/VDSColorTokens.xcframework GVJV_VDS_Maven/%40vds-tokens/ios/VDSColorTokens.2.0.0.xcframework.zip
${PROJECT_DIR}/SharedFrameworks/VDSFormControlsTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSFormControlsTokens.1.0.7.xcframework.zip
${PROJECT_DIR}/SharedFrameworks/VDSTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTokens.2.0.0.xcframework.zip

2
VDSSample/ViewControllers/BadgeIndicatorViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {

2
VDSSample/ViewControllers/BadgeViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class BadgeViewController: BaseViewController<Badge> {

2
VDSSample/ViewControllers/BreadcrumbsViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class BreadcrumbsViewController: BaseViewController<Breadcrumbs> {

2
VDSSample/ViewControllers/ButtonGroupViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class ButtonGroupViewController: BaseViewController<ButtonGroup> {
var collectionView: UICollectionView!

2
VDSSample/ViewControllers/ButtonIconViewController.swift
View File

@ -9,7 +9,7 @@ import Foundation
import UIKit
import VDS
import Combine
import VDSColorTokens
import VDSTokens
class ButtonIconViewController: BaseViewController<ButtonIcon> {

2
VDSSample/ViewControllers/ButtonViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class ButtonViewController: BaseViewController<Button> {

2
VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift
View File

@ -9,7 +9,7 @@ import Foundation
import UIKit
import VDS
import Combine
import VDSColorTokens
import VDSTokens
class CarouselScrollbarViewConttroller: BaseViewController<CarouselScrollbar> {

2
VDSSample/ViewControllers/CheckBoxGroupViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class CheckboxGroupViewController: BaseViewController<CheckboxGroup> {

2
VDSSample/ViewControllers/CheckboxItemViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class CheckboxItemViewController: BaseViewController<CheckboxItem> {

2
VDSSample/ViewControllers/CheckboxViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class CheckboxViewController: BaseViewController<Checkbox> {

2
VDSSample/ViewControllers/DropShawdowViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class DropShadowViewController: BaseViewController<ShadowView> {

2
VDSSample/ViewControllers/IconViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class IconViewController: BaseViewController<Icon> {

2
VDSSample/ViewControllers/InputFieldViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class InputFieldViewController: BaseViewController<InputField> {

2
VDSSample/ViewControllers/LabelViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class LabelViewController: BaseViewController<Label> {

2
VDSSample/ViewControllers/MenuViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
struct MenuComponent {
var title: String

1
VDSSample/ViewControllers/NotificationViewController.swift
View File

@ -157,3 +157,4 @@ extension NotificationViewController: ComponentSampleable {
return ComponentSample(component: component)
}
}

2
VDSSample/ViewControllers/RadioBoxGroupViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{

2
VDSSample/ViewControllers/RadioButtonGroupViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {

2
VDSSample/ViewControllers/RadioButtonItemViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class RadioButtonItemViewController: BaseViewController<RadioButtonItem> {

2
VDSSample/ViewControllers/RadioButtonViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class RadioButtonViewController: BaseViewController<RadioButton> {

2
VDSSample/ViewControllers/TableViewTestController.swift
View File

@ -7,7 +7,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
public typealias ComponentSampleView = UIView & Surfaceable

2
VDSSample/ViewControllers/TabsContainerViewController.swift
View File

@ -9,7 +9,7 @@ import Foundation
import UIKit
import VDS
import Combine
import VDSColorTokens
import VDSTokens

2
VDSSample/ViewControllers/TabsViewController.swift
View File

@ -9,7 +9,7 @@ import Foundation
import UIKit
import VDS
import Combine
import VDSColorTokens
import VDSTokens
class TabsViewController: BaseViewController<Tabs> {

2
VDSSample/ViewControllers/TextAreaViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class TextAreaViewController: BaseViewController<TextArea> {

2
VDSSample/ViewControllers/TextLinkCaretViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {

2
VDSSample/ViewControllers/TextLinkViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class TextLinkViewController: BaseViewController<TextLink> {

2
VDSSample/ViewControllers/TileContainerViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class TileContainerViewController: BaseViewController<TileContainer> {

2
VDSSample/ViewControllers/TileletViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class TileletViewController: BaseViewController<Tilelet> {

2
VDSSample/ViewControllers/TitleLockupViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class TitleLockupViewController: BaseViewController<TitleLockup> {

2
VDSSample/ViewControllers/ToggleViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class ToggleViewController: BaseViewController<Toggle> {

2
VDSSample/ViewControllers/TooltipViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
import Combine
class TooltipViewController: BaseViewController<Tooltip> {

2
VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
View File

@ -8,7 +8,7 @@
import Foundation
import UIKit
import VDS
import VDSColorTokens
import VDSTokens
class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabel> {