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

RUM-4149 [SR] Add suport for UIProgressView #1923

Merged
merged 9 commits into from
Jun 27, 2024
Merged

RUM-4149 [SR] Add suport for UIProgressView #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7171d7a
RUM-4149 [SR] Add suport for UIProgressView
mariedm Jun 24, 2024
613c818
RUM-4149 Fix syntax
mariedm Jun 24, 2024
9f64c32
Merge branch 'develop' of github.com:DataDog/dd-sdk-ios into mariedm/…
mariedm Jun 24, 2024
8f0444b
Merge branch 'develop' of github.com:DataDog/dd-sdk-ios into mariedm/…
mariedm Jun 25, 2024
639e97e
RUM-4149 Add unit tests + Fix snapshot tests + Fix missing file
mariedm Jun 25, 2024
24a6518
RUM-4149 use Maxime's suggestion
mariedm Jun 25, 2024
ab5e076
Merge branch 'develop' of https://github.com/DataDog/dd-sdk-ios into …
mariedm Jun 26, 2024
f5bf7f7
Merge branch 'mariedm/RUM-4149' of https://github.com/DataDog/dd-sdk-…
mariedm Jun 26, 2024
7e0a47c
RUM-4149 Fix
mariedm Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Datadog/Datadog.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,8 @@
61FDBA15269722B4001D9D43 /* CrashReportMinifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61FDBA14269722B4001D9D43 /* CrashReportMinifierTests.swift */; };
61FDBA1726974CA9001D9D43 /* DDCrashReportBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61FDBA1626974CA9001D9D43 /* DDCrashReportBuilderTests.swift */; };
61FF282824B8A31E000B3D9B /* RUMEventMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61FF282724B8A31E000B3D9B /* RUMEventMatcher.swift */; };
96E414142C2AF56F005A6119 /* UIProgressViewRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E414132C2AF56F005A6119 /* UIProgressViewRecorder.swift */; };
96E414162C2AF5C1005A6119 /* UIProgressViewRecorderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E414152C2AF5C1005A6119 /* UIProgressViewRecorderTests.swift */; };
9E55407C25812D1C00F6E3AD /* RUM+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E55407B25812D1C00F6E3AD /* RUM+objc.swift */; };
9E58E8E324615EDA008E5063 /* JSONEncoderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E58E8E224615EDA008E5063 /* JSONEncoderTests.swift */; };
9E5B6D2E270C84B4002499B8 /* RUMMonitorE2ETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5B6D2D270C84B4002499B8 /* RUMMonitorE2ETests.swift */; };
Expand Down Expand Up @@ -2681,6 +2683,8 @@
61FF282F24BC5E2D000B3D9B /* RUMEventFileOutputTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RUMEventFileOutputTests.swift; sourceTree = "<group>"; };
61FF416125EE5FF400CE35EC /* CrashLogReceiverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashLogReceiverTests.swift; sourceTree = "<group>"; };
61FF9A4425AC5DEA001058CC /* ViewIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewIdentifier.swift; sourceTree = "<group>"; };
96E414132C2AF56F005A6119 /* UIProgressViewRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressViewRecorder.swift; sourceTree = "<group>"; };
96E414152C2AF5C1005A6119 /* UIProgressViewRecorderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIProgressViewRecorderTests.swift; sourceTree = "<group>"; };
9E0542CA25F8EBBE007A3D0B /* Kronos.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Kronos.xcframework; path = ../Carthage/Build/Kronos.xcframework; sourceTree = "<group>"; };
9E26E6B824C87693000B3270 /* RUMDataModels.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RUMDataModels.swift; sourceTree = "<group>"; };
9E2EF44E2694FA14008A7DAE /* VitalInfoSamplerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VitalInfoSamplerTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3612,6 +3616,7 @@
61054E2E2A6EE10A00AAA894 /* NodeRecorder.swift */,
61054E2F2A6EE10A00AAA894 /* UISliderRecorder.swift */,
61054E302A6EE10A00AAA894 /* UIPickerViewRecorder.swift */,
96E414132C2AF56F005A6119 /* UIProgressViewRecorder.swift */,
61054E312A6EE10A00AAA894 /* UIStepperRecorder.swift */,
61054E322A6EE10A00AAA894 /* UILabelRecorder.swift */,
61054E332A6EE10A00AAA894 /* UISwitchRecorder.swift */,
Expand Down Expand Up @@ -3879,6 +3884,7 @@
61054F6A2A6EE1BA00AAA894 /* UILabelRecorderTests.swift */,
61054F6B2A6EE1BA00AAA894 /* UITextFieldRecorderTests.swift */,
61054F6C2A6EE1BA00AAA894 /* UITabBarRecorderTests.swift */,
96E414152C2AF5C1005A6119 /* UIProgressViewRecorderTests.swift */,
61054F6D2A6EE1BA00AAA894 /* UISliderRecorderTests.swift */,
61054F6E2A6EE1BA00AAA894 /* UnsupportedViewRecorderTests.swift */,
61054F6F2A6EE1BA00AAA894 /* UISegmentRecorderTests.swift */,
Expand Down Expand Up @@ -8272,6 +8278,7 @@
61054E9C2A6EE10B00AAA894 /* UIImage+Scaling.swift in Sources */,
61054EA12A6EE10B00AAA894 /* MainThreadScheduler.swift in Sources */,
61054E7C2A6EE10A00AAA894 /* UINavigationBarRecorder.swift in Sources */,
96E414142C2AF56F005A6119 /* UIProgressViewRecorder.swift in Sources */,
61054E772A6EE10A00AAA894 /* ViewTreeRecorder.swift in Sources */,
61054E9E2A6EE10B00AAA894 /* Queue.swift in Sources */,
61054E872A6EE10A00AAA894 /* ViewAttributes+Copy.swift in Sources */,
Expand Down Expand Up @@ -8328,6 +8335,7 @@
61054FC02A6EE1BA00AAA894 /* UITextViewRecorderTests.swift in Sources */,
61054F9A2A6EE1BA00AAA894 /* CFType+SafetyTests.swift in Sources */,
61054F9E2A6EE1BA00AAA894 /* SessionReplayTests.swift in Sources */,
96E414162C2AF5C1005A6119 /* UIProgressViewRecorderTests.swift in Sources */,
61054FB32A6EE1BA00AAA894 /* UITextFieldRecorderTests.swift in Sources */,
61054FCD2A6EE1BA00AAA894 /* SnapshotProducerMocks.swift in Sources */,
61054FC32A6EE1BA00AAA894 /* PrivacyLevelTests.swift in Sources */,
Expand Down
3 changes: 3 additions & 0 deletions DatadogSessionReplay/SRSnapshotTests/SRFixtures/Sources/SRFixtures/Fixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public enum Fixture: CaseIterable {
case basicShapes
case basicTexts
case sliders
case progressViews
case segments
case pickers
case switches
Expand Down Expand Up @@ -54,6 +55,8 @@ public enum Fixture: CaseIterable {
return UIStoryboard.basic.instantiateViewController(withIdentifier: "Texts")
case .sliders:
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "Sliders")
case .progressViews:
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "ProgressViews")
case .segments:
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "Segments")
case .pickers:
Expand Down
103 changes: 101 additions & 2 deletions ...napshotTests/SRFixtures/Sources/SRFixtures/Resources/Storyboards/InputElements.storyboard
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.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
Expand Down Expand Up @@ -544,6 +544,96 @@
</objects>
<point key="canvasLocation" x="1063" y="675"/>
</scene>
<!--View Controller-->
<scene sceneID="hPi-MX-LhE">
<objects>
<viewController storyboardIdentifier="ProgressViews" id="lfg-1k-4io" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="kks-t0-Aqv">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="tiN-zd-FNP">
<rect key="frame" x="8" y="67" width="377" height="234"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Amm-9k-Fl9">
<rect key="frame" x="0.0" y="0.0" width="377" height="20.333333333333332"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.20000000000000001" translatesAutoresizingMaskIntoConstraints="NO" id="tCM-vy-hbO">
<rect key="frame" x="0.0" y="28.333333333333329" width="377" height="4"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Background Color" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YAG-id-IUj">
<rect key="frame" x="0.0" y="40.333333333333329" width="377" height="20.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.29999999999999999" translatesAutoresizingMaskIntoConstraints="NO" id="pjd-Wx-7yX">
<rect key="frame" x="0.0" y="68.666666666666657" width="377" height="4"/>
<color key="backgroundColor" systemColor="systemYellowColor"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Track Tint Colors" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gus-fU-u9U">
<rect key="frame" x="0.0" y="80.666666666666657" width="377" height="20.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.40000000000000002" translatesAutoresizingMaskIntoConstraints="NO" id="rdj-4K-LCI">
<rect key="frame" x="0.0" y="109" width="377" height="4"/>
<color key="progressTintColor" systemColor="systemPurpleColor"/>
<color key="trackTintColor" systemColor="systemTealColor"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Track Tint Color + BG Color" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rrs-qe-9Fi" userLabel="Track Tint Color + BG Color">
<rect key="frame" x="0.0" y="120.99999999999999" width="377" height="20.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="8so-YS-eiK">
<rect key="frame" x="0.0" y="149.33333333333334" width="377" height="4"/>
<color key="backgroundColor" systemColor="systemPinkColor"/>
<color key="progressTintColor" systemColor="systemPurpleColor"/>
<color key="trackTintColor" systemColor="systemTealColor"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tint Color" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sjd-ql-vEv">
<rect key="frame" x="0.0" y="161.33333333333334" width="377" height="20.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="f6I-ad-KS1">
<rect key="frame" x="0.0" y="189.66666666666669" width="377" height="4"/>
<color key="tintColor" systemColor="systemIndigoColor"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bar Style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UKy-aQ-Cig">
<rect key="frame" x="0.0" y="201.66666666666669" width="377" height="20.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.69999999999999996" translatesAutoresizingMaskIntoConstraints="NO" id="Lpo-Q4-bIn">
<rect key="frame" x="0.0" y="230" width="377" height="4"/>
<color key="progressTintColor" systemColor="systemMintColor"/>
<color key="trackTintColor" name="BAD7E9"/>
</progressView>
</subviews>
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="uNP-eI-CPR"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="tiN-zd-FNP" firstAttribute="leading" secondItem="uNP-eI-CPR" secondAttribute="leading" constant="8" id="VqG-cQ-W84"/>
<constraint firstItem="uNP-eI-CPR" firstAttribute="trailing" secondItem="tiN-zd-FNP" secondAttribute="trailing" constant="8" id="Yym-y4-ndQ"/>
<constraint firstItem="tiN-zd-FNP" firstAttribute="top" secondItem="uNP-eI-CPR" secondAttribute="top" constant="8" id="idz-Y9-9pd"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sgf-DX-5I4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1897" y="682"/>
</scene>
</scenes>
<resources>
<image name="cloud.fill" catalog="system" width="128" height="87"/>
Expand All @@ -561,6 +651,12 @@
<systemColor name="systemGreenColor">
<color red="0.20392156862745098" green="0.7803921568627451" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemIndigoColor">
<color red="0.34509803921568627" green="0.33725490196078434" blue="0.83921568627450982" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemMintColor">
<color red="0.0" green="0.7803921568627451" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemOrangeColor">
<color red="1" green="0.58431372549019611" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
Expand All @@ -570,6 +666,9 @@
<systemColor name="systemPurpleColor">
<color red="0.68627450980392157" green="0.32156862745098042" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemTealColor">
<color red="0.18823529411764706" green="0.69019607843137254" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemYellowColor">
<color red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
Expand Down
Loading