refactored props

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-05-03 09:56:36 -05:00
parent c6c5cc49b8
commit 0fe55db785
5 changed files with 25 additions and 11 deletions

View File

@ -75,7 +75,7 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
} }
requiredSwitch.onChange = { [weak self] sender in requiredSwitch.onChange = { [weak self] sender in
self?.component.required = sender.isOn self?.component.isRequired = sender.isOn
} }
optionsSwitch.onChange = { [weak self] sender in optionsSwitch.onChange = { [weak self] sender in
@ -84,7 +84,7 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
} }
readonlySwitch.onChange = { [weak self] sender in readonlySwitch.onChange = { [weak self] sender in
self?.component.readOnly = sender.isOn self?.component.isReadOnly = sender.isOn
} }
transparentBgSwitch.onChange = { [weak self] sender in transparentBgSwitch.onChange = { [weak self] sender in
@ -158,7 +158,7 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
//setup UI //setup UI
disabledSwitch.isOn = !component.isEnabled disabledSwitch.isOn = !component.isEnabled
requiredSwitch.isOn = component.required requiredSwitch.isOn = component.isRequired
surfacePickerSelectorView.text = component.surface.rawValue surfacePickerSelectorView.text = component.surface.rawValue
labelTextField.text = component.labelText labelTextField.text = component.labelText
helperTextField.text = component.helperText helperTextField.text = component.helperText

View File

@ -76,7 +76,7 @@ class InputFieldViewController: BaseViewController<InputField> {
append(section: passwordSection) append(section: passwordSection)
requiredSwitch.onChange = { [weak self] sender in requiredSwitch.onChange = { [weak self] sender in
self?.component.required = sender.isOn self?.component.isRequired = sender.isOn
} }
showErrorSwitch.onChange = { [weak self] sender in showErrorSwitch.onChange = { [weak self] sender in
@ -172,7 +172,7 @@ class InputFieldViewController: BaseViewController<InputField> {
helperTextPlacementPickerSelectorView.text = component.helperTextPlacement.rawValue helperTextPlacementPickerSelectorView.text = component.helperTextPlacement.rawValue
inputTypePickerSelectorView.text = component.fieldType.rawValue inputTypePickerSelectorView.text = component.fieldType.rawValue
disabledSwitch.isOn = !component.isEnabled disabledSwitch.isOn = !component.isEnabled
requiredSwitch.isOn = component.required requiredSwitch.isOn = component.isRequired
labelTextField.text = component.labelText labelTextField.text = component.labelText
helperTextField.text = component.helperText helperTextField.text = component.helperText
showErrorSwitch.isOn = component.showError showErrorSwitch.isOn = component.showError

View File

@ -55,7 +55,7 @@ class TextAreaViewController: BaseViewController<TextArea> {
addFormRow(label: "Min Height", view: heightPickerSelectorView) addFormRow(label: "Min Height", view: heightPickerSelectorView)
requiredSwitch.onChange = { [weak self] sender in requiredSwitch.onChange = { [weak self] sender in
self?.component.required = sender.isOn self?.component.isRequired = sender.isOn
} }
showErrorSwitch.onChange = { [weak self] sender in showErrorSwitch.onChange = { [weak self] sender in
@ -71,7 +71,7 @@ class TextAreaViewController: BaseViewController<TextArea> {
} }
readOnlySwitch.onChange = { [weak self] sender in readOnlySwitch.onChange = { [weak self] sender in
self?.component.readOnly = sender.isOn self?.component.isReadOnly = sender.isOn
} }
labelTextField labelTextField
@ -143,7 +143,7 @@ class TextAreaViewController: BaseViewController<TextArea> {
//setup UI //setup UI
surfacePickerSelectorView.text = component.surface.rawValue surfacePickerSelectorView.text = component.surface.rawValue
disabledSwitch.isOn = !component.isEnabled disabledSwitch.isOn = !component.isEnabled
requiredSwitch.isOn = component.required requiredSwitch.isOn = component.isRequired
labelTextField.text = component.labelText labelTextField.text = component.labelText
helperTextField.text = component.helperText helperTextField.text = component.helperText
showErrorSwitch.isOn = component.showError showErrorSwitch.isOn = component.showError

View File

@ -50,6 +50,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
var gradientColorsFormStackView = FormSection().with { $0.isHidden = true } var gradientColorsFormStackView = FormSection().with { $0.isHidden = true }
var backgroundColor: BackgroundColor = .secondary var backgroundColor: BackgroundColor = .secondary
var padding: Padding = .padding4X var padding: Padding = .padding4X
var isLinkSwitch = Toggle()
var clickableSwitch = Toggle() var clickableSwitch = Toggle()
var showBackgroundImageSwitch = Toggle() var showBackgroundImageSwitch = Toggle()
var showBorderSwitch = Toggle() var showBorderSwitch = Toggle()
@ -115,6 +116,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
$0.text = "For testing max width is limited to 85% of view's width & 65% view's height." $0.text = "For testing max width is limited to 85% of view's width & 65% view's height."
}) })
addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Surface", view: surfacePickerSelectorView)
addFormRow(label: "Is Link", view: isLinkSwitch)
addFormRow(label: "Clickable", view: clickableSwitch) addFormRow(label: "Clickable", view: clickableSwitch)
addFormRow(label: "Width", view: widthTextField) addFormRow(label: "Width", view: widthTextField)
addFormRow(label: "Height", view: heightTextField) addFormRow(label: "Height", view: heightTextField)
@ -143,6 +145,11 @@ class TileContainerViewController: BaseViewController<TileContainer> {
} }
} }
isLinkSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.component.accessibilityTraits = sender.isOn ? .link : .button
}
clickableSwitch.onChange = { [weak self] sender in clickableSwitch.onChange = { [weak self] sender in
guard let self else { return } guard let self else { return }
if sender.isOn { if sender.isOn {
@ -254,7 +261,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
contentAreaBackgroundColorButton.onClick = { [weak self] _ in contentAreaBackgroundColorButton.onClick = { [weak self] _ in
guard let self else { return } guard let self else { return }
self.colorPickerType = .contentViewBackgroundColor self.colorPickerType = .contentViewBackgroundColor
self.colorPicker.selectedColor = self.component.containerView.backgroundColor ?? .white self.colorPicker.selectedColor = self.component.contentView.backgroundColor ?? .white
self.present(self.colorPicker, animated: true) self.present(self.colorPicker, animated: true)
} }
} }
@ -288,7 +295,7 @@ extension TileContainerViewController: UIColorPickerViewControllerDelegate {
guard let hexString = viewController.selectedColor.hexString else { return } guard let hexString = viewController.selectedColor.hexString else { return }
switch colorPickerType { switch colorPickerType {
case .contentViewBackgroundColor: case .contentViewBackgroundColor:
component.containerView.backgroundColor = UIColor(hexString: hexString) component.contentView.backgroundColor = UIColor(hexString: hexString)
case .backgroundColor: case .backgroundColor:
component.color = .custom(hexString) component.color = .custom(hexString)
case .gradientColor1: case .gradientColor1:

View File

@ -125,6 +125,7 @@ class TileletViewController: BaseViewController<Tilelet> {
var showDropShadowSwitch = Toggle() var showDropShadowSwitch = Toggle()
var backgroundColor: BackgroundColor = .black var backgroundColor: BackgroundColor = .black
var maxWidthTextField = NumericField() var maxWidthTextField = NumericField()
var isLinkSwitch = Toggle()
var gradientColorsFormStackView = FormSection().with { $0.isHidden = true } var gradientColorsFormStackView = FormSection().with { $0.isHidden = true }
@ -139,6 +140,7 @@ class TileletViewController: BaseViewController<Tilelet> {
super.setupForm() super.setupForm()
addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Surface", view: surfacePickerSelectorView)
addActionRow() addActionRow()
addFormRow(label: "Is Link", view: isLinkSwitch)
addFormRow(label: "Clickable", view: clickableSwitch) addFormRow(label: "Clickable", view: clickableSwitch)
addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView) addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView)
@ -187,6 +189,11 @@ class TileletViewController: BaseViewController<Tilelet> {
} }
} }
isLinkSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.component.accessibilityTraits = sender.isOn ? .link : .button
}
heightTextField heightTextField
.numberPublisher .numberPublisher
.sink { [weak self] number in .sink { [weak self] number in
@ -497,7 +504,7 @@ extension TileletViewController: UIColorPickerViewControllerDelegate {
guard let hexString = viewController.selectedColor.hexString else { return } guard let hexString = viewController.selectedColor.hexString else { return }
switch colorPickerType { switch colorPickerType {
case .contentViewBackgroundColor: case .contentViewBackgroundColor:
component.containerView.backgroundColor = UIColor(hexString: hexString) component.contentView.backgroundColor = UIColor(hexString: hexString)
case .backgroundColor: case .backgroundColor:
component.color = .custom(hexString) component.color = .custom(hexString)
case .gradientColor1: case .gradientColor1: