Digital ACT-191 ONEAPP-10928 story: content text style and surface updates
This commit is contained in:
parent
56155abbb0
commit
4d5704d47b
@ -57,7 +57,7 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
|
|||||||
|
|
||||||
open var titleLabel = Label().with { label in
|
open var titleLabel = Label().with { label in
|
||||||
label.isAccessibilityElement = true
|
label.isAccessibilityElement = true
|
||||||
label.textStyle = .boldTitleMedium
|
label.textStyle = .boldTitleLarge
|
||||||
}
|
}
|
||||||
|
|
||||||
open var contentLabel = Label().with { label in
|
open var contentLabel = Label().with { label in
|
||||||
@ -79,10 +79,11 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
|
|||||||
// MARK: - Configuration
|
// MARK: - Configuration
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
private var fullWidth: CGFloat = 0.0
|
private var fullWidth: CGFloat = 0.0
|
||||||
private var minHeight: CGFloat = 232.0
|
private var minHeight: CGFloat = 232.0 //min content area height 136 //min window height 232
|
||||||
private var maxHeight: CGFloat = 0.0
|
private var maxHeight: CGFloat = 0.0
|
||||||
private var minWidth: CGFloat = 560.0
|
private var minWidth: CGFloat = 560.0
|
||||||
private var maxWidth: CGFloat = 0.0
|
private var maxWidth: CGFloat = 0.0
|
||||||
|
private var closeCrossButtonSize = 48.0
|
||||||
|
|
||||||
private let containerViewInset = UIDevice.isIPad ? VDSLayout.space12X : VDSLayout.space4X
|
private let containerViewInset = UIDevice.isIPad ? VDSLayout.space12X : VDSLayout.space4X
|
||||||
private let contentLabelTopSpace = UIDevice.isIPad ? VDSLayout.space8X : VDSLayout.space6X
|
private let contentLabelTopSpace = UIDevice.isIPad ? VDSLayout.space8X : VDSLayout.space6X
|
||||||
@ -127,17 +128,19 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
|
|||||||
addSubview(closeButton)
|
addSubview(closeButton)
|
||||||
self.bringSubviewToFront(closeCrossButton)
|
self.bringSubviewToFront(closeCrossButton)
|
||||||
let trailingSpace = UIDevice.isIPad ? containerViewInset/2 : containerViewInset
|
let trailingSpace = UIDevice.isIPad ? containerViewInset/2 : containerViewInset
|
||||||
|
let crossTopSpace = UIDevice.isIPad ? 0 : VDSLayout.space12X
|
||||||
|
let scrollTopSpace = UIDevice.isIPad ? containerViewInset : (crossTopSpace + closeCrossButtonSize)
|
||||||
|
|
||||||
// Activate constraints
|
// Activate constraints
|
||||||
NSLayoutConstraint.activate([
|
NSLayoutConstraint.activate([
|
||||||
widthAnchor.constraint(equalToConstant: maxWidth),
|
widthAnchor.constraint(equalToConstant: maxWidth),
|
||||||
|
|
||||||
// Constraints for the closeCrossButton
|
// Constraints for the closeCrossButton
|
||||||
closeCrossButton.topAnchor.constraint(equalTo: topAnchor),
|
closeCrossButton.topAnchor.constraint(equalTo: topAnchor, constant: crossTopSpace),
|
||||||
closeCrossButton.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor),
|
closeCrossButton.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor),
|
||||||
closeCrossButton.trailingAnchor.constraint(equalTo: trailingAnchor),
|
closeCrossButton.trailingAnchor.constraint(equalTo: trailingAnchor),
|
||||||
closeCrossButton.heightAnchor.constraint(equalToConstant: 48.0),
|
closeCrossButton.heightAnchor.constraint(equalToConstant: closeCrossButtonSize),
|
||||||
closeCrossButton.widthAnchor.constraint(equalToConstant: 48.0),
|
closeCrossButton.widthAnchor.constraint(equalToConstant: closeCrossButtonSize),
|
||||||
|
|
||||||
// Constraints for the bottom button view
|
// Constraints for the bottom button view
|
||||||
closeButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant:containerViewInset),
|
closeButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant:containerViewInset),
|
||||||
@ -145,7 +148,7 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
|
|||||||
closeButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -containerViewInset),
|
closeButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -containerViewInset),
|
||||||
|
|
||||||
// Constraints for the scrollView
|
// Constraints for the scrollView
|
||||||
scrollView.topAnchor.constraint(equalTo: topAnchor, constant: containerViewInset),
|
scrollView.topAnchor.constraint(equalTo: topAnchor, constant: scrollTopSpace),
|
||||||
scrollView.leadingAnchor.constraint(equalTo: leadingAnchor, constant:containerViewInset),
|
scrollView.leadingAnchor.constraint(equalTo: leadingAnchor, constant:containerViewInset),
|
||||||
scrollView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -(trailingSpace)),
|
scrollView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -(trailingSpace)),
|
||||||
scrollView.bottomAnchor.constraint(equalTo: closeButton.topAnchor, constant: -contentLabelBottomSpace),
|
scrollView.bottomAnchor.constraint(equalTo: closeButton.topAnchor, constant: -contentLabelBottomSpace),
|
||||||
@ -175,6 +178,8 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
|
|||||||
|
|
||||||
titleLabel.surface = surface
|
titleLabel.surface = surface
|
||||||
contentLabel.surface = surface
|
contentLabel.surface = surface
|
||||||
|
closeCrossButton.surface = surface
|
||||||
|
closeButton.surface = surface
|
||||||
|
|
||||||
titleLabel.text = modalModel.title
|
titleLabel.text = modalModel.title
|
||||||
contentLabel.text = modalModel.content
|
contentLabel.text = modalModel.content
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user