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

Merge branch 'feature/textLink' into 'develop'

Browse Source 
updated code for new vds changes

See merge request BPHV_MIPS/vds_ios_sample!5
This commit is contained in:
Bruce, Matt R 2022-11-18 17:22:39 +00:00
commit 12f4235f2d
8 changed files with 148 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VDSSample.xcodeproj/project.pbxproj
View File

@ -59,6 +59,7 @@
EAA5EEAD28EB6924003B3210 /* TextEntryFieldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */; };
EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */; };
EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */; };
EAB5FEEF2927E28400998C17 /* ButtonGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */; };
EAC9258029119FC400091998 /* TextLinkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9257F29119FC400091998 /* TextLinkViewController.swift */; };
EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07B2899698800B287F5 /* Assets.xcassets */; };
EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */; };
@ -120,6 +121,7 @@
EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldViewController.swift; sourceTree = "<group>"; };
EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonGroupViewController.swift; sourceTree = "<group>"; };
EAC9257F29119FC400091998 /* TextLinkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkViewController.swift; sourceTree = "<group>"; };
EAF7F07B2899698800B287F5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxViewController.swift; sourceTree = "<group>"; };
@ -237,6 +239,7 @@
EA3C3BB228996775000CA526 /* MenuViewController.swift */,
EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */,
EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */,
EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */,
5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */,
EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */,
EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */,
@ -392,6 +395,7 @@
buildActionMask = 2147483647;
files = (
EA3C3BB728996775000CA526 /* ToggleViewController.swift in Sources */,
EAB5FEEF2927E28400998C17 /* ButtonGroupViewController.swift in Sources */,
EA89204C28B66CE2006B9984 /* ScrollWrapperView.swift in Sources */,
EA89205128B68307006B9984 /* TextField.swift in Sources */,
EA3C3BB528996775000CA526 /* StoryboardInitable.swift in Sources */,

9
VDSSample/ViewControllers/BadgeViewController.swift
View File

@ -55,14 +55,7 @@ class BadgeViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
let view = UIView()
view.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(badge)
badge.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
badge.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
badge.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
addContentTopView(view: view)
addContentTopView(view: badge)
setupForm()
setupPicker()
setupModel()

55
VDSSample/ViewControllers/BaseViewController.swift
View File

@ -16,13 +16,11 @@ public class BaseViewController: UIViewController, Initable {
}
private let edgeSpacing = 16.0
private let topBottomSpacing = 20.0
//--------------------------------------------------
// MARK: - Combine Properties
//--------------------------------------------------
public var subscribers = Set<AnyCancellable>()
public var firstRender: Bool = false
//--------------------------------------------------
// MARK: - Properties
@ -83,7 +81,7 @@ public class BaseViewController: UIViewController, Initable {
return UIStackView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
$0.alignment = .fill
$0.distribution = .fillProportionally
$0.distribution = .fill
$0.axis = .vertical
$0.spacing = 10
}
@ -108,28 +106,35 @@ public class BaseViewController: UIViewController, Initable {
embed(scrollViewController)
scrollViewController.scrollView.alwaysBounceVertical = true
scrollViewController.contentView = contentView
let spacerView = UIView().with{
$0.translatesAutoresizingMaskIntoConstraints = false
}
contentView.addSubview(contentTopView)
contentView.addSubview(contentBottomView)
contentView.addSubview(spacerView)
contentBottomView.addSubview(formStackView)
contentTopView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: edgeSpacing).isActive = true
contentTopView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: edgeSpacing).isActive = true
contentTopView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -edgeSpacing).isActive = true
contentBottomView.topAnchor.constraint(equalTo: contentTopView.bottomAnchor, constant: edgeSpacing).isActive = true
contentBottomView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: edgeSpacing).isActive = true
contentBottomView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -edgeSpacing).isActive = true
contentBottomView.bottomAnchor.constraint(lessThanOrEqualTo: contentView.bottomAnchor, constant: -edgeSpacing).isActive = true
formStackView.topAnchor.constraint(equalTo: contentBottomView.topAnchor, constant: edgeSpacing).isActive = true
formStackView.leadingAnchor.constraint(equalTo: contentBottomView.leadingAnchor, constant: edgeSpacing).isActive = true
formStackView.trailingAnchor.constraint(equalTo: contentBottomView.trailingAnchor, constant: -edgeSpacing).isActive = true
formStackView.bottomAnchor.constraint(equalTo: contentBottomView.bottomAnchor, constant: -100).isActive = true
contentTopView.pinTop(edgeSpacing)
contentTopView.pinLeading(edgeSpacing)
contentTopView.pinTrailing(edgeSpacing)
contentBottomView.pinTop(contentTopView.bottomAnchor, edgeSpacing)
contentBottomView.pinLeading(edgeSpacing)
contentBottomView.pinTrailing(edgeSpacing)
spacerView
.pinTop(contentBottomView.bottomAnchor, 100)
.pinLeading()
.pinTrailing()
.pinBottom()
formStackView.pinToSuperView()
view.addSubview(picker)
picker.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor).isActive = true
picker.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor).isActive = true
picker.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true
picker.pinBottom()
picker.pinLeading()
picker.pinTrailing()
picker.isHidden = true
}
@ -144,20 +149,14 @@ public class BaseViewController: UIViewController, Initable {
addChild(viewController)
view.addSubview(viewController.view)
viewController.view.translatesAutoresizingMaskIntoConstraints = false
viewController.view.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
viewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
viewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
viewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
viewController.view.pinToSuperView()
viewController.didMove(toParent: self)
}
open func addContentTopView(view: UIView) {
view.translatesAutoresizingMaskIntoConstraints = false
contentTopView.addSubview(view)
view.leadingAnchor.constraint(equalTo: contentTopView.leadingAnchor, constant: edgeSpacing).isActive = true
view.topAnchor.constraint(equalTo: contentTopView.topAnchor, constant: topBottomSpacing).isActive = true
view.trailingAnchor.constraint(lessThanOrEqualTo: contentTopView.trailingAnchor, constant: -edgeSpacing).isActive = true
view.bottomAnchor.constraint(lessThanOrEqualTo: contentTopView.bottomAnchor, constant: -topBottomSpacing).isActive = true
view.pinToSuperView(.init(top: edgeSpacing, left: edgeSpacing, bottom: edgeSpacing, right: edgeSpacing))
}
open func addFormRow(label: String, view: UIView, stackView: UIStackView? = nil) {

101
VDSSample/ViewControllers/ButtonGroupViewController.swift Normal file
View File

@ -0,0 +1,101 @@
//
// ButtonViewController.swift
// VDSSample
//
// Created by Jarrod Courtney on 9/16/22.
//
import Foundation
import UIKit
import VDS
import VDSColorTokens
class ButtonGroupViewController: BaseViewController {
var collectionView: UICollectionView!
lazy var buttonPositionSelectorView = {
PickerSelectorView<ButtonPosition>(title: "",
picker: self.picker,
items: ButtonPosition.allCases)
}()
var disabledSwitch = UISwitch()
var widthTextField = TextField()
let buttonGroup = ButtonGroup()
let button = Button()
override func viewDidLoad() {
super.viewDidLoad()
buttonGroup.buttons = [
button,
Button().with{$0.text = "Wide Label Button"},
TextLink().with{$0.text = "Text Link Button"},
TextLinkCaret().with{$0.text = "Caret Button"}
]
addContentTopView(view: buttonGroup)
setupForm()
setupPicker()
setupModel()
}
func setupForm(){
addFormRow(label: "Surface", view: surfacePickerSelectorView)
addFormRow(label: "Disabled", view: disabledSwitch)
addFormRow(label: "Position", view: buttonPositionSelectorView)
// addFormRow(label: "Width", view: widthTextField)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.buttonGroup.disabled = sender.isOn
}.store(in: &subscribers)
// widthTextField
// .textPublisher
// .sink { [weak self] text in
// if let n = NumberFormatter().number(from: text) {
// self?.buttonGroup.width = CGFloat(truncating: n)
// }
// }.store(in: &subscribers)
}
func setupModel() {
button.text = "Button"
button
.publisher(for: .touchUpInside)
.sink { [weak self] control in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "\(control.text!) Clicked",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
print("clicked me")
}.store(in: &subscribers)
//setup UI
surfacePickerSelectorView.text = buttonGroup.surface.rawValue
buttonPositionSelectorView.text = buttonGroup.buttonPosition.rawValue
disabledSwitch.isOn = buttonGroup.disabled
widthTextField.text = ""
}
func setupPicker(){
surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in
self?.buttonGroup.surface = item
self?.contentTopView.backgroundColor = item.color
}
buttonPositionSelectorView.onPickerDidSelect = { [weak self] item in
self?.buttonGroup.buttonPosition = item
}
}
}

