Skip to content

Commit

Permalink
Merge pull request #1180 from DataDog/ncreated/REPLAY-1340-support-sw…
Browse files Browse the repository at this point in the history 
…itches

REPLAY-1340 Support `UISwitch` elements in session replay
  • Loading branch information
@ncreated
ncreated authored Mar 1, 2023
2 parents 3495e9d + 03d1c8f commit e29d1f5
Show file tree
Hide file tree
Showing 7 changed files with 225 additions and 45 deletions.
5 changes: 5 additions & 0 deletions DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Fixtures.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ internal enum Fixture: CaseIterable {
case sliders
case segments
case pickers
case switches

var menuItemTitle: String {
switch self {
Expand All @@ -25,6 +26,8 @@ internal enum Fixture: CaseIterable {
return "Segments"
case .pickers:
return "Pickers"
case .switches:
return "Switches"
}
}

Expand All @@ -40,6 +43,8 @@ internal enum Fixture: CaseIterable {
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "Segments")
case .pickers:
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "Pickers")
case .switches:
return UIStoryboard.inputElements.instantiateViewController(withIdentifier: "Switches")
}
}
}
Expand Down
118 changes: 113 additions & 5 deletions DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/InputElements.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
<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" translatesAutoresizingMaskIntoConstraints="NO" id="CZc-U9-Jdq">
<rect key="frame" x="8" y="67.000000000000028" width="377" height="472.66666666666674"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CZc-U9-Jdq">
<rect key="frame" x="8" y="67.000000000000028" width="377" height="496.66666666666674"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Simple - one wheel" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HtK-Qe-ne9">
<rect key="frame" x="0.0" y="0.0" width="377" height="20.333333333333332"/>
Expand All @@ -213,17 +213,17 @@
<nil key="highlightedColor"/>
</label>
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bsS-D6-XAf">
<rect key="frame" x="0.0" y="20.333333333333314" width="377" height="216"/>
<rect key="frame" x="0.0" y="28.333333333333314" width="377" height="216"/>
</pickerView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customized - multiple wheels" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o3G-Be-Os5">
<rect key="frame" x="0.0" y="236.33333333333331" width="377" height="20.333333333333314"/>
<rect key="frame" x="0.0" y="252.33333333333334" width="377" height="20.333333333333343"/>
<color key="backgroundColor" systemColor="systemOrangeColor"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Smi-UB-4C6">
<rect key="frame" x="0.0" y="256.66666666666669" width="377" height="216"/>
<rect key="frame" x="0.0" y="280.66666666666669" width="377" height="216"/>
<color key="backgroundColor" systemColor="systemYellowColor"/>
</pickerView>
</subviews>
Expand All @@ -246,6 +246,111 @@
</objects>
<point key="canvasLocation" x="1892" y="13"/>
</scene>
<!--View Controller-->
<scene sceneID="Tnu-GW-onF">
<objects>
<viewController storyboardIdentifier="Switches" id="fil-XH-ugz" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="P1S-z7-mrf">
<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="JQC-x6-QsY">
<rect key="frame" x="8" y="67" width="377" height="396"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default - ON" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b70-44-86b">
<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>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bdg-7U-I0i">
<rect key="frame" x="0.0" y="28.333333333333329" width="379" height="31"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default - OFF" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JPc-Ux-Rll">
<rect key="frame" x="0.0" y="67.333333333333343" width="377" height="20.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="1bg-1l-H34">
<rect key="frame" x="0.0" y="95.666666666666657" width="379" height="31"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disabled" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dWv-a0-5cR">
<rect key="frame" x="0.0" y="134.66666666666666" width="377" height="20.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jg3-dQ-84B">
<rect key="frame" x="0.0" y="163" width="379" height="31"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom #1 - ON" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eZI-Dj-gL0">
<rect key="frame" x="0.0" y="202" width="377" height="20.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dQ9-si-6Bk">
<rect key="frame" x="0.0" y="230.33333333333331" width="379" height="31"/>
<color key="onTintColor" systemColor="systemYellowColor"/>
<color key="thumbTintColor" systemColor="systemPinkColor"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom #1 - OFF" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="APo-dW-cPS">
<rect key="frame" x="0.0" y="269.33333333333331" width="377" height="20.333333333333314"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="ZmH-6E-kNq">
<rect key="frame" x="0.0" y="297.66666666666669" width="379" height="31"/>
<color key="onTintColor" systemColor="systemYellowColor"/>
<color key="thumbTintColor" systemColor="systemPinkColor"/>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom #2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q8g-NH-AVw">
<rect key="frame" x="0.0" y="336.66666666666669" width="377" height="20.333333333333314"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CZH-aq-9sf">
<rect key="frame" x="0.0" y="365" width="379" height="31"/>
<color key="backgroundColor" systemColor="systemPurpleColor"/>
</switch>
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Outside of stack view:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oxF-M6-gfF">
<rect key="frame" x="112.66666666666669" y="506.99999999999994" width="168" height="20.333333333333314"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BQK-Z7-w9x">
<rect key="frame" x="172" y="535.33333333333337" width="51" height="31"/>
</switch>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="7Fb-LU-Lfg">
<rect key="frame" x="172" y="574.33333333333337" width="51" height="31"/>
</switch>
</subviews>
<viewLayoutGuide key="safeArea" id="0ZJ-WQ-RPS"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="JQC-x6-QsY" firstAttribute="top" secondItem="0ZJ-WQ-RPS" secondAttribute="top" constant="8" id="22B-he-5sU"/>
<constraint firstItem="0ZJ-WQ-RPS" firstAttribute="trailing" secondItem="JQC-x6-QsY" secondAttribute="trailing" constant="8" id="Jy5-4H-nJj"/>
<constraint firstItem="oxF-M6-gfF" firstAttribute="top" secondItem="JQC-x6-QsY" secondAttribute="bottom" constant="44" id="Ljn-mU-hh5"/>
<constraint firstItem="BQK-Z7-w9x" firstAttribute="centerX" secondItem="P1S-z7-mrf" secondAttribute="centerX" id="U2j-r7-Pv7"/>
<constraint firstItem="oxF-M6-gfF" firstAttribute="centerX" secondItem="P1S-z7-mrf" secondAttribute="centerX" id="Xic-cx-5hr"/>
<constraint firstItem="JQC-x6-QsY" firstAttribute="leading" secondItem="0ZJ-WQ-RPS" secondAttribute="leading" constant="8" id="ejI-5b-jgY"/>
<constraint firstItem="7Fb-LU-Lfg" firstAttribute="top" secondItem="BQK-Z7-w9x" secondAttribute="bottom" constant="8" id="o8S-7F-W3f"/>
<constraint firstItem="7Fb-LU-Lfg" firstAttribute="centerX" secondItem="P1S-z7-mrf" secondAttribute="centerX" id="rin-2q-F7U"/>
<constraint firstItem="BQK-Z7-w9x" firstAttribute="top" secondItem="oxF-M6-gfF" secondAttribute="bottom" constant="8" id="yih-uO-1ht"/>
<constraint firstItem="JQC-x6-QsY" firstAttribute="top" secondItem="0ZJ-WQ-RPS" secondAttribute="top" constant="8" id="zjC-Nt-g8x"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ggg-NW-qTe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2689" y="32"/>
</scene>
</scenes>
<resources>
<image name="cloud.fill" catalog="system" width="128" height="87"/>
Expand All @@ -269,6 +374,9 @@
<systemColor name="systemPinkColor">
<color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemPurpleColor">
<color red="0.68627450980392157" green="0.32156862745098042" blue="0.87058823529411766" 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
18 changes: 18 additions & 0 deletions DatadogSessionReplay/SRSnapshotTests/SRSnapshotTests/SRSnapshotTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,22 @@ final class SRSnapshotTests: SnapshotTestCase {
record: recordingMode
)
}

