Merge branch 'develop' into bugfix/Table

VDSSample.xcodeproj/project.pbxproj

@@ -36,6 +36,7 @@
 		1832AC5B2BA1347B008AE476 /* BreadcrumbsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */; };
 		186D13CD2BBA990800986B53 /* DropdownSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */; };
 		18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */; };
+		18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18AE87512C06FDD60075F181 /* CarouselViewController.swift */; };
 		440B84CC2BD8E98B004A732A /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440B84CB2BD8E98B004A732A /* TableViewController.swift */; };
 		445BA07A29C088470036A7C5 /* NotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445BA07929C088470036A7C5 /* NotificationViewController.swift */; };
 		44604AD929CE1CF900E62B51 /* LineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD829CE1CF900E62B51 /* LineViewController.swift */; };
@@ -133,6 +134,7 @@
 		1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbsViewController.swift; sourceTree = "<group>"; };
 		186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownSelectViewController.swift; sourceTree = "<group>"; };
 		18A3F12F2BD9332500498E4A /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = "<group>"; };
+		18AE87512C06FDD60075F181 /* CarouselViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselViewController.swift; sourceTree = "<group>"; };
 		440B84CB2BD8E98B004A732A /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
 		445BA07929C088470036A7C5 /* NotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewController.swift; sourceTree = "<group>"; };
 		44604AD829CE1CF900E62B51 /* LineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineViewController.swift; sourceTree = "<group>"; };
@@ -328,6 +330,7 @@
 				EA81410D2A0ED8DC004F60D2 /* ButtonIconViewController.swift */,
 				5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */,
 				18A3F12F2BD9332500498E4A /* CalendarViewController.swift */,
+				18AE87512C06FDD60075F181 /* CarouselViewController.swift */,
 				1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */,
 				EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */,
 				EAF7F09B2899B92400B287F5 /* CheckboxItemViewController.swift */,
@@ -546,6 +549,7 @@
 				EAF7F09C2899B92400B287F5 /* CheckboxItemViewController.swift in Sources */,
 				EA0D1C2F2A66CFE900E5C127 /* CheckboxViewController.swift in Sources */,
 				18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */,
+				18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */,
 				EA596ABA2A16B2ED00300C4B /* TabsViewController.swift in Sources */,
 				EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */,
 				EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */,
@@ -713,7 +717,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 70;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -749,7 +753,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 70;
+				CURRENT_PROJECT_VERSION = 71;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;

VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift

@@ -114,7 +114,7 @@ class CarouselScrollbarViewConttroller: BaseViewController<CarouselScrollbar> {
         }
         
         layoutPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.selectedLayout = item
+            self?.component.layout = item
             self?.component.position = Int(self?.positionTextField.text ?? "1") ?? 1
         }
     }

VDSSample/ViewControllers/CarouselViewController.swift

