Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios_sample into feature/Notification
This commit is contained in:
commit
b1987b796e
@ -26,19 +26,18 @@ extension UIView {
|
||||
|
||||
extension ButtonBase {
|
||||
func labelPublisher(_ label: UILabel){
|
||||
onClickSubscriber = publisher(for: .touchUpInside)
|
||||
.sink { control in
|
||||
let newText = "\(control.text!) clicked - "
|
||||
if let labelText = label.text {
|
||||
let components = labelText.components(separatedBy: " - ")
|
||||
let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
|
||||
let count = Int(last)!
|
||||
label.text = "\(newText)\(count+1)"
|
||||
} else {
|
||||
label.text = "\(newText)1"
|
||||
}
|
||||
print("clicked me")
|
||||
onClick = { control in
|
||||
let newText = "\(control.text!) clicked - "
|
||||
if let labelText = label.text {
|
||||
let components = labelText.components(separatedBy: " - ")
|
||||
let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
|
||||
let count = Int(last)!
|
||||
label.text = "\(newText)\(count+1)"
|
||||
} else {
|
||||
label.text = "\(newText)1"
|
||||
}
|
||||
print("clicked me")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -74,16 +74,14 @@ public class PickerSelectorView<EnumType: RawRepresentable>: UIStackView, Picker
|
||||
updateSelectedIndex()
|
||||
addArrangedSubview(label)
|
||||
addArrangedSubview(button)
|
||||
button
|
||||
.publisher(for: .touchUpInside)
|
||||
.sink { [weak self] _ in
|
||||
self?.picker?.delegate = self
|
||||
self?.picker?.dataSource = self
|
||||
self?.picker?.reloadAllComponents()
|
||||
self?.picker?.selectRow(self?.selectedIndex ?? 0, inComponent: 0, animated: false)
|
||||
self?.picker?.isHidden = false
|
||||
self?.scrollToBottom?()
|
||||
}.store(in: &subscribers)
|
||||
button.onClick = { [weak self] _ in
|
||||
self?.picker?.delegate = self
|
||||
self?.picker?.dataSource = self
|
||||
self?.picker?.reloadAllComponents()
|
||||
self?.picker?.selectRow(self?.selectedIndex ?? 0, inComponent: 0, animated: false)
|
||||
self?.picker?.isHidden = false
|
||||
self?.scrollToBottom?()
|
||||
}
|
||||
}
|
||||
|
||||
func updateSelectedIndex() {
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
.publisher(for: .touchUpInside)
|
||||
.sink(receiveValue: { _ in
|
||||
print("you click on me!")
|
||||
})
|
||||
self.tileContainer.onClick = { _ in
|
||||
print("you click on me!")
|
||||
}
|
||||
} else {
|
||||
self?.clickableCancel?.cancel()
|
||||
self?.clickableCancel = nil
|
||||
self.tileContainer.onClick = nil
|
||||
}
|
||||
}.store(in: &subscribers)
|
||||
|
||||
|
||||
@ -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)
|
||||
.sink(receiveValue: { _ in
|
||||
print("you click on me!")
|
||||
})
|
||||
tilelet.onClick = { t in
|
||||
print("you click on me!")
|
||||
}
|
||||
} else {
|
||||
tilelet.onClick = nil
|
||||
}
|
||||
}.store(in: &subscribers)
|
||||
|
||||
widthTextField
|
||||
.textPublisher
|
||||
.sink { [weak self] text in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user