Merge pull request #565 from SourcePointUSA/DIA-3770_remove_html_tags…

…_tableviews use `loadLabelText` on tvOS UITableViews
SourcePointUSA · Apr 17, 2024 · 641ba0c · 641ba0c
2 parents 2479e0f + cc586ee
commit 641ba0c
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 35 deletions.
diff --git a/...er/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPACategoryDetailsViewController.swift b/...er/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPACategoryDetailsViewController.swift
@@ -83,10 +83,10 @@ extension SPCCPACategoryDetailsViewController: UITableViewDataSource, UITableVie
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section] else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = "\(sections[section]?.settings.text ?? "Partners") (\(partners.count))"
-        label.font = UIFont(from: sections[section]?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section]?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 

diff --git a/...r/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAManagePreferenceViewController.swift b/...r/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAManagePreferenceViewController.swift
@@ -109,14 +109,14 @@ extension SPCCPAManagePreferenceViewController: UITableViewDataSource, UITableVi
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section].header else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = sections[section].header?.settings.text
-        label.font = UIFont(from: sections[section].header?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section].header?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         UITableView.automaticDimension
     }
 

diff --git a/...ontroller/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAPartnersViewController.swift b/...ontroller/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAPartnersViewController.swift
@@ -87,10 +87,10 @@ extension SPCCPAPartnersViewController: UITableViewDataSource, UITableViewDelega
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section] else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = "\(sections[section]?.settings.text ?? "Partners")"
-        label.font = UIFont(from: sections[section]?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section]?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 

diff --git a/...ller/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAVendorDetailsViewController.swift b/...ller/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAVendorDetailsViewController.swift
@@ -85,10 +85,10 @@ extension SPCCPAVendorDetailsViewController: UITableViewDataSource, UITableViewD
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section].header else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = sections[section].header?.settings.text
-        label.font = UIFont(from: sections[section].header?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section].header?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 

diff --git a/...troller/Classes/Views/tvOS/NativePrivacyManager/Common/SPNativeScreenViewController.swift b/...troller/Classes/Views/tvOS/NativePrivacyManager/Common/SPNativeScreenViewController.swift
@@ -204,19 +204,25 @@ class FocusGuideDebugView: UIView {
         }
         return button
     }
+
+    @discardableResult
+    func loadLabelText(forComponent component: SPNativeText, labelText text: String? = nil, label: UILabel) -> UILabel {
+        let style = component.settings.style
+        label.text = ""
+        if let text = text {
+            label.attributedText = text.htmlToAttributedString
+        } else {
+            label.attributedText = component.settings.text.htmlToAttributedString
+        }
+        label.textColor = UIColor(hexString: style.font.color)
+        label.font = UIFont(from: style.font)
+        return label
+    }
 
     @discardableResult
     func loadLabelText(forComponentId id: String, labelText text: String? = nil, label: UILabel) -> UILabel {
         if let textDetails = components.first(where: { $0.id == id }) as? SPNativeText {
-            let style = textDetails.settings.style
-            label.text = ""
-            if let text = text {
-                label.attributedText = text.htmlToAttributedString
-            } else {
-                label.attributedText = textDetails.settings.text.htmlToAttributedString
-            }
-            label.textColor = UIColor(hexString: style.font.color)
-            label.font = UIFont(from: style.font)
+            loadLabelText(forComponent: textDetails, labelText: text, label: label)
         }
         return label
     }

diff --git a/...er/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRCategoryDetailsViewController.swift b/...er/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRCategoryDetailsViewController.swift
@@ -97,10 +97,10 @@ extension SPGDPRCategoryDetailsViewController: UITableViewDataSource, UITableVie
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section] else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = "\(sections[section]?.settings.text ?? "Partners") (\(partners.count))"
-        label.font = UIFont(from: sections[section]?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section]?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 

diff --git a/...r/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRManagePreferenceViewController.swift b/...r/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRManagePreferenceViewController.swift
@@ -33,7 +33,7 @@ class SPGDPRManagePreferenceViewController: SPNativeScreenViewController {
     var nativeLongButton: SPNativeLongButton?
 
     var consentsSnapshot = GDPRPMConsentSnaptshot()
-    var displayingLegIntCategories: Bool { categorySlider.selectedSegmentIndex == 1 || emptyConsentSection}
+    var displayingLegIntCategories: Bool { categorySlider.selectedSegmentIndex == 1 || emptyConsentSection }
 
     var categories: [GDPRCategory] = []
     var legIntCategories: [GDPRCategory] { categories.filter { $0.legIntVendors?.isNotEmpty() ?? false } }
@@ -180,10 +180,10 @@ extension SPGDPRManagePreferenceViewController: UITableViewDataSource, UITableVi
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section].header else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = sections[section].header?.settings.text
-        label.font = UIFont(from: sections[section].header?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section].header?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         label.isHidden = displayingLegIntCategories ?
             sections[section].contentLegIntCategory.isEmpty : sections[section].contentConsent.isEmpty
         return label

diff --git a/...ontroller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRPartnersViewController.swift b/...ontroller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRPartnersViewController.swift
@@ -105,10 +105,10 @@ extension SPGDPRPartnersViewController: UITableViewDataSource, UITableViewDelega
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        guard let sectionComponent = sections[section] else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = "\(sections[section]?.settings.text.stripOutCss(stripHtml: true) ?? "Partners")"
-        label.font = UIFont(from: sections[section]?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section]?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         return label
     }
 

diff --git a/...ller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRVendorDetailsViewController.swift b/...ller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRVendorDetailsViewController.swift
@@ -188,10 +188,10 @@ extension SPGDPRVendorDetailsViewController: UITableViewDataSource, UITableViewD
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let headerView = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 50))
+        guard let sectionComponent = sections[section].header else { return nil }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
-        label.text = sections[section].header?.settings.text
-        label.font = UIFont(from: sections[section].header?.settings.style.font)
-        label.textColor = UIColor(hexString: sections[section].header?.settings.style.font.color)
+        loadLabelText(forComponent: sectionComponent, label: label)
         headerView.addSubview(label)
         if sections[section].hasAdditionalContent {
             let retentionlabel = UILabel()