@@ -0,0 +1,214 @@
+//
+//  CarouselViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 29/05/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+import Combine
+import VDSCoreTokens
+
+class CarouselViewController: BaseViewController<Carousel> {
+    
+    let label = Label()
+    
+    lazy var paginationDisplayPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: Carousel.PaginationDisplay.allCases)
+    }()
+    
+    lazy var peekPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: Carousel.Peek.allCases)
+    }()
+    
+    lazy var gutterPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: Carousel.Gutter.allCases)
+    }()
+    
+    lazy var layoutPickerSelectorView = {
+        PickerSelectorView(title: "1UP",
+                           picker: self.picker,
+                           items: UIDevice.isIPad ? CarouselScrollbar.Layout.allCases : [CarouselScrollbar.Layout.oneUP, CarouselScrollbar.Layout.twoUP, CarouselScrollbar.Layout.threeUP])
+    }()
+    
+    lazy var paginationKindPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: ButtonIcon.Kind.allCases)
+    }()
+    
+    lazy var horizAlignmtPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: Carousel.Horizontal.allCases)
+    }()
+    
+    lazy var vertAlignmtPickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: Carousel.Vertical.allCases)
+    }()
+    
+    var paginationFloatingSwitch = Toggle()
+    var paginationInsetField = NumericField()
+    var selectedIndexField = NumericField()
+    var rows: [UIView] = []
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        //add form rows
+        addFormRow(label: "onChange", view: label)
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Pagination Display", view: paginationDisplayPickerSelectorView)
+        addFormRow(label: "Peek", view: peekPickerSelectorView)
+        addFormRow(label: "Gutter", view: gutterPickerSelectorView)
+        addFormRow(label: "Layout", view: layoutPickerSelectorView)
+//        addFormRow(label: "Selected Group Index", view: selectedIndexField)
+        addFormRow(label: "Pagination Kind", view: paginationKindPickerSelectorView)
+        addFormRow(label: "Pagination Float", view: paginationFloatingSwitch)
+        addFormRow(label: "Pagination Inset", view: paginationInsetField)
+        addFormRow(label: "Slot Horizontal Alignment", view: horizAlignmtPickerSelectorView)
+        addFormRow(label: "Slot Vertical Alignment", view: vertAlignmtPickerSelectorView)
+        
+        selectedIndexField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number, number.intValue >= 0 {
+                    self?.component.groupIndex = number.intValue
+                } else {
+                    self?.component.groupIndex = 0
+                }
+            }.store(in: &subscribers)
+        
+        paginationInsetField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number {
+                    self?.component.paginationInset = number.cgFloatValue
+                } else {
+                    self?.component.paginationInset =  UIDevice.isIPad ? VDSLayout.space3X : VDSLayout.space2X
+                }
+            }.store(in: &subscribers)
+        
+        paginationFloatingSwitch.onChange = { [weak self] sender in
+            guard let self else { return }
+            self.component.pagination = .init(kind: paginationKindPickerSelectorView.selectedItem, floating: sender.isOn)
+        }
+        
+    }
+    
+    func setupModel() {
+        //setup UI
+        paginationDisplayPickerSelectorView.text = component.paginationDisplay.rawValue
+        peekPickerSelectorView.text = component.peek.rawValue
+        gutterPickerSelectorView.text = component.gutter.rawValue
+        layoutPickerSelectorView.text = component.layout.rawValue
+        paginationKindPickerSelectorView.text = ButtonIcon.Kind.lowContrast.rawValue
+        paginationFloatingSwitch.isOn = true
+        paginationInsetField.text = UIDevice.isIPad ? "12" : "8"
+        let onClick: (ButtonBase) -> Void = { button in print("\(button.text!) clicked")}
+        rows.append(Label().with { $0.text = "Offer you best deals on phones, tablets, home, internet and more. Pre order the new version mobiles and get off *T&C apply."; $0.textStyle = UIDevice.isIPad ? .bodyLarge : .bodySmall; $0.lineBreakMode = .byWordWrapping})
+        rows.append(Button().with{ $0.use = .secondary; $0.text = "Secondary"; $0.onClick =  onClick})
+        rows.append(Label().with { $0.text = "Get iPhone 15 on us. Online only. ";  $0.textStyle = UIDevice.isIPad ? .bodyLarge : .bodySmall; $0.lineBreakMode = .byWordWrapping})
+        rows.append(Button().with{ $0.use = .primary; $0.text = "Primary"; $0.onClick =  onClick})
+        rows.append(Label().with { $0.text = "Unlimited plans. No trade-in required.";  $0.textStyle = UIDevice.isIPad ? .bodyLarge : .bodySmall; $0.lineBreakMode = .byWordWrapping})
+        rows.append(Label().with { $0.text = "With trade-in. Any condition guaranteed";  $0.textStyle = UIDevice.isIPad ? .bodyLarge : .bodySmall; $0.lineBreakMode = .byWordWrapping})
+        rows.append(Button().with{ $0.use = .primary; $0.text = "More"; $0.onClick =  onClick})
+        rows.append(Button().with{ $0.use = .secondary; $0.text = "Shop"; $0.onClick =  onClick})
+        rows.append(Button().with{ $0.use = .secondary; $0.text = "Buy"; $0.onClick =  onClick})
+        rows.append(Button().with{ $0.use = .secondary; $0.text = "Offer"; $0.onClick =  onClick})
+        component.views = rows.compactMap({ view in
+              return TileContainer().with { instance in
+                instance.aspectRatio = .none
+                instance.addContentView(view)
+                instance.color = .custom(.lightGray)
+              }
+            })
+        label.text = "0"
+        
+        component.slotAlignment = .init(vertical: Carousel.Vertical.top, horizontal: Carousel.Horizontal.left)
+        horizAlignmtPickerSelectorView.text = Carousel.Horizontal.left.rawValue
+        vertAlignmtPickerSelectorView.text = Carousel.Vertical.top.rawValue
+        
+        // Callback when moving the carousel. Returns selectedGroupIndex.
+        component.onChange = { [weak self] selectedGroupIndex in
+            guard let self else { return }
+            label.text = "\(selectedGroupIndex)"
+        }
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+        
+        paginationDisplayPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.paginationDisplay = item
+            if (self?.component.peek == Carousel.Peek.none) && item == .none {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
+                    self?.paginationDisplayPickerSelectorView.text = "persistent"
+                }
+            }
+        }
+        
+        peekPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.peek = item
+            if item == .none {
+                self?.paginationDisplayPickerSelectorView.text = "persistent"
+            } else if item == .minimum && UIDevice.isIPad {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
+                    self?.peekPickerSelectorView.text = "standard"
+                }
+            } else if item == .standard && !UIDevice.isIPad && (self?.component.layout != CarouselScrollbar.Layout.oneUP) {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
+                    self?.peekPickerSelectorView.text = "minimum"
+                }
+            }
+        }
+        
+        gutterPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.gutter = item
+        }
+        
+        layoutPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            if item != .oneUP && !UIDevice.isIPad && self?.component.peek == Carousel.Peek.standard {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
+                    self?.peekPickerSelectorView.text = "minimum"
+                }
+            }
+            self?.component.layout = item
+            self?.label.text = "0"
+        }
+        
+        paginationKindPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            guard let self else { return }
+            self.component.pagination = .init(kind: item, floating: paginationFloatingSwitch.isOn)
+        }
+        
+        vertAlignmtPickerSelectorView.onPickerDidSelect = { [weak self] item in
+            guard let self else { return }
+            self.component.slotAlignment = .init(vertical: item, horizontal: horizAlignmtPickerSelectorView.selectedItem)
+        }
+        
+        horizAlignmtPickerSelectorView.onPickerDidSelect = { [weak self] item in
+            guard let self else { return }
+            self.component.slotAlignment = .init(vertical: vertAlignmtPickerSelectorView.selectedItem, horizontal: item)
+        }
+    }
+}

VDSSample/ViewControllers/MenuViewController.swift

@@ -75,6 +75,7 @@ class MenuViewController: UITableViewController, TooltipLaunchable {
         MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
         MenuComponent(title: "ButtonIcon", completed: true, viewController: ButtonIconViewController.self),
         MenuComponent(title: "Calendar", completed: true, viewController: CalendarViewController.self),
+        MenuComponent(title: "Carousel", completed: true, viewController: CarouselViewController.self),
         MenuComponent(title: "Carousel Scrollbar", completed: true, viewController: CarouselScrollbarViewConttroller.self),
         MenuComponent(title: "Checkbox", completed: true, viewController: CheckboxViewController.self),
         MenuComponent(title: "CheckboxItem", completed: true, viewController: CheckboxItemViewController.self),