From 4d0beca742903b284681e7aa34a8432a7d4584fd Mon Sep 17 00:00:00 2001
From: Dmytro Fedko <dmytro.f@gowombat.team>
Date: Thu, 28 Dec 2023 18:49:42 +0100
Subject: [PATCH 1/2] DIA-2936 Change `descriptionText` to
 `SPFocusableTextView` on `CustomView`

---
 .../Common/SPCustomViewController.swift                   | 5 +++--
 .../Common/SPCustomViewController.xib                     | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.swift b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.swift
index 9a03cd9c6..2f6ced81d 100644
--- a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.swift
+++ b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 
 @objcMembers class SPCustomViewController: SPNativeScreenViewController {
-    @IBOutlet var descriptionTextView: UITextView!
+    @IBOutlet var descriptionTextView: SPFocusableTextView!
     @IBOutlet var logoImageView: UIImageView!
     @IBOutlet var closeButton: SPAppleTVButton!
     @IBOutlet var header: SPPMHeader!
@@ -17,7 +17,8 @@ import UIKit
     override public func viewDidLoad() {
         super.viewDidLoad()
         setHeader()
-        loadTextView(forComponentId: "Body", textView: descriptionTextView)
+        loadTextView(forComponentId: "Body", textView: descriptionTextView, bounces: false)
+        descriptionTextView.flashScrollIndicators()
         loadButton(forComponentId: "CloseButton", button: closeButton)
         loadImage(forComponentId: "LogoImage", imageView: logoImageView)
         addFocusGuide(from: header, to: descriptionTextView, direction: .rightLeft)
diff --git a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.xib b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.xib
index 7be41193b..b5e158ece 100644
--- a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.xib
+++ b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPCustomViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="21507" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="22155" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="appleTV" appearance="light"/>
     <dependencies>
         <deployment identifier="tvOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -63,7 +63,7 @@
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="smg-af-qgx" userLabel="Stack View - 2nd Column">
                                     <rect key="frame" x="880" y="0.0" width="880" height="710"/>
                                     <subviews>
-                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fY0-fz-czN" userLabel="DescriptionText View">
+                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" indicatorStyle="black" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fY0-fz-czN" userLabel="DescriptionText View" customClass="SPFocusableTextView" customModule="ConsentViewController" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="880" height="710"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
@@ -99,7 +99,7 @@
     <resources>
         <image name="SP_Icon" width="265" height="259"/>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
     </resources>
 </document>

From 3e51318ae0ced92b7274e2463022c41c375437ed Mon Sep 17 00:00:00 2001
From: Dmytro Fedko <dmytro.f@gowombat.team>
Date: Thu, 28 Dec 2023 18:50:10 +0100
Subject: [PATCH 2/2] DIA-2936 Make scroll `Black` color

---
 .../Common/SPPrivacyPolicyViewController.xib              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPPrivacyPolicyViewController.xib b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPPrivacyPolicyViewController.xib
index 5f80abd8c..c2df3761b 100644
--- a/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPPrivacyPolicyViewController.xib
+++ b/ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPPrivacyPolicyViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="21701" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="22155" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="appleTV" appearance="light"/>
     <dependencies>
         <deployment identifier="tvOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -63,7 +63,7 @@
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="smg-af-qgx" userLabel="Stack View - 2nd Column">
                                     <rect key="frame" x="880" y="0.0" width="880" height="710"/>
                                     <subviews>
-                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fY0-fz-czN" userLabel="DescriptionText View" customClass="SPFocusableTextView" customModule="ConsentViewController" customModuleProvider="target">
+                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" indicatorStyle="black" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="fY0-fz-czN" userLabel="DescriptionText View" customClass="SPFocusableTextView" customModule="ConsentViewController" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="880" height="710"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
@@ -99,7 +99,7 @@
     <resources>
         <image name="SP_Icon" width="265" height="259"/>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
     </resources>
 </document>