Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios_sample into feature/Notification

VDSSample/Classes/Helper.swift

@@ -26,19 +26,18 @@ extension UIView {
 
 extension ButtonBase {
     func labelPublisher(_ label: UILabel){
-        onClickSubscriber = publisher(for: .touchUpInside)
+        onClick = { control in
-            .sink { control in
+            let newText = "\(control.text!) clicked - "
-                let newText = "\(control.text!) clicked - "
+            if let labelText = label.text {
-                if let labelText = label.text {
+                let components = labelText.components(separatedBy: " - ")
-                    let components = labelText.components(separatedBy: " - ")
+                let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
-                    let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
+                let count = Int(last)!
-                    let count = Int(last)!
+                label.text = "\(newText)\(count+1)"
-                    label.text = "\(newText)\(count+1)"
+            } else {
-                } else {
+                label.text = "\(newText)1"
-                    label.text = "\(newText)1"
-                }
-                print("clicked me")
             }
+            print("clicked me")
+        }
     }
 }
 

VDSSample/Protocols/PickerBase.swift

@@ -74,16 +74,14 @@ public class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, Picker
         updateSelectedIndex()
         addArrangedSubview(label)
         addArrangedSubview(button)
-        button
+        button.onClick = { [weak self] _ in
-            .publisher(for: .touchUpInside)
+            self?.picker?.delegate = self
-            .sink { [weak self] _ in
+            self?.picker?.dataSource = self
-                self?.picker?.delegate = self
+            self?.picker?.reloadAllComponents()
-                self?.picker?.dataSource = self
+            self?.picker?.selectRow(self?.selectedIndex ?? 0, inComponent: 0, animated: false)
-                self?.picker?.reloadAllComponents()
+            self?.picker?.isHidden = false
-                self?.picker?.selectRow(self?.selectedIndex ?? 0, inComponent: 0, animated: false)
+            self?.scrollToBottom?()
-                self?.picker?.isHidden = false
+        }
-                self?.scrollToBottom?()
-            }.store(in: &subscribers)
     }
     
     func updateSelectedIndex() {

VDSSample/ViewControllers/NotificationViewController.swift

@@ -62,6 +62,10 @@ class NotificationViewController: BaseViewController {
         addFormRow(label: "First Button Text", view: firstButtonTextField)
         addFormRow(label: "Second Button Text", view: secondButtonTextField)
         
+        notificationView.onCloseClick = { notification in
+            print("onCloseClick: \(notification.titleText)")
+        }
+        
         titleTextField.textPublisher.sink { newString in
             self.notificationView.titleText = newString
         }.store(in: &subscribers)

VDSSample/ViewControllers/TileContainerViewController.swift

@@ -36,7 +36,6 @@ class TileContainerViewController: BaseViewController {
     }()
     
     var clickableSwitch = Toggle()
-    var clickableCancel: AnyCancellable?
 
     var showBackgroundImageSwitch = Toggle()
     var showBorderSwitch = Toggle()
@@ -78,15 +77,13 @@ class TileContainerViewController: BaseViewController {
         clickableSwitch
             .publisher(for: .valueChanged)
             .sink { [weak self] sender in
+                guard let self else { return }
                 if sender.isOn {
-                    self?.clickableCancel = self?.tileContainer
+                    self.tileContainer.onClick = { _ in
-                        .publisher(for: .touchUpInside)
+                        print("you click on me!")
-                        .sink(receiveValue: { _ in
+                    }
-                            print("you click on me!")
-                        })
                 } else {
-                    self?.clickableCancel?.cancel()
+                    self.tileContainer.onClick = nil
-                    self?.clickableCancel = nil
                 }
             }.store(in: &subscribers)
 

VDSSample/ViewControllers/TileletViewController.swift

@@ -79,13 +79,13 @@ class TileletViewController: BaseViewController {
             .sink { [weak self] sender in
                 guard let tilelet = self?.tilelet else { return }
                 if sender.isOn {
-                    tilelet.onClickSubscriber = tilelet.publisher(for: .touchUpInside)
+                    tilelet.onClick = { t in
-                        .sink(receiveValue: { _ in
+                        print("you click on me!")
-                            print("you click on me!")
+                    }
-                        })
+                } else {
+                    tilelet.onClick = nil
                 }
             }.store(in: &subscribers)
-
         widthTextField
             .textPublisher
             .sink { [weak self] text in