Skip to content

Commit 60c6090

Browse files
kp-diego-trevisankp-diego-trevisan
authored
KM-13537 Fix Safari Content Blocker tutorial flow (#228)
* KM-13537 Fix broken custom classes references in storyboads * KM-13537 Prevent ContentBlockerViewController from being dismissed on swipe
1 parent 9f14785 commit 60c6090

4 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎PIA VPN/UI/Menu/ContentBlockerViewController.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class ContentBlockerViewController: AutolayoutViewController {
3838
super.viewDidLoad()
3939

4040
title = L10n.Localizable.ContentBlocker.title
41-
41+
isModalInPresentation = true
42+
4243
imvPicture.image = Asset.Images.imageContentBlocker.image
4344
labelTitle.text = L10n.Localizable.ContentBlocker.title
4445
labelMessage.text = L10n.Localizable.ContentBlocker.Body.subtitle

‎PIA VPN/UI/Storyboards/Signup.storyboard‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ You can come back to the app later to finish the process.</string>
814814
<constraint firstAttribute="bottom" secondItem="8uv-z8-27o" secondAttribute="bottom" id="xqH-PX-YbQ"/>
815815
</constraints>
816816
</view>
817-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IQs-S2-9qy" customClass="ActivityButton">
817+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IQs-S2-9qy" customClass="ActivityButton" customModule="PIA_VPN" customModuleProvider="target">
818818
<rect key="frame" x="25" y="356" width="309" height="50"/>
819819
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
820820
<constraints>
@@ -966,7 +966,7 @@ You can come back to the app later to finish the process.</string>
966966
<action selector="signUp:" destination="vva-4H-w8I" eventType="touchUpInside" id="fc7-Z4-tgk"/>
967967
</connections>
968968
</button>
969-
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="crp-gi-gwj" customClass="BorderedTextField">
969+
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="crp-gi-gwj" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
970970
<rect key="frame" x="0.0" y="83.333333333333343" width="325" height="50"/>
971971
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
972972
<constraints>

‎PIA VPN/UI/Storyboards/Welcome.storyboard‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ You will not be charged during this process.</string>
732732
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
733733
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
734734
<subviews>
735-
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zXr-6i-iXN" customClass="BorderedTextField" customModule="PIALibrary">
736-
<rect key="frame" x="19" y="39" width="337" height="18.5"/>
735+
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zXr-6i-iXN" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
736+
<rect key="frame" x="19" y="39" width="337" height="22"/>
737737
<constraints>
738738
<constraint firstAttribute="height" constant="50" id="pAP-q7-PIs"/>
739739
</constraints>

‎PIA VPN/UI/Storyboards/en.lproj/Main.storyboard‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,8 +1851,8 @@
18511851
<nil key="textColor"/>
18521852
<nil key="highlightedColor"/>
18531853
</label>
1854-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="a0H-gs-ee5" customClass="BorderedTextField" customModule="PIALibrary">
1855-
<rect key="frame" x="0.0" y="19.666666666666664" width="319" height="49.999999999999993"/>
1854+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="a0H-gs-ee5" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
1855+
<rect key="frame" x="0.0" y="19.666666666666671" width="319" height="50"/>
18561856
<constraints>
18571857
<constraint firstAttribute="height" constant="50" id="FK5-7M-Xk9"/>
18581858
</constraints>
@@ -1868,7 +1868,7 @@
18681868
<nil key="textColor"/>
18691869
<nil key="highlightedColor"/>
18701870
</label>
1871-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="I9x-z8-Qr5" customClass="BorderedTextField" customModule="PIALibrary">
1871+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="I9x-z8-Qr5" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
18721872
<rect key="frame" x="0.0" y="104" width="319" height="50"/>
18731873
<constraints>
18741874
<constraint firstAttribute="height" constant="50" id="b6f-5O-GLy"/>
@@ -2243,7 +2243,7 @@
22432243
<constraint firstItem="7ev-z1-KYN" firstAttribute="leading" secondItem="GBN-9r-4MZ" secondAttribute="leading" id="meU-A9-XzG"/>
22442244
</constraints>
22452245
</view>
2246-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edQ-AA-bC0" customClass="ActivityButton" customModule="PIALibrary">
2246+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edQ-AA-bC0" customClass="ActivityButton" customModule="PIA_VPN" customModuleProvider="target">
22472247
<rect key="frame" x="47.666666666666657" y="451.33333333333326" width="280" height="50"/>
22482248
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
22492249
<constraints>
@@ -2388,8 +2388,8 @@
23882388
<rect key="frame" x="0.0" y="0.0" width="375" height="802"/>
23892389
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
23902390
<subviews>
2391-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ueF-c5-jad" customClass="BorderedTextField" customModule="PIALibrary">
2392-
<rect key="frame" x="19" y="19" width="337" height="50"/>
2391+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ueF-c5-jad" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2392+
<rect key="frame" x="19" y="57" width="337" height="50"/>
23932393
<constraints>
23942394
<constraint firstAttribute="height" constant="50" id="3Ft-9W-7dU"/>
23952395
</constraints>
@@ -2399,8 +2399,8 @@
23992399
<outlet property="delegate" destination="W4F-zm-KqY" id="2K9-mK-MeG"/>
24002400
</connections>
24012401
</textField>
2402-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="y5k-AG-Xbn" customClass="BorderedTextField" customModule="PIALibrary">
2403-
<rect key="frame" x="19" y="79" width="337" height="50"/>
2402+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="y5k-AG-Xbn" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2403+
<rect key="frame" x="19" y="117" width="337" height="50"/>
24042404
<constraints>
24052405
<constraint firstAttribute="height" constant="50" id="3za-pb-gpH"/>
24062406
</constraints>
@@ -2410,8 +2410,8 @@
24102410
<outlet property="delegate" destination="W4F-zm-KqY" id="vug-zc-OkV"/>
24112411
</connections>
24122412
</textField>
2413-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6py-2p-kR9" customClass="BorderedTextField" customModule="PIALibrary">
2414-
<rect key="frame" x="19" y="139" width="337" height="50"/>
2413+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6py-2p-kR9" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2414+
<rect key="frame" x="19" y="177" width="337" height="50"/>
24152415
<constraints>
24162416
<constraint firstAttribute="height" constant="50" id="hJ7-nG-xYU"/>
24172417
</constraints>
@@ -2421,8 +2421,8 @@
24212421
<outlet property="delegate" destination="W4F-zm-KqY" id="0Z7-lB-Zfb"/>
24222422
</connections>
24232423
</textField>
2424-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LJp-XL-MJd" customClass="BorderedTextField" customModule="PIALibrary">
2425-
<rect key="frame" x="19" y="199" width="337" height="50"/>
2424+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LJp-XL-MJd" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2425+
<rect key="frame" x="19" y="237" width="337" height="50"/>
24262426
<constraints>
24272427
<constraint firstAttribute="height" constant="50" id="D30-L5-rd6"/>
24282428
</constraints>
@@ -2432,8 +2432,8 @@
24322432
<outlet property="delegate" destination="W4F-zm-KqY" id="PIN-Gg-CeB"/>
24332433
</connections>
24342434
</textField>
2435-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Udr-dY-TqG" customClass="BorderedTextField" customModule="PIALibrary">
2436-
<rect key="frame" x="19" y="259" width="337" height="50"/>
2435+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Udr-dY-TqG" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2436+
<rect key="frame" x="19" y="297" width="337" height="50"/>
24372437
<constraints>
24382438
<constraint firstAttribute="height" constant="50" id="bVM-Du-m5t"/>
24392439
</constraints>
@@ -2443,8 +2443,8 @@
24432443
<outlet property="delegate" destination="W4F-zm-KqY" id="ogb-cS-Ktu"/>
24442444
</connections>
24452445
</textField>
2446-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qD7-Vu-Hz2" customClass="BorderedTextField" customModule="PIALibrary">
2447-
<rect key="frame" x="19" y="319" width="337" height="50"/>
2446+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qD7-Vu-Hz2" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2447+
<rect key="frame" x="19" y="357" width="337" height="50"/>
24482448
<constraints>
24492449
<constraint firstAttribute="height" constant="50" id="xWm-fl-jcm"/>
24502450
</constraints>
@@ -2525,8 +2525,8 @@
25252525
<action selector="signUp:" destination="Jcq-Qm-xQ1" eventType="touchUpInside" id="ehM-Qc-c6Q"/>
25262526
</connections>
25272527
</button>
2528-
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VLy-oz-kiu" customClass="BorderedTextField" customModule="PIALibrary">
2529-
<rect key="frame" x="0.0" y="83.333333333333329" width="325" height="49.999999999999986"/>
2528+
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VLy-oz-kiu" customClass="BorderedTextField" customModule="PIA_VPN" customModuleProvider="target">
2529+
<rect key="frame" x="0.0" y="83.333333333333343" width="325" height="50"/>
25302530
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
25312531
<constraints>
25322532
<constraint firstAttribute="height" constant="50" id="jbH-2w-5Aa"/>

0 commit comments

Comments
 (0)