Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DIA-3813 fix tvos buttons spacing #573

Merged
merged 4 commits into from
Jun 26, 2024
Merged

DIA-3813 fix tvos buttons spacing #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36f0e85
fix blurry QR codes
andresilveirah Jun 26, 2024
c8b4494
fix tvOS CCPA buttons spacing
andresilveirah Jun 26, 2024
91aef59
revert debug config
andresilveirah Jun 26, 2024
be3329d
fix tvOS GDPR buttons layout
andresilveirah Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions ...ller/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPACategoryDetailsViewController.xib
View file
Open in desktop
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="32700.99.1234" 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="22684"/>
<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 @@ -39,7 +39,7 @@
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eqS-Ry-AfJ" userLabel="Stack View - Content">
<rect key="frame" x="0.0" y="116" width="1760" height="844"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="k39-kg-wtW" userLabel="Stack View - 1st Column">
<stackView opaque="NO" contentMode="top" axis="vertical" alignment="center" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="k39-kg-wtW" userLabel="Stack View - 1st Column">
<rect key="frame" x="0.0" y="0.0" width="880" height="844"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vb7-1U-5xJ">
Expand All @@ -49,19 +49,25 @@
<constraint firstAttribute="width" constant="360" id="zA3-xf-QpO"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Z9m-j1-qsf" userLabel="Stack View - Actions">
<rect key="frame" x="190" y="664" width="500" height="180"/>
<stackView opaque="NO" contentMode="top" axis="vertical" distribution="equalCentering" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Z9m-j1-qsf" userLabel="Stack View - Actions">
<rect key="frame" x="190" y="400" width="500" height="128"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rpm-y7-mWC" customClass="SPAppleTVButton" customModule="ConsentViewController" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="500" height="86"/>
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="IDO-iP-Fsm"/>
</constraints>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="On"/>
<connections>
<action selector="onOnButtonTap:" destination="-1" eventType="primaryActionTriggered" id="fnu-qT-62H"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Uh-Kp-cvq" customClass="SPAppleTVButton" customModule="ConsentViewController" customModuleProvider="target">
<rect key="frame" x="0.0" y="94" width="500" height="86"/>
<rect key="frame" x="0.0" y="68" width="500" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="T5k-bQ-sRc"/>
</constraints>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Off"/>
<connections>
Expand All @@ -74,6 +80,9 @@
<constraint firstAttribute="width" constant="500" id="kWS-kE-P2e"/>
</constraints>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x59-Dk-9BC" userLabel="Spacer">
<rect key="frame" x="190" y="568" width="500" height="276"/>
</view>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HUv-Pl-Ojx" userLabel="Stack View - 2nd Column">
Expand Down Expand Up @@ -121,7 +130,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>
29 changes: 19 additions & 10 deletions ...ler/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAManagePreferenceViewController.xib
View file
Open in desktop
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="32700.99.1234" 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="22684"/>
<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 @@ -40,7 +40,7 @@
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A7J-Iw-S0w" userLabel="Stack View - Content">
<rect key="frame" x="0.0" y="116" width="1760" height="844"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="6Dj-j9-6q0" userLabel="Stack View - 1st Column">
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="6Dj-j9-6q0" userLabel="Stack View - 1st Column">
<rect key="frame" x="0.0" y="0.0" width="880" height="844"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0d5-2y-hex">
Expand All @@ -51,28 +51,34 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumScaleFactor="0.69999998807907104" translatesAutoresizingMaskIntoConstraints="NO" id="mzo-8H-642" userLabel="SelectedCategoryLabel">
<rect key="frame" x="165" y="472" width="550" height="80"/>
<rect key="frame" x="165" y="400" width="550" height="80"/>
<constraints>
<constraint firstAttribute="width" constant="550" id="I3Q-Dc-zSf"/>
<constraint firstAttribute="height" constant="80" id="Iop-iC-NkE"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="rNx-CU-XlL"/>
</constraints>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="i2S-g5-yct" userLabel="Stack View - Actions">
<rect key="frame" x="190" y="664" width="500" height="180"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="i2S-g5-yct" userLabel="Stack View - Actions">
<rect key="frame" x="190" y="520" width="500" height="128"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3ab-43-cUI" customClass="SPAppleTVButton" customModule="ConsentViewController" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="500" height="86"/>
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="StN-8G-XAA"/>
</constraints>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Accept All"/>
<connections>
<action selector="onAcceptTap:" destination="-1" eventType="primaryActionTriggered" id="bGN-g8-xIF"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NkU-e5-wl4" customClass="SPAppleTVButton" customModule="ConsentViewController" customModuleProvider="target">
<rect key="frame" x="0.0" y="94" width="500" height="86"/>
<rect key="frame" x="0.0" y="68" width="500" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="dpt-rq-R4b"/>
</constraints>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Save &amp; Exit"/>
<connections>
Expand All @@ -85,6 +91,9 @@
<constraint firstAttribute="width" constant="500" id="jqC-kR-DwJ"/>
</constraints>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w3s-g0-adj" userLabel="Spacer">
<rect key="frame" x="190" y="688" width="500" height="156"/>
</view>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="4ej-KD-EOf" userLabel="Stack View - 2nd Column">
Expand Down Expand Up @@ -132,7 +141,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>