From e484d95d8105f387b2834963f667b4611492dbd8 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 17 Oct 2024 16:14:28 -0500 Subject: [PATCH] added device ipad Signed-off-by: Matt Bruce --- .../TileletGroupViewController.swift | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/VDSSample/ViewControllers/TileletGroupViewController.swift b/VDSSample/ViewControllers/TileletGroupViewController.swift index 00253d4..7c82941 100644 --- a/VDSSample/ViewControllers/TileletGroupViewController.swift +++ b/VDSSample/ViewControllers/TileletGroupViewController.swift @@ -14,7 +14,8 @@ class TileletGroupViewController: BaseViewController { var collectionView: UICollectionView! public enum RowQuantity: String, CaseIterable { - case one, two, three, four + case one, two, three + case four, five, six init(quantity: Int){ if quantity == 1 { @@ -23,8 +24,14 @@ class TileletGroupViewController: BaseViewController { self = .two } else if quantity == 3 { self = .three - } else { + } else if quantity == 4 { self = .four + } else if quantity == 5 { + self = .five + } else if quantity == 6 { + self = .six + } else { + self = UIDevice.isIPad ? .six : .three } } var intValue: Int { @@ -37,18 +44,31 @@ class TileletGroupViewController: BaseViewController { return 3 case .four: return 4 + case .five: + return 5 + case .six: + return 6 } } + + public static var allCases: [TileletGroupViewController.RowQuantity] { + UIDevice.isIPad ? Self.allCases : [.one, .two, .three] + } } - + lazy var rowQuantitySelectorView = { PickerSelectorView(title: "", picker: self.picker, items: RowQuantity.allCases) }() + lazy var paddingSelectorView = { + PickerSelectorView(title: "", + picker: self.picker, + items: TileletGroup.Padding.allCases) + }() + var disabledSwitch = Toggle() - var widthTextField = NumericField() override func viewDidLoad() { super.viewDidLoad() @@ -77,20 +97,15 @@ class TileletGroupViewController: BaseViewController { addActionRow() addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false) - addFormRow(label: "Width", view: widthTextField) + if UIDevice.isIPad { + addFormRow(label: "Padding", view: paddingSelectorView) + } addFormRow(label: "Row Quantity", view: rowQuantitySelectorView) disabledSwitch.onChange = { [weak self] sender in self?.component.isEnabled = !sender.isOn } -// widthTextField -// .numberPublisher -// .sink { [weak self] number in -// if let number { -// // self?.component.childWidth = .value(number.cgFloatValue) -// } -// }.store(in: &subscribers) } func setupModel() { @@ -98,7 +113,6 @@ class TileletGroupViewController: BaseViewController { surfacePickerSelectorView.text = component.surface.rawValue disabledSwitch.isOn = !component.isEnabled rowQuantitySelectorView.text = RowQuantity(quantity: component.rowQuantity).rawValue - widthTextField.text = "" } func setupPicker(){ @@ -108,9 +122,11 @@ class TileletGroupViewController: BaseViewController { self?.contentTopView.backgroundColor = item.color } + paddingSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.padding = item + } + rowQuantitySelectorView.onPickerDidSelect = { [weak self] item in - self?.widthTextField.isEnabled = item.intValue == 0 - if UIDevice.isIPad { self?.component.rowQuantityTablet = item.intValue } else {