9
VDSSample/ViewControllers/ButtonViewController.swift
View File

@ -32,12 +32,15 @@ class ButtonViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
let view = UIView()
view.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(button)
button.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
button.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
button.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
button.pinTop()
button.pinBottom()
button.pinLeading()
button.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
addContentTopView(view: view)
setupForm()

1
VDSSample/ViewControllers/MenuViewController.swift
View File

@ -26,6 +26,7 @@ class MenuViewController: UITableViewController {
let items: [MenuComponent] = [
MenuComponent(title: "Badge", viewController: BadgeViewController.self),
MenuComponent(title: "Button", viewController: ButtonViewController.self),
MenuComponent(title: "ButtonGroup", viewController: ButtonGroupViewController.self),
MenuComponent(title: "Checkbox", viewController: CheckboxViewController.self),
MenuComponent(title: "CheckboxGroup", viewController: CheckboxGroupViewController.self),
MenuComponent(title: "Label", viewController: LabelViewController.self),

7
VDSSample/ViewControllers/TextLinkCaretViewController.swift
View File

@ -27,9 +27,10 @@ class TextLinkCaretViewController: BaseViewController {
let view = UIView()
view.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(textLinkCaret)
textLinkCaret.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
textLinkCaret.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
textLinkCaret.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
textLinkCaret.pinTop()
textLinkCaret.pinBottom()
textLinkCaret.pinLeading()
textLinkCaret.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
addContentTopView(view: view)
setupForm()

7
VDSSample/ViewControllers/TextLinkViewController.swift
View File

@ -27,9 +27,10 @@ class TextLinkViewController: BaseViewController {
let view = UIView()
view.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(textLink)
textLink.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
textLink.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
textLink.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
textLink.pinTop()
textLink.pinBottom()
textLink.pinLeading()
textLink.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
addContentTopView(view: view)
setupForm()