From b2e7d217bd4704cc0a9d74cba083fc218b1999b3 Mon Sep 17 00:00:00 2001 From: vasavk Date: Fri, 9 Feb 2024 16:44:23 +0530 Subject: [PATCH] story:ONEAPP-6315: made changes for selectableSwitch, selectedIconName --- .../ButtonIconViewController.swift | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift index 64e0cde..54feaac 100644 --- a/VDSSample/ViewControllers/ButtonIconViewController.swift +++ b/VDSSample/ViewControllers/ButtonIconViewController.swift @@ -36,6 +36,12 @@ class ButtonIconViewController: BaseViewController { picker: self.picker, items: Icon.Name.all.sorted{ $0.rawValue < $1.rawValue }) }() + + lazy var selectedIconNamePickerSelectorView = { + PickerSelectorView(title: "", + picker: self.picker, + items: Icon.Name.all.sorted{ $0.rawValue < $1.rawValue }) + }() lazy var sizePickerSelectorView = { PickerSelectorView(title: "", @@ -68,7 +74,7 @@ class ButtonIconViewController: BaseViewController { override func setupForm(){ super.setupForm() - addActionRow() +// addActionRow() addFormRow(label: "Disabled", view: disabledSwitch) addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Surface Type", view: surfaceTypePickerSelectorView) @@ -79,8 +85,8 @@ class ButtonIconViewController: BaseViewController { addFormRow(label: "Fit To Icon", view: fitToIcon) addFormRow(label: "Custom Size", view: customSizeField) addFormRow(label: "Name", view: namePickerSelectorView) + addFormRow(label: "Selected Icon Name", view: selectedIconNamePickerSelectorView) // TO DO addFormRow(label: "Selectable", view: selectableSwitch) -// addFormRow(label: "Selected Name", view: namePickerSelectorView) // TO DO addFormRow(label: "X Offset", view: centerX) addFormRow(label: "Y Offset", view: centerY) addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch) @@ -96,8 +102,17 @@ class ButtonIconViewController: BaseViewController { disabledSwitch.onChange = { [weak self] sender in self?.component.isEnabled = !sender.isOn } - - component.onClickActionPublisher("ButtonIcon", label: actionLabel) + + selectableSwitch.onChange = { [weak self] sender in + guard let self else { return } + if sender.isOn { + self.component.onClick = { _ in + self.component.selectable = !self.component.selectable + } + } else { + self.component.onClick = nil + } + } floating.onChange = { [weak self] sender in self?.component.floating = sender.isOn @@ -189,7 +204,11 @@ class ButtonIconViewController: BaseViewController { namePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.component.iconName = item } - + + selectedIconNamePickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.selectedIconName = item + } + badgeIndicatorExpandDirectionPickerSelectorView.onPickerDidSelect = { [weak self] item in self?.component.expandDirection = item }