Merge branch 'feature/Button' into 'develop'

starting of button

See merge request BPHV_MIPS/vds_ios_sample!2
This commit is contained in:
Bruce, Matt R 2022-09-23 22:06:00 +00:00
commit b760d32e4b
4 changed files with 180 additions and 0 deletions

View File

@ -32,6 +32,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
5FC35BE928D5235A004EBEAC /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */; };
EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; };
EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */; };
EA3C3BA4289966EF000CA526 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA3C3BA2289966EF000CA526 /* Main.storyboard */; };
@ -88,6 +89,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = "<group>"; };
EA3C3B99289966EF000CA526 /* VDSSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VDSSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
EA3C3B9C289966EF000CA526 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@ -247,6 +249,7 @@
EA3C3BB228996775000CA526 /* MenuViewController.swift */,
EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */,
EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */,
5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */,
EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */,
EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */,
EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
@ -407,6 +410,7 @@
EAF7F11A28A14A0E00B287F5 /* RadioButtonViewController.swift in Sources */,
EA89204628B66CE2006B9984 /* ScrollViewController.swift in Sources */,
EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */,
5FC35BE928D5235A004EBEAC /* ButtonViewController.swift in Sources */,
EA89204A28B66CE2006B9984 /* KeyboardFrameChange.swift in Sources */,
EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */,
EAB1D2C928AAAA1D00DAE764 /* ModelScrollViewController.swift in Sources */,

View File

@ -95,3 +95,11 @@ class FontCategoryPicker: PickerBase<TypographicalStyle.FontCategory> {
super.init(items: TypographicalStyle.FontCategory.allCases)
}
}
class UsePicker: PickerBase<Use> {
init(){
super.init(items: [.primary, .secondary])
}
}

View File

@ -0,0 +1,167 @@
//
// ButtonViewController.swift
// VDSSample
//
// Created by Jarrod Courtney on 9/16/22.
//
import Foundation
import UIKit
import VDS
import VDSColorTokens
class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
enum PickerType {
case surface, use, buttonSize
}
var surfacePickerSelectorView = PickerSelectorView(title: "")
var usePickerSelectorView = PickerSelectorView(title: "")
var buttonSizePickerSelectorView = PickerSelectorView(title: "")
var disabledSwitch = UISwitch()
var textField = TextField()
var widthTextField = TextField()
let button = Button()
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
addContentTopView(view: view)
setupForm()
setupPicker()
setupModel()
}
func setupForm(){
addFormRow(label: "Surface", view: surfacePickerSelectorView)
addFormRow(label: "Use", view: usePickerSelectorView)
addFormRow(label: "Disabled", view: disabledSwitch)
addFormRow(label: "Label", view: textField)
addFormRow(label: "Width", view: widthTextField)
addFormRow(label: "Size", view: buttonSizePickerSelectorView)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.button.disabled = sender.isOn
}.store(in: &subscribers)
surfacePickerSelectorView.button
.publisher(for: .touchUpInside)
.sink { [weak self] _ in
self?.pickerType = .surface
}.store(in: &subscribers)
usePickerSelectorView.button
.publisher(for: .touchUpInside)
.sink { [weak self] _ in
self?.pickerType = .use
}.store(in: &subscribers)
textField
.textPublisher
.sink { [weak self] text in
self?.button.text = text
}.store(in: &subscribers)
widthTextField
.textPublisher
.sink { [weak self] text in
if let n = NumberFormatter().number(from: text) {
self?.button.width = CGFloat(truncating: n)
}
}.store(in: &subscribers)
buttonSizePickerSelectorView.button
.publisher(for: .touchUpInside)
.sink { [weak self] _ in
self?.pickerType = .buttonSize
}.store(in: &subscribers)
}
func setupModel() {
var defaultModel = DefaultButtonModel()
defaultModel.text = "Button"
set(with: defaultModel)
button
.handlerPublisher()
.sink { [weak self] viewModel in
self?.model = viewModel
}.store(in: &subscribers)
button
.publisher(for: .touchUpInside)
.sink { control in
print("clicked me")
}.store(in: &subscribers)
//setup UI
surfacePickerSelectorView.text = model.surface.rawValue
disabledSwitch.isOn = model.disabled
textField.text = model.text
usePickerSelectorView.text = model.use.rawValue
widthTextField.text = ""
buttonSizePickerSelectorView.text = ButtonSize.large.rawValue
}
override func updateView(viewModel: DefaultButtonModel) {
button.set(with: viewModel)
}
//Picker
var surfacePicker = SurfacePicker()
var usePicker = UsePicker()
var buttonSizePicker = PickerBase<ButtonSize>.init(items: ButtonSize.allCases)
var pickerType: PickerType = .surface {
didSet {
func update(object: UIPickerViewDelegate & UIPickerViewDataSource){
picker.delegate = object
picker.dataSource = object
}
switch pickerType{
case .surface:
update(object: surfacePicker)
case .use:
update(object: usePicker)
case .buttonSize:
update(object: buttonSizePicker)
}
picker.reloadAllComponents()
picker.selectRow(0, inComponent: 0, animated: false)
picker.isHidden = false
}
}
func setupPicker(){
surfacePicker.onPickerDidSelect = { [weak self] item in
self?.button.surface = item
self?.contentTopView.backgroundColor = item.color
self?.surfacePickerSelectorView.text = item.rawValue
}
usePicker.onPickerDidSelect = { [weak self] item in
self?.button.use = item
self?.button.backgroundColor = item.color
self?.usePickerSelectorView.text = item.rawValue
}
buttonSizePicker.onPickerDidSelect = { [weak self] item in
self?.button.size = item
self?.buttonSizePickerSelectorView.text = item.rawValue
}
}
}

View File

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