Commit ff8ef116 authored by Jose Blaya's avatar Jose Blaya
Browse files

PIAX Get Started screen redesign Light & Dark theme

parent a67def9d
This diff is collapsed.
......@@ -183,7 +183,7 @@ class DashboardViewController: AutolayoutViewController {
TransientState.didRetryPendingSignup = true
}
let vc = PIAWelcomeViewController.with(preset: preset, delegate: self)
let vc = GetStartedViewController.with()
present(vc, animated: true, completion: nil)
}
......
......@@ -2,17 +2,7 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "nav-logo-white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "nav-logo-white@3x.png",
"scale" : "3x"
"filename" : "piaWhiteCopy.pdf"
}
],
"info" : {
......
......@@ -2,17 +2,7 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "nav-logo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "nav-logo@3x.png",
"scale" : "3x"
"filename" : "piaDark2Copy2.pdf"
}
],
"info" : {
......
......@@ -377,7 +377,7 @@ internal enum L10n {
internal static let title = L10n.tr("Localizable", "settings.dns.alert.clear.title")
}
internal enum Create {
/// Be warned: Using a non-PIA DNS could compromise your privacy.
/// Using non PIA DNS could expose your DNS traffic to third parties and compromise your privacy.
internal static let message = L10n.tr("Localizable", "settings.dns.alert.create.message")
}
}
......@@ -387,13 +387,13 @@ internal enum L10n {
}
internal enum Validation {
internal enum Primary {
/// Primary DNS is not valid
/// Primary DNS is not valid.
internal static let invalid = L10n.tr("Localizable", "settings.dns.validation.primary.invalid")
/// Primary DNS is mandatory
/// Primary DNS is mandatory.
internal static let mandatory = L10n.tr("Localizable", "settings.dns.validation.primary.mandatory")
}
internal enum Secondary {
/// Secondary DNS is not valid
/// Secondary DNS is not valid.
internal static let invalid = L10n.tr("Localizable", "settings.dns.validation.secondary.invalid")
}
}
......
......@@ -14,9 +14,11 @@ extension Theme.Palette {
let lightPalette: Theme.Palette = .light
let palette = Theme.Palette()
palette.appearance = Theme.Appearance.dark
palette.logo = Asset.navLogoWhite.image
palette.brandBackground = lightPalette.brandBackground
palette.lightBackground = Macros.color(hex: 0x1a1a1a, alpha: 0xff)
palette.lightBackground = .piaGrey6
palette.lineColor = .white
palette.solidLightBackground = Macros.color(hex: 0x232323, alpha: 0xff)
palette.emphasis = lightPalette.emphasis
palette.accent1 = lightPalette.accent1
......
......@@ -52,6 +52,9 @@ private struct LightThemeStrategy: ThemeStrategy {
if let _ = viewController as? PIAWelcomeViewController {
return .default
}
if let _ = viewController as? GetStartedViewController {
return .default
}
return .lightContent
}
......
......@@ -52,8 +52,8 @@ end
def shared_main_pods
pod 'AlamofireImage'
#library_by_path('..')
library_by_git('09dd28c')
library_by_path('/Users/ueshiba/Desktop/PIA')
#library_by_git('09dd28c')
#library_by_version('~> 1.1.3')
end
......
......@@ -10,23 +10,23 @@ PODS:
- iRate (1.12.2)
- MBProgressHUD (1.1.0)
- OpenSSL-Apple (1.1.0h)
- PIALibrary/Core (1.1.6)
- PIALibrary/Library (1.1.6):
- PIALibrary/Core (2.0.0)
- PIALibrary/Library (2.0.0):
- Alamofire (~> 4)
- Gloss (~> 2)
- PIALibrary/Core
- PIALibrary/Util
- ReachabilitySwift
- SwiftyBeaver
- PIALibrary/Mock (1.1.6):
- PIALibrary/Mock (2.0.0):
- PIALibrary/Library
- PIALibrary/UI (1.1.6):
- PIALibrary/UI (2.0.0):
- PIALibrary/Library
- SwiftyBeaver
- TPKeyboardAvoiding
- PIALibrary/Util (1.1.6):
- PIALibrary/Util (2.0.0):
- PIALibrary/Core
- PIALibrary/VPN (1.1.6):
- PIALibrary/VPN (2.0.0):
- PIALibrary/Library
- PIATunnel (~> 1.1.7)
- PIATunnel (1.1.7):
......@@ -49,10 +49,10 @@ DEPENDENCIES:
- HockeySDK
- iRate
- MBProgressHUD
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `09dd28c`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `09dd28c`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `09dd28c`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `09dd28c`)
- PIALibrary/Library (from `/Users/ueshiba/Desktop/PIA/client-library-apple`)
- 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`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -74,16 +74,12 @@ SPEC REPOS:
EXTERNAL SOURCES:
PIALibrary:
:commit: 09dd28c
:git: https://github.com/pia-foss/client-library-apple
:path: "/Users/ueshiba/Desktop/PIA/client-library-apple"
PIATunnel:
:commit: e40e891
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
PIALibrary:
:commit: 09dd28c
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: e40e891
:git: https://github.com/pia-foss/tunnel-apple
......@@ -97,13 +93,13 @@ SPEC CHECKSUMS:
iRate: 4fc69958788624545e5d050c8ffd20884013c3f1
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
PIALibrary: 083d81a871a765752ed5492d213f4d4bed3a755f
PIALibrary: 27e41ddea3dffcc5bc61ce21f0a33bf2966ee34d
PIATunnel: e5357ac0269e91da8e6ca13793d5314c966ac1b2
ReachabilitySwift: 408477d1b6ed9779dba301953171e017c31241f3
SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: 86a0245553120450bda32aa4fd8ce5e4c278e5c1
PODFILE CHECKSUM: 7bc8977bef5127b0688c0a0c360c858cf273d2ca
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