Commit 248918ed authored by Jose Blaya's avatar Jose Blaya
Browse files

Updated VPNPermissionViewController to PIAX

parent ae206227
This diff is collapsed.
......@@ -2,17 +2,7 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "image-vpn-allow@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "image-vpn-allow@3x.png",
"scale" : "3x"
"filename" : "11IllustrationAllowFileAccess.pdf"
}
],
"info" : {
......
......@@ -449,7 +449,7 @@ internal enum L10n {
internal enum Body {
/// We don’t monitor, filter or log any network activity.
internal static let footer = L10n.tr("Localizable", "vpn_permission.body.footer")
/// To proceed tap “%@”.
/// You’ll see a prompt for PIA VPN and need to allow access to VPN configurations. To proceed tap on “%@”.
internal static func subtitle(_ p1: String) -> String {
return L10n.tr("Localizable", "vpn_permission.body.subtitle", p1)
}
......
......@@ -59,6 +59,7 @@ private struct LightThemeStrategy: ThemeStrategy {
is SignupSuccessViewController,
is SignupUnreachableViewController,
is RestoreSignupViewController,
is VPNPermissionViewController,
is ConfirmVPNPlanViewController:
return .default
default:
......
......@@ -19,7 +19,7 @@ class VPNPermissionViewController: AutolayoutViewController {
@IBOutlet private weak var labelFooter: UILabel!
@IBOutlet private weak var buttonSubmit: ActivityButton!
@IBOutlet private weak var buttonSubmit: PIAButton!
weak var dismissingViewController: UIViewController?
......@@ -37,13 +37,12 @@ class VPNPermissionViewController: AutolayoutViewController {
labelTitle.text = L10n.VpnPermission.Body.title
labelMessage.text = L10n.VpnPermission.Body.subtitle(L10n.Global.ok)
labelFooter.text = L10n.VpnPermission.Body.footer
buttonSubmit.title = L10n.Global.ok
styleSubmitButton()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.setNavigationBarHidden(false, animated: true)
navigationController?.setNavigationBarHidden(true, animated: false)
}
@IBAction private func submit() {
......@@ -86,12 +85,20 @@ class VPNPermissionViewController: AutolayoutViewController {
override func viewShouldRestyle() {
super.viewShouldRestyle()
Theme.current.applyLightBackground(view)
Theme.current.applyLightBackground(viewContainer!)
Theme.current.applySubtitle(labelMessage)
Theme.current.applySubtitle(labelFooter)
Theme.current.applyTitle(labelTitle, appearance: .dark)
Theme.current.applyBody1(labelMessage, appearance: .dark)
Theme.current.applySmallInfo(labelFooter, appearance: .dark)
Theme.current.applyActionButton(buttonSubmit)
}
private func styleSubmitButton() {
buttonSubmit.setRounded()
buttonSubmit.style(style: TextStyle.Buttons.piaGreenButton)
buttonSubmit.setTitle(L10n.Global.ok.uppercased(),
for: [])
}
}
extension VPNPermissionViewController: MFMailComposeViewControllerDelegate {
......
......@@ -174,7 +174,7 @@
"vpn_permission.title" = "PIA";
"vpn_permission.body.title" = "PIA needs access to your VPN profiles to secure your traffic";
"vpn_permission.body.subtitle" = "To proceed tap “%@”.";
"vpn_permission.body.subtitle" = "You’ll see a prompt for PIA VPN and need to allow access to VPN configurations.\nTo proceed tap on “%@”.";
"vpn_permission.body.footer" = "We don’t monitor, filter or log any network activity.";
"vpn_permission.disallow.message.basic" = "We need this permission for the application to function.";
"vpn_permission.disallow.message.support" = "You can also get in touch with customer support if you need assistance.";
......
This diff is collapsed.
......@@ -67,8 +67,8 @@ def app_pods
end
def tunnel_pods
#tunnel_by_path('..')
tunnel_by_git('e40e891')
tunnel_by_path('/Users/ueshiba/Desktop/PIA')
#tunnel_by_git('e40e891')
#tunnel_by_version('~> 1.1.6')
end
......
......@@ -29,14 +29,14 @@ PODS:
- PIALibrary/Core
- PIALibrary/VPN (2.0.0):
- PIALibrary/Library
- PIATunnel (~> 1.1.7)
- PIATunnel (1.1.7):
- PIATunnel/AppExtension (= 1.1.7)
- PIATunnel/Core (= 1.1.7)
- PIATunnel/AppExtension (1.1.7):
- PIATunnel (~> 1.1.8)
- PIATunnel (1.1.8):
- PIATunnel/AppExtension (= 1.1.8)
- PIATunnel/Core (= 1.1.8)
- PIATunnel/AppExtension (1.1.8):
- PIATunnel/Core
- SwiftyBeaver
- PIATunnel/Core (1.1.7):
- PIATunnel/Core (1.1.8):
- OpenSSL-Apple (~> 1.1.0h)
- SwiftyBeaver
- QuickLayout (2.0.2)
......@@ -57,7 +57,7 @@ DEPENDENCIES:
- PIALibrary/Mock (from `/Users/ueshiba/Desktop/PIA/client-library-apple`)
- PIALibrary/UI (from `/Users/ueshiba/Desktop/PIA/client-library-apple`)
- PIALibrary/VPN (from `/Users/ueshiba/Desktop/PIA/client-library-apple`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `e40e891`)
- PIATunnel (from `/Users/ueshiba/Desktop/PIA/tunnel-apple`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -82,13 +82,7 @@ EXTERNAL SOURCES:
PIALibrary:
:path: "/Users/ueshiba/Desktop/PIA/client-library-apple"
PIATunnel:
:commit: e40e891
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
PIATunnel:
:commit: e40e891
:git: https://github.com/pia-foss/tunnel-apple
:path: "/Users/ueshiba/Desktop/PIA/tunnel-apple"
SPEC CHECKSUMS:
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
......@@ -99,8 +93,8 @@ SPEC CHECKSUMS:
iRate: 4fc69958788624545e5d050c8ffd20884013c3f1
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
PIALibrary: 8cd545d61431f890bb957d6b7d28a47496715a5d
PIATunnel: e5357ac0269e91da8e6ca13793d5314c966ac1b2
PIALibrary: 9bd13d30d751b032a154ab3b806e2ac982a44cf9
PIATunnel: fc7e7d0a812c6c98138ac315e7a43008aadd15b2
QuickLayout: a730730b646b231fd4ef7cffaeb1e81fe0e1ca92
ReachabilitySwift: 408477d1b6ed9779dba301953171e017c31241f3
SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
......@@ -108,6 +102,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: 7bc8977bef5127b0688c0a0c360c858cf273d2ca
PODFILE CHECKSUM: d5f5ae956c3c02461bd9ef76105082b2bcd16974
COCOAPODS: 1.5.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment