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

Add fireproofing option to Fire popover #2966

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+166 −12
Draft

Add fireproofing option to Fire popover #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 93 additions & 7 deletions DuckDuckGo/Fire/View/Fire.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="bU7-R8-ocO">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="bU7-R8-ocO">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -126,11 +126,11 @@
<objects>
<viewController storyboardIdentifier="FirePopoverViewController" id="DMI-mh-xLJ" customClass="FirePopoverViewController" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="dGd-Gc-P2e" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="344" height="388"/>
<rect key="frame" x="0.0" y="0.0" width="344" height="472"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<customView verticalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="qlI-3L-uej">
<rect key="frame" x="0.0" y="304" width="344" height="84"/>
<customView verticalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="qlI-3L-uej" userLabel="Open New Fire Window Wrapper View">
<rect key="frame" x="0.0" y="388" width="344" height="84"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GTJ-4U-z5f">
<rect key="frame" x="24" y="26" width="32" height="32"/>
Expand Down Expand Up @@ -199,6 +199,82 @@
<constraint firstAttribute="trailing" secondItem="Oiy-AY-h7p" secondAttribute="trailing" constant="20" id="q42-vt-Q6Q"/>
</constraints>
</customView>
<customView verticalHuggingPriority="750" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="S8k-jI-Clp" userLabel="Fireproof this site Wrapper View">
<rect key="frame" x="0.0" y="304" width="344" height="84"/>
<subviews>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="92U-Zf-LbR">
<rect key="frame" x="0.0" y="81" width="344" height="5"/>
</box>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Mq1-ez-6Us">
<rect key="frame" x="24" y="26" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="6MO-gk-2np"/>
<constraint firstAttribute="height" constant="32" id="90k-Mn-qUR"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Fireproof" id="rG2-iS-9nk"/>
<color key="contentTintColor" name="labelColor" catalog="System" colorSpace="catalog"/>
</imageView>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="kwW-F3-69g">
<rect key="frame" x="60" y="43" width="266" height="16"/>
<textFieldCell key="cell" title="Fireproof this website" id="AhV-aT-nA7">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eCm-o9-lBa">
<rect key="frame" x="60" y="27" width="266" height="14"/>
<textFieldCell key="cell" title="This website data won‘t be burnt" id="Nyl-g2-ZDw">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="lYE-Q0-lrD" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
<rect key="frame" x="20" y="8" width="304" height="60"/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="4kd-1k-u7w">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="52" id="Dlb-mo-HAe"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
<color key="value" name="ButtonMouseOverColor"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
<color key="value" name="ButtonMouseDownColor"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="4"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="fireproofButtonAction:" target="DMI-mh-xLJ" id="wXP-ad-jJS"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="lYE-Q0-lrD" secondAttribute="bottom" constant="8" id="6Ta-bQ-nZq"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="eCm-o9-lBa" secondAttribute="bottom" constant="16" id="7Lu-pO-AbN"/>
<constraint firstAttribute="trailing" secondItem="lYE-Q0-lrD" secondAttribute="trailing" constant="20" symbolic="YES" id="AGz-fl-GY7"/>
<constraint firstAttribute="trailing" secondItem="92U-Zf-LbR" secondAttribute="trailing" id="BEh-75-Wgx"/>
<constraint firstAttribute="trailing" secondItem="kwW-F3-69g" secondAttribute="trailing" constant="20" id="FmB-8P-7Js"/>
<constraint firstItem="92U-Zf-LbR" firstAttribute="top" secondItem="S8k-jI-Clp" secondAttribute="top" id="MU8-Fq-fGL"/>
<constraint firstItem="Mq1-ez-6Us" firstAttribute="leading" secondItem="S8k-jI-Clp" secondAttribute="leading" constant="24" id="QK3-2M-QO5"/>
<constraint firstAttribute="trailing" secondItem="eCm-o9-lBa" secondAttribute="trailing" constant="20" id="REj-iU-pbs"/>
<constraint firstItem="kwW-F3-69g" firstAttribute="top" secondItem="S8k-jI-Clp" secondAttribute="top" constant="25" id="S06-rh-zO7"/>
<constraint firstItem="92U-Zf-LbR" firstAttribute="leading" secondItem="S8k-jI-Clp" secondAttribute="leading" id="TE7-YA-To4"/>
<constraint firstItem="eCm-o9-lBa" firstAttribute="leading" secondItem="Mq1-ez-6Us" secondAttribute="trailing" constant="6" id="WQx-KK-E9A"/>
<constraint firstItem="eCm-o9-lBa" firstAttribute="top" secondItem="kwW-F3-69g" secondAttribute="bottom" constant="2" id="Z4S-AI-I6z"/>
<constraint firstItem="lYE-Q0-lrD" firstAttribute="leading" secondItem="S8k-jI-Clp" secondAttribute="leading" constant="20" symbolic="YES" id="ZAY-ne-WSJ"/>
<constraint firstItem="kwW-F3-69g" firstAttribute="leading" secondItem="Mq1-ez-6Us" secondAttribute="trailing" constant="6" id="gOs-qh-cf1"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="84" id="hp7-hW-geP"/>
<constraint firstItem="lYE-Q0-lrD" firstAttribute="top" secondItem="S8k-jI-Clp" secondAttribute="top" constant="16" id="kwZ-sY-BwB"/>
<constraint firstItem="Mq1-ez-6Us" firstAttribute="top" secondItem="S8k-jI-Clp" secondAttribute="top" constant="26" id="uji-fn-S5k"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="3Jn-h4-fXL" userLabel="Header Wrapper View">
<rect key="frame" x="0.0" y="102" width="344" height="202"/>
<subviews>
Expand Down Expand Up @@ -531,19 +607,23 @@ Gw
</customView>
</subviews>
<constraints>
<constraint firstItem="S8k-jI-Clp" firstAttribute="top" secondItem="qlI-3L-uej" secondAttribute="bottom" id="0F7-NV-PDd"/>
<constraint firstItem="sbc-pJ-bul" firstAttribute="top" secondItem="3Jn-h4-fXL" secondAttribute="bottom" id="67G-na-i7a"/>
<constraint firstItem="3Jn-h4-fXL" firstAttribute="top" secondItem="qlI-3L-uej" secondAttribute="bottom" priority="800" id="AOt-Ov-8Yw"/>
<constraint firstItem="6vZ-d2-qnR" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="Anc-Gh-sNK"/>
<constraint firstItem="qlI-3L-uej" firstAttribute="top" secondItem="dGd-Gc-P2e" secondAttribute="top" id="DP4-qx-7jH"/>
<constraint firstItem="qlI-3L-uej" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="JfE-xH-UFd"/>
<constraint firstAttribute="trailing" secondItem="6vZ-d2-qnR" secondAttribute="trailing" id="Kyw-38-ua5"/>
<constraint firstItem="nId-He-RIU" firstAttribute="top" secondItem="qlI-3L-uej" secondAttribute="bottom" priority="250" id="NSp-j7-c7a"/>
<constraint firstAttribute="trailing" secondItem="S8k-jI-Clp" secondAttribute="trailing" id="QLQ-iG-b9A"/>
<constraint firstItem="nId-He-RIU" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="R5q-Fw-y3V"/>
<constraint firstItem="6vZ-d2-qnR" firstAttribute="top" secondItem="3Jn-h4-fXL" secondAttribute="bottom" id="SiT-y0-otC"/>
<constraint firstAttribute="trailing" secondItem="nId-He-RIU" secondAttribute="trailing" id="UP0-3m-4QV"/>
<constraint firstAttribute="trailing" secondItem="sbc-pJ-bul" secondAttribute="trailing" id="VG0-5p-cwB"/>
<constraint firstItem="3Jn-h4-fXL" firstAttribute="top" secondItem="qlI-3L-uej" secondAttribute="bottom" id="Xcj-za-zev"/>
<constraint firstItem="3Jn-h4-fXL" firstAttribute="top" secondItem="S8k-jI-Clp" secondAttribute="bottom" id="ZDc-ZU-J4m"/>
<constraint firstItem="3Jn-h4-fXL" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="ZK2-xe-fKM"/>
<constraint firstItem="r7f-Ig-GcB" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="ZOG-ov-blY"/>
<constraint firstItem="S8k-jI-Clp" firstAttribute="leading" secondItem="dGd-Gc-P2e" secondAttribute="leading" id="cIw-2a-rk7"/>
<constraint firstItem="nId-He-RIU" firstAttribute="top" secondItem="r7f-Ig-GcB" secondAttribute="bottom" id="f1V-n7-jhp"/>
<constraint firstItem="nId-He-RIU" firstAttribute="top" secondItem="3Jn-h4-fXL" secondAttribute="bottom" constant="42" id="hbg-4i-hjT"/>
<constraint firstAttribute="trailing" secondItem="r7f-Ig-GcB" secondAttribute="trailing" id="kNz-fP-3Iv"/>
Expand Down Expand Up @@ -571,6 +651,11 @@ Gw
<outlet property="detailsWrapperView" destination="6vZ-d2-qnR" id="TKb-Ux-TIk"/>
<outlet property="detailsWrapperViewHeightContraint" destination="sJt-dl-rlH" id="7pa-Kc-9xB"/>
<outlet property="fireWindowDescriptionLabel" destination="Oiy-AY-h7p" id="hTv-fB-980"/>
<outlet property="fireproofBottomConstraint" destination="ZDc-ZU-J4m" id="Xh6-MO-dcJ"/>
<outlet property="fireproofImageView" destination="Mq1-ez-6Us" id="Eut-4d-qh0"/>
<outlet property="fireproofSubtitleLabel" destination="eCm-o9-lBa" id="gIk-eW-doA"/>
<outlet property="fireproofTitleLabel" destination="kwW-F3-69g" id="ev8-hE-1DN"/>
<outlet property="fireproofWrapperView" destination="S8k-jI-Clp" id="kJx-AO-SYj"/>
<outlet property="headerWrapperView" destination="3Jn-h4-fXL" id="P5R-o0-Fdg"/>
<outlet property="infoLabel" destination="YMk-Hq-WfZ" id="JHL-r4-1VT"/>
<outlet property="mainButtonsToBurnerWindowContraint" destination="NSp-j7-c7a" id="lZx-hi-FXs"/>
Expand Down Expand Up @@ -713,11 +798,12 @@ DQ
</scenes>
<resources>
<image name="Burn" width="18" height="18"/>
<image name="BurnAlert" width="64" height="64"/>
<image name="BurnAlert" width="96" height="96"/>
<image name="BurnerWindowButtonIcon" width="32" height="32"/>
<image name="CondenseUpPadding" width="32" height="16"/>
<image name="ExpandDownPadding" width="32" height="16"/>
<image name="FireHeader" width="96" height="64"/>
<image name="Fireproof" width="16" height="16"/>
<image name="WarningTriangle" width="16" height="15"/>
<namedColor name="ButtonColor">
<color red="0.28627450980392155" green="0.28627450980392155" blue="0.28627450980392155" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
Expand Down
Loading
Loading