Skip to content

Commit

Permalink
Replace add to dock video in settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@alessandroboron
alessandroboron committed Nov 4, 2024
1 parent 61ef69a commit e03f7a1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
4 changes: 0 additions & 4 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,6 @@
854A012F2A5563A400FCC628 /* FindInPage.xib in Resources */ = {isa = PBXBuildFile; fileRef = 854A012E2A5563A400FCC628 /* FindInPage.xib */; };
854A01332A558B3A00FCC628 /* UIView+Constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854A01322A558B3A00FCC628 /* UIView+Constraints.swift */; };
854A8D812C7F4452001D62E5 /* AtbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854A8D802C7F4452001D62E5 /* AtbTests.swift */; };
85514FFD2372DA0100DBC528 /* ios13-home-row.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 85514FFC2372DA0000DBC528 /* ios13-home-row.mp4 */; };
8551912724746EDC0010FDD0 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8551912624746EDC0010FDD0 /* SnapshotHelper.swift */; };
85528AA72C7CA95D0017BCCA /* UsageSegmentationCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85528AA62C7CA95D0017BCCA /* UsageSegmentationCalculator.swift */; };
85582E0029D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85582DFF29D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift */; };
Expand Down Expand Up @@ -1786,7 +1785,6 @@
854A012E2A5563A400FCC628 /* FindInPage.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FindInPage.xib; sourceTree = "<group>"; };
854A01322A558B3A00FCC628 /* UIView+Constraints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Constraints.swift"; sourceTree = "<group>"; };
854A8D802C7F4452001D62E5 /* AtbTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtbTests.swift; sourceTree = "<group>"; };
85514FFC2372DA0000DBC528 /* ios13-home-row.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ios13-home-row.mp4"; sourceTree = "<group>"; };
85519124247468580010FDD0 /* TrackerRadarIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackerRadarIntegrationTests.swift; sourceTree = "<group>"; };
8551912624746EDC0010FDD0 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
85528AA62C7CA95D0017BCCA /* UsageSegmentationCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsageSegmentationCalculator.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4279,7 +4277,6 @@
children = (
F143C2B11E49D78C00CFDE3A /* Assets.xcassets */,
F41610BB29E5DF65001F709D /* DeprecatedColors.xcassets */,
85514FFC2372DA0000DBC528 /* ios13-home-row.mp4 */,
84E3419E1E2F7EFB00BDBA6F /* LaunchScreen.storyboard */,
F1F533861F26ABAC00D80D4F /* Localizable.strings */,
98788E9C2521DA1E00D55218 /* Localizable.stringsdict */,
Expand Down Expand Up @@ -6997,7 +6994,6 @@
9880723725FA4E450039EF4B /* menu_dark.json in Resources */,
AAF2E28B23E049DF00962AF8 /* [email protected] in Resources */,
1E162615296D910F0004127F /* cookie-icon-animated-40-dark.json in Resources */,
85514FFD2372DA0100DBC528 /* ios13-home-row.mp4 in Resources */,
85F98F98296F4CB100742F4A /* SyncAssets.xcassets in Resources */,
31BC5F412C2B0B540004DF37 /* DuckPlayer.xcassets in Resources */,
AA4D6A9423DE49A5007E8790 /* [email protected] in Resources */,
Expand Down
26 changes: 13 additions & 13 deletions DuckDuckGo/Base.lproj/HomeRow.storyboard
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.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="A5s-B8-hd1">
<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" initialViewController="A5s-B8-hd1">
<device id="retina4_0" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -17,10 +17,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WkQ-rU-dTC">
<rect key="frame" x="12" y="59" width="296" height="450"/>
<rect key="frame" x="12" y="89.5" width="296" height="409.5"/>
<subviews>
<view contentMode="scaleToFill" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="gZO-bI-rzI">
<rect key="frame" x="0.0" y="0.0" width="296" height="115"/>
<rect key="frame" x="0.0" y="0.0" width="296" height="123.5"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="202-p3-edP">
<rect key="frame" x="266" y="8" width="22" height="22"/>
Expand All @@ -43,7 +43,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Add DuckDuckGo to Home" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tah-vQ-mf9">
<rect key="frame" x="8" y="51" width="280" height="17"/>
<rect key="frame" x="8" y="51" width="280" height="20.5"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="ghl-Gi-XaX"/>
</constraints>
Expand All @@ -52,11 +52,11 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Add DuckDuckGo to your dock for quick and easy access." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f6f-QY-3H3">
<rect key="frame" x="48" y="79" width="200" height="24"/>
<rect key="frame" x="48" y="82.5" width="200" height="29"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="24" id="glv-ib-KpH"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="regular" pointSize="12"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
Expand All @@ -77,18 +77,17 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xKc-IP-PMy">
<rect key="frame" x="0.0" y="114" width="296" height="266"/>
<rect key="frame" x="16" y="139.5" width="264" height="200"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="266" id="Brm-Rw-XFc"/>
<constraint firstAttribute="width" constant="296" id="Tjv-GE-9Jo"/>
<constraint firstAttribute="height" constant="200" id="Brm-Rw-XFc"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="aXr-hX-rNT" appends="YES" id="gwR-9b-WPK"/>
</connections>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="DBH-J5-aEO">
<rect key="frame" x="16" y="396" width="264" height="38"/>
<rect key="frame" x="16" y="355.5" width="264" height="38"/>
<color key="backgroundColor" red="0.4039215686" green="0.56078431370000004" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="38" id="Azr-V1-kLw"/>
Expand All @@ -114,21 +113,22 @@
</subviews>
<color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="xKc-IP-PMy" firstAttribute="leading" secondItem="WkQ-rU-dTC" secondAttribute="leading" constant="16" id="2TS-63-G35"/>
<constraint firstItem="DBH-J5-aEO" firstAttribute="centerX" secondItem="WkQ-rU-dTC" secondAttribute="centerX" id="2fz-Nb-cpE"/>
<constraint firstItem="DBH-J5-aEO" firstAttribute="width" secondItem="WkQ-rU-dTC" secondAttribute="width" constant="-32" id="OO8-D3-aVQ"/>
<constraint firstItem="gZO-bI-rzI" firstAttribute="centerX" secondItem="WkQ-rU-dTC" secondAttribute="centerX" id="PC4-xd-C15"/>
<constraint firstItem="DBH-J5-aEO" firstAttribute="top" secondItem="xKc-IP-PMy" secondAttribute="bottom" constant="16" id="PhI-Ys-hLb">
<variation key="heightClass=compact" constant="-86"/>
</constraint>
<constraint firstItem="xKc-IP-PMy" firstAttribute="centerX" secondItem="WkQ-rU-dTC" secondAttribute="centerX" id="RAx-gh-8eu"/>
<constraint firstItem="xKc-IP-PMy" firstAttribute="top" secondItem="gZO-bI-rzI" secondAttribute="bottom" constant="-1" id="Tdm-ZZ-7SW"/>
<constraint firstItem="xKc-IP-PMy" firstAttribute="top" secondItem="gZO-bI-rzI" secondAttribute="bottom" constant="16" id="Tdm-ZZ-7SW"/>
<constraint firstAttribute="width" constant="296" id="lzm-iB-os4"/>
<constraint firstItem="gZO-bI-rzI" firstAttribute="top" secondItem="WkQ-rU-dTC" secondAttribute="top" id="mYz-6B-4wR"/>
<constraint firstAttribute="bottom" secondItem="DBH-J5-aEO" secondAttribute="bottom" constant="16" id="qdx-hp-DaB">
<variation key="heightClass=compact-widthClass=compact" constant="8"/>
</constraint>
<constraint firstItem="xKc-IP-PMy" firstAttribute="width" secondItem="WkQ-rU-dTC" secondAttribute="width" id="vkg-sY-tQh"/>
<constraint firstItem="gZO-bI-rzI" firstAttribute="width" secondItem="WkQ-rU-dTC" secondAttribute="width" id="w56-MU-bGt"/>
<constraint firstAttribute="trailing" secondItem="xKc-IP-PMy" secondAttribute="trailing" constant="16" id="xAg-pf-sma"/>
</constraints>
</view>
</subviews>
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/HomeRowInstructionsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class HomeRowInstructionsViewController: UIViewController {
private func addVideo() {
let movieURL: URL

movieURL = Bundle.main.url(forResource: "ios13-home-row", withExtension: "mp4")!
movieURL = Bundle.main.url(forResource: "add-to-dock-demo", withExtension: "mp4")!

player = AVPlayer(url: movieURL)
_ = try? AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: .mixWithOthers)
Expand Down
Binary file removed DuckDuckGo/ios13-home-row.mp4
View file
Binary file not shown.

0 comments on commit e03f7a1

Please sign in to comment.