From 1d3616edf0efcd5b16159a1e3e012cd58dda9bd7 Mon Sep 17 00:00:00 2001 From: vasavk Date: Thu, 8 Feb 2024 22:58:56 +0530 Subject: [PATCH] story:ONEAPP-6315: Changes for the ExpandDirection picker --- .../ButtonIconViewController.swift | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift index 89bdc86..64e0cde 100644 --- a/VDSSample/ViewControllers/ButtonIconViewController.swift +++ b/VDSSample/ViewControllers/ButtonIconViewController.swift @@ -53,6 +53,12 @@ class ButtonIconViewController: BaseViewController { var selectableSwitch = Toggle() var badgeIndicatorSwitch = Toggle() + lazy var badgeIndicatorExpandDirectionPickerSelectorView = { + PickerSelectorView(title: "right", + picker: self.picker, + items: ButtonIcon.ExpandDirection.allCases) + }() + override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0) @@ -78,10 +84,11 @@ class ButtonIconViewController: BaseViewController { addFormRow(label: "X Offset", view: centerX) addFormRow(label: "Y Offset", view: centerY) addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch) + addFormRow(label: "Expand Direction", view: badgeIndicatorExpandDirectionPickerSelectorView) badgeIndicatorSwitch.onChange = { [weak self] sender in guard let self else { return } - self.component.showBadge = sender.isOn + self.component.showBadgeIndicator = sender.isOn self.setBadgeIndicatorModel() self.component.badgeIndicator.isHidden = !sender.isOn } @@ -97,7 +104,7 @@ class ButtonIconViewController: BaseViewController { } hideBorder.onChange = { [weak self] sender in - self?.component.hideBorder = sender.isOn + self?.component.hideBorder = !sender.isOn } fitToIcon.onChange = { [weak self] sender in @@ -126,7 +133,7 @@ class ButtonIconViewController: BaseViewController { //sub models func setBadgeIndicatorModel() { if badgeIndicatorSwitch.isOn { - component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.simple, size: BadgeIndicator.Size.small) + component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.numbered, size: BadgeIndicator.Size.small, maximumDigits: BadgeIndicator.MaximumDigits.three, number: 9999, trailingText: "New") } else { component.badgeIndicatorModel = nil } @@ -143,6 +150,7 @@ class ButtonIconViewController: BaseViewController { sizePickerSelectorView.text = component.size.rawValue namePickerSelectorView.text = name.rawValue disabledSwitch.isOn = !component.isEnabled + badgeIndicatorExpandDirectionPickerSelectorView.text = component.expandDirection.rawValue } func updateOffset() { @@ -181,10 +189,10 @@ class ButtonIconViewController: BaseViewController { namePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.component.iconName = item } - -// badgeIndicatorDirectionPickerSelectorView.onPickerDidSelect = { [weak self] item in -// TO DO self?.component.badgeIndicator.directionalLayoutMargins = item -// } + + badgeIndicatorExpandDirectionPickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.expandDirection = item + } } }