From 4d5704d47b0382e732ccfbeaa9c57fcbbc81f1c9 Mon Sep 17 00:00:00 2001
From: Vasavi Kanamarlapudi <vasavi.kanamarlapudi@verizon.com>
Date: Wed, 25 Sep 2024 16:08:13 +0530
Subject: [PATCH] Digital ACT-191 ONEAPP-10928 story: content text style and
 surface updates

---
 VDS/Components/Modal/ModalDialog.swift | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/VDS/Components/Modal/ModalDialog.swift b/VDS/Components/Modal/ModalDialog.swift
index a54a208f..7ac34ba8 100644
--- a/VDS/Components/Modal/ModalDialog.swift
+++ b/VDS/Components/Modal/ModalDialog.swift
@@ -57,7 +57,7 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
 
     open var titleLabel = Label().with { label in
         label.isAccessibilityElement = true
-        label.textStyle = .boldTitleMedium
+        label.textStyle = .boldTitleLarge
     }
     
     open var contentLabel = Label().with { label in
@@ -79,10 +79,11 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
     // MARK: - Configuration
     //--------------------------------------------------
     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 minWidth: CGFloat = 560.0
     private var maxWidth: CGFloat = 0.0
+    private var closeCrossButtonSize = 48.0
     
     private let containerViewInset = UIDevice.isIPad ? VDSLayout.space12X : VDSLayout.space4X
     private let contentLabelTopSpace = UIDevice.isIPad ? VDSLayout.space8X : VDSLayout.space6X
@@ -127,17 +128,19 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
         addSubview(closeButton)
         self.bringSubviewToFront(closeCrossButton)
         let trailingSpace = UIDevice.isIPad ? containerViewInset/2 : containerViewInset
-
+        let crossTopSpace = UIDevice.isIPad ? 0 : VDSLayout.space12X
+        let scrollTopSpace = UIDevice.isIPad ? containerViewInset : (crossTopSpace + closeCrossButtonSize)
+        
         // Activate constraints
         NSLayoutConstraint.activate([
             widthAnchor.constraint(equalToConstant: maxWidth),
 
             // Constraints for the closeCrossButton
-            closeCrossButton.topAnchor.constraint(equalTo: topAnchor),
+            closeCrossButton.topAnchor.constraint(equalTo: topAnchor, constant: crossTopSpace),
             closeCrossButton.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor),
             closeCrossButton.trailingAnchor.constraint(equalTo: trailingAnchor),
-            closeCrossButton.heightAnchor.constraint(equalToConstant: 48.0),
-            closeCrossButton.widthAnchor.constraint(equalToConstant: 48.0),
+            closeCrossButton.heightAnchor.constraint(equalToConstant: closeCrossButtonSize),
+            closeCrossButton.widthAnchor.constraint(equalToConstant: closeCrossButtonSize),
 
             // Constraints for the bottom button view
             closeButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant:containerViewInset),
@@ -145,7 +148,7 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
             closeButton.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -containerViewInset),
 
             // 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.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -(trailingSpace)),
             scrollView.bottomAnchor.constraint(equalTo: closeButton.topAnchor, constant: -contentLabelBottomSpace),
@@ -175,6 +178,8 @@ open class ModalDialog: View, UIScrollViewDelegate, ParentViewProtocol {
         
         titleLabel.surface = surface
         contentLabel.surface = surface
+        closeCrossButton.surface = surface
+        closeButton.surface = surface
         
         titleLabel.text = modalModel.title
         contentLabel.text = modalModel.content