Skip to content

Commit 0f0216e

Browse files
andresilveirahandresilveirah
committed
Merge branch 'develop'
2 parents 009e15a + 4ad85b1 commit 0f0216e

File tree

281 files changed

+1164
-290619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+1164
-290619
lines changed

‎.github/workflows/swift.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ jobs:
7070
name: Upload ConsentViewController tests results
7171
with:
7272
path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
73-
NativePMExampleApp:
73+
TVOSExampleApp:
7474
runs-on: macos-latest
7575
steps:
7676
- uses: actions/checkout@v4
7777
- run: sudo xcode-select -s /Applications/Xcode_15.3.app
7878
- name: ConsentViewController testing -> Apple TV (tvOS 17.4)
79-
run: xcodebuild test -scheme NativePMExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.4'
79+
run: xcodebuild test -scheme TVOSExampleApp -workspace ConsentViewController.xcworkspace -destination 'platform=tvOS Simulator,name=Apple TV,OS=17.4'
8080
- uses: actions/upload-artifact@v2
8181
if: failure()
82-
name: Upload NativePMExampleApp tests results
82+
name: Upload TVOSExampleApp tests results
8383
with:
8484
path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 7.6.10 (Jun, 27, 2024)
2+
* [DIA-3813](https://sourcepoint.atlassian.net/browse/DIA-3813) Adjust tvOS buttons layout [#573](https://github.com/SourcePointUSA/ios-cmp-app/pull/573)
3+
14
# 7.6.9 (Jun, 10, 2024)
25
* [DIA-4076](https://sourcepoint.atlassian.net/browse/DIA-4076) Add `consentLanguage` param in query for PM call from FLM [#572](https://github.com/SourcePointUSA/ios-cmp-app/pull/572)
36
* [HCD 516](https://sourcepoint.atlassian.net/browse/HCD-516) README.md update: Add default language precedence [#570](https://github.com/SourcePointUSA/ios-cmp-app/pull/570)

‎ConsentViewController.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ConsentViewController'
3-
s.version = '7.6.9'
3+
s.version = '7.6.10'
44
s.summary = 'SourcePoint\'s ConsentViewController to handle privacy consents.'
55
s.homepage = 'https://www.sourcepoint.com'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }

‎ConsentViewController/Classes/SPConsentManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ import UIKit
263263
}
264264

265265
@objc extension SPConsentManager: SPSDK {
266-
public static let VERSION = "7.6.9"
266+
public static let VERSION = "7.6.10"
267267

268268
public var gdprApplies: Bool { spCoordinator.userData.gdpr?.applies ?? false }
269269

‎ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPACategoryDetailsViewController.xib

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="21701" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<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">
33
<device id="appleTV" appearance="light"/>
44
<dependencies>
55
<deployment identifier="tvOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -39,7 +39,7 @@
3939
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eqS-Ry-AfJ" userLabel="Stack View - Content">
4040
<rect key="frame" x="0.0" y="116" width="1760" height="844"/>
4141
<subviews>
42-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="k39-kg-wtW" userLabel="Stack View - 1st Column">
42+
<stackView opaque="NO" contentMode="top" axis="vertical" alignment="center" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="k39-kg-wtW" userLabel="Stack View - 1st Column">
4343
<rect key="frame" x="0.0" y="0.0" width="880" height="844"/>
4444
<subviews>
4545
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vb7-1U-5xJ">
@@ -49,19 +49,25 @@
4949
<constraint firstAttribute="width" constant="360" id="zA3-xf-QpO"/>
5050
</constraints>
5151
</imageView>
52-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Z9m-j1-qsf" userLabel="Stack View - Actions">
53-
<rect key="frame" x="190" y="664" width="500" height="180"/>
52+
<stackView opaque="NO" contentMode="top" axis="vertical" distribution="equalCentering" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Z9m-j1-qsf" userLabel="Stack View - Actions">
53+
<rect key="frame" x="190" y="400" width="500" height="128"/>
5454
<subviews>
5555
<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">
56-
<rect key="frame" x="0.0" y="0.0" width="500" height="86"/>
56+
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
57+
<constraints>
58+
<constraint firstAttribute="height" constant="60" id="IDO-iP-Fsm"/>
59+
</constraints>
5760
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
5861
<state key="normal" title="On"/>
5962
<connections>
6063
<action selector="onOnButtonTap:" destination="-1" eventType="primaryActionTriggered" id="fnu-qT-62H"/>
6164
</connections>
6265
</button>
6366
<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">
64-
<rect key="frame" x="0.0" y="94" width="500" height="86"/>
67+
<rect key="frame" x="0.0" y="68" width="500" height="60"/>
68+
<constraints>
69+
<constraint firstAttribute="height" constant="60" id="T5k-bQ-sRc"/>
70+
</constraints>
6571
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
6672
<state key="normal" title="Off"/>
6773
<connections>
@@ -74,6 +80,9 @@
7480
<constraint firstAttribute="width" constant="500" id="kWS-kE-P2e"/>
7581
</constraints>
7682
</stackView>
83+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x59-Dk-9BC" userLabel="Spacer">
84+
<rect key="frame" x="190" y="568" width="500" height="276"/>
85+
</view>
7786
</subviews>
7887
</stackView>
7988
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HUv-Pl-Ojx" userLabel="Stack View - 2nd Column">
@@ -121,7 +130,7 @@
121130
</objects>
122131
<resources>
123132
<systemColor name="labelColor">
124-
<color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
133+
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
125134
</systemColor>
126135
</resources>
127136
</document>

‎ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/CCPA/SPCCPAManagePreferenceViewController.xib

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="21507" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<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">
33
<device id="appleTV" appearance="light"/>
44
<dependencies>
55
<deployment identifier="tvOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -40,7 +40,7 @@
4040
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A7J-Iw-S0w" userLabel="Stack View - Content">
4141
<rect key="frame" x="0.0" y="116" width="1760" height="844"/>
4242
<subviews>
43-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="6Dj-j9-6q0" userLabel="Stack View - 1st Column">
43+
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="6Dj-j9-6q0" userLabel="Stack View - 1st Column">
4444
<rect key="frame" x="0.0" y="0.0" width="880" height="844"/>
4545
<subviews>
4646
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0d5-2y-hex">
@@ -51,28 +51,34 @@
5151
</constraints>
5252
</imageView>
5353
<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">
54-
<rect key="frame" x="165" y="472" width="550" height="80"/>
54+
<rect key="frame" x="165" y="400" width="550" height="80"/>
5555
<constraints>
5656
<constraint firstAttribute="width" constant="550" id="I3Q-Dc-zSf"/>
57-
<constraint firstAttribute="height" constant="80" id="Iop-iC-NkE"/>
57+
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="rNx-CU-XlL"/>
5858
</constraints>
5959
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
6060
<nil key="textColor"/>
6161
<nil key="highlightedColor"/>
6262
</label>
63-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="i2S-g5-yct" userLabel="Stack View - Actions">
64-
<rect key="frame" x="190" y="664" width="500" height="180"/>
63+
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="i2S-g5-yct" userLabel="Stack View - Actions">
64+
<rect key="frame" x="190" y="520" width="500" height="128"/>
6565
<subviews>
6666
<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">
67-
<rect key="frame" x="0.0" y="0.0" width="500" height="86"/>
67+
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
68+
<constraints>
69+
<constraint firstAttribute="height" constant="60" id="StN-8G-XAA"/>
70+
</constraints>
6871
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
6972
<state key="normal" title="Accept All"/>
7073
<connections>
7174
<action selector="onAcceptTap:" destination="-1" eventType="primaryActionTriggered" id="bGN-g8-xIF"/>
7275
</connections>
7376
</button>
7477
<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">
75-
<rect key="frame" x="0.0" y="94" width="500" height="86"/>
78+
<rect key="frame" x="0.0" y="68" width="500" height="60"/>
79+
<constraints>
80+
<constraint firstAttribute="height" constant="60" id="dpt-rq-R4b"/>
81+
</constraints>
7682
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
7783
<state key="normal" title="Save &amp; Exit"/>
7884
<connections>
@@ -85,6 +91,9 @@
8591
<constraint firstAttribute="width" constant="500" id="jqC-kR-DwJ"/>
8692
</constraints>
8793
</stackView>
94+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w3s-g0-adj" userLabel="Spacer">
95+
<rect key="frame" x="190" y="688" width="500" height="156"/>
96+
</view>
8897
</subviews>
8998
</stackView>
9099
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="4ej-KD-EOf" userLabel="Stack View - 2nd Column">
@@ -132,7 +141,7 @@
132141
</objects>
133142
<resources>
134143
<systemColor name="labelColor">
135-
<color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
144+
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
136145
</systemColor>
137146
</resources>
138147
</document>

0 commit comments

Comments
 (0)