func testSwitches() throws {
show(fixture: .switches)

var image = try takeSnapshot(configuration: .init(privacy: .allowAll))
DDAssertSnapshotTest(
newImage: image,
snapshotLocation: .folder(named: snapshotsFolderName, fileNameSuffix: "-allowAll-privacy"),
record: recordingMode
)

image = try takeSnapshot(configuration: .init(privacy: .maskAll))
DDAssertSnapshotTest(
newImage: image,
snapshotLocation: .folder(named: snapshotsFolderName, fileNameSuffix: "-maskAll-privacy"),
record: recordingMode
)
}
}
4 changes: 4 additions & 0 deletions DatadogSessionReplay/Sources/Recorder/Utilities/SystemColors.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,8 @@ internal enum SystemColors {
return UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1).cgColor
}
}

static var systemGreen: CGColor {
return UIColor.systemGreen.cgColor
}
}
17 changes: 17 additions & 0 deletions DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
* This product includes software developed at Datadog (https://www.datadoghq.com/).
* Copyright 2019-Present Datadog, Inc.
*/

import UIKit

internal extension UIView {
var usesDarkMode: Bool {
if #available(iOS 12.0, *) {
return traitCollection.userInterfaceStyle == .dark
} else {
return false // assume "no"
}
}
}
Loading

0 comments on commit e29d1f5

Please sign in to comment.