Skip to content

Commit

Permalink
Merge pull request #535 from SourcePointUSA/DIA-2934-show-full-text-i…
Browse files Browse the repository at this point in the history 
…nstead-of-truncated

DIA-2934 show full text instead of truncated
  • Loading branch information
@andresilveirah
andresilveirah authored Jan 2, 2024
2 parents b908b9b + 92dd6e3 commit f087b14
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 24 deletions.
7 changes: 3 additions & 4 deletions ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/LongButtonViewCell.xib
View file
Original file line number Diff line number Diff line change
@@ -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="21679"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -20,9 +20,8 @@
<stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="WX5-Fd-aH5">
<rect key="frame" x="20" y="0.0" width="1809" height="46"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Vendor or Category name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lJe-ad-JWG" userLabel="Label">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Vendor or Category" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.40000000000000002" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lJe-ad-JWG" userLabel="Label">
<rect key="frame" x="0.0" y="0.0" width="1809" height="46"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
Expand Down
12 changes: 6 additions & 6 deletions ...ler/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRManagePreferenceViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -107,17 +107,17 @@
<rect key="frame" x="880" y="0.0" width="880" height="748"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" editable="NO" text="Lorem ipsum dolor sit er elit lamet," textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rwQ-S8-sv1" customClass="SPFocusableTextView" customModule="ConsentViewController" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="880" height="400"/>
<rect key="frame" x="0.0" y="0.0" width="880" height="380"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="400" id="Aqp-3G-rDg" userLabel="height = 400"/>
<constraint firstAttribute="height" constant="380" id="Aqp-3G-rDg" userLabel="height = 400"/>
</constraints>
<color key="textColor" systemColor="labelColor"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" sectionHeaderHeight="7" sectionFooterHeight="7" translatesAutoresizingMaskIntoConstraints="NO" id="qa5-l0-OeM">
<rect key="frame" x="0.0" y="400" width="880" height="348"/>
<rect key="frame" x="0.0" y="380" width="880" height="368"/>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</tableView>
</subviews>
Expand Down Expand Up @@ -148,7 +148,7 @@
</objects>
<resources>
<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>
2 changes: 0 additions & 2 deletions ...ller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRVendorDetailsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ class SPGDPRVendorDetailsViewController: SPNativeScreenViewController {
@IBOutlet var PolicyQrCodeLabel: UILabel!
@IBOutlet var LegIntQrCodeLabel: UILabel!
@IBOutlet var ToScanLabel: UILabel!
@IBOutlet var NoteLabel: UILabel!
@IBOutlet var descriptionTextView: SPFocusableTextView!
@IBOutlet var onButton: SPAppleTVButton!
@IBOutlet var offButton: SPAppleTVButton!
Expand Down Expand Up @@ -146,7 +145,6 @@ class SPGDPRVendorDetailsViewController: SPNativeScreenViewController {
loadQRCode(url: vendor?.legIntUrl, imageView: LegIntQrCodeImageView, label: LegIntQrCodeLabel)
ToScanLabel.setDefaultTextColorForDarkMode()
ToScanLabel.isHidden = PolicyQrCodeImageView.image == nil && LegIntQrCodeImageView.image == nil
NoteLabel.isHidden = PolicyQrCodeImageView.image == nil && LegIntQrCodeImageView.image == nil
}

func loadQRCode(url: URL?, imageView: UIImageView, label: UILabel) {
Expand Down
14 changes: 2 additions & 12 deletions ...roller/Classes/Views/tvOS/NativePrivacyManager/GDPR/SPGDPRVendorDetailsViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="22154" 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="22130"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand All @@ -14,7 +14,6 @@
<connections>
<outlet property="LegIntQrCodeImageView" destination="xUZ-MR-Hik" id="PIl-9H-GEE"/>
<outlet property="LegIntQrCodeLabel" destination="qt6-QN-kUC" id="1Ga-dc-lTL"/>
<outlet property="NoteLabel" destination="CvH-La-mLf" id="sdc-zu-A9S"/>
<outlet property="PolicyQrCodeImageView" destination="8pG-QC-mtX" id="T7T-RF-Lxc"/>
<outlet property="PolicyQrCodeLabel" destination="tJ8-2h-SSt" id="raS-m4-YOc"/>
<outlet property="ToScanLabel" destination="ffM-S1-bPe" id="tPY-TK-tdk"/>
Expand Down Expand Up @@ -85,12 +84,6 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note: QR codes not supported on Roku, vendors privacy page URL will be displayed" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CvH-La-mLf">
<rect key="frame" x="-251" y="0.0" width="1382" height="0.0"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<color key="textColor" systemColor="systemRedColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="center" axis="vertical" distribution="fillEqually" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="hd1-ep-WaY" userLabel="Stack View - Actions">
<rect key="frame" x="240" y="0.0" width="400" height="160"/>
<subviews>
Expand Down Expand Up @@ -194,8 +187,5 @@
<systemColor name="labelColor">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemRedColor">
<color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

0 comments on commit f087b14

Please sign in to comment.