Commit 21cbb461 authored by Jose Blaya's avatar Jose Blaya
Browse files

WIP

parent 58afd6f2
......@@ -291,6 +291,7 @@
DDD824E82189C0EE00151709 /* BrandableNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD824E62189C0E800151709 /* BrandableNavigationBar.swift */; };
DDD824EA2189CD5700151709 /* NavigationLogoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD824E92189CD5700151709 /* NavigationLogoView.swift */; };
DDE27E0422E1B1A700503A89 /* ProductTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDE27E0322E1B1A700503A89 /* ProductTests.swift */; };
DDE93C5722F9847E0054FE28 /* PurchaseTrialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDE93C5622F9847E0054FE28 /* PurchaseTrialViewController.swift */; };
DDFCFAA821E924A70081F235 /* TileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFCFAA721E924A70081F235 /* TileProvider.swift */; };
DDFCFAA921E924AD0081F235 /* TileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFCFAA721E924A70081F235 /* TileProvider.swift */; };
DDFCFAAB21E925160081F235 /* DefaultTileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFCFAAA21E925160081F235 /* DefaultTileProvider.swift */; };
......@@ -584,6 +585,7 @@
DDD824E62189C0E800151709 /* BrandableNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrandableNavigationBar.swift; sourceTree = "<group>"; };
DDD824E92189CD5700151709 /* NavigationLogoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationLogoView.swift; sourceTree = "<group>"; };
DDE27E0322E1B1A700503A89 /* ProductTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProductTests.swift; path = "../../../../../../System/Volumes/Data/Users/ueshiba/Projects/PIA/client-library-apple/PIALibraryTests/ProductTests.swift"; sourceTree = "<group>"; };
DDE93C5622F9847E0054FE28 /* PurchaseTrialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseTrialViewController.swift; sourceTree = "<group>"; };
DDFCFAA721E924A70081F235 /* TileProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileProvider.swift; sourceTree = "<group>"; };
DDFCFAAA21E925160081F235 /* DefaultTileProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTileProvider.swift; sourceTree = "<group>"; };
DDFCFAAC21E925B60081F235 /* TileableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TileableCell.swift; sourceTree = "<group>"; };
......@@ -1136,6 +1138,7 @@
0E48A8521FDAD60900B9A4C0 /* OptionsViewController.swift */,
0EB8C0531F9CD38A005857E4 /* PIAWelcomeViewController.swift */,
0EB8C0551F9CD38A005857E4 /* PurchaseViewController.swift */,
DDE93C5622F9847E0054FE28 /* PurchaseTrialViewController.swift */,
DD0DE84F22366090002A6E82 /* GDPRViewController.swift */,
0EA8072320A18C6B0033EC1A /* RedeemViewController.swift */,
84D5DA6F2126CE2900F753F8 /* QRCameraScannerViewController.swift */,
......@@ -1838,6 +1841,7 @@
0E392DA31FE3247E0002160D /* Endpoint.swift in Sources */,
0E53A8581FE5DA16000C2A18 /* MockInAppProvider.swift in Sources */,
DDD824E32189969400151709 /* Preset.swift in Sources */,
DDE93C5722F9847E0054FE28 /* PurchaseTrialViewController.swift in Sources */,
0E9D62721FDE83BD009A90CF /* GlossServersBundle.swift in Sources */,
0E492C6A1FE61485007F23DF /* Client+Database.swift in Sources */,
0E48A8531FDAD60900B9A4C0 /* OptionsViewController.swift in Sources */,
......
{
"images" : [
{
"idiom" : "universal",
"filename" : "computer-7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "computer-7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "computer-7@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "globe-turn-7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "globe-turn-7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "globe-turn-7@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "shield-7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "shield-7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "shield-7@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
......@@ -214,7 +214,7 @@ public extension TextStyle {
)
static let textStyle22 = TextStyle(
font: UIFont.mediumFontWith(size: 24),
font: UIFont.mediumFontWith(size: 26),
color: UIColor.piaWhite,
foregroundColor: nil,
backgroundColor: nil,
......@@ -223,7 +223,7 @@ public extension TextStyle {
)
static let textStyle23 = TextStyle(
font: UIFont.mediumFontWith(size: 24),
font: UIFont.mediumFontWith(size: 26),
color: UIColor.piaGrey6,
foregroundColor: nil,
backgroundColor: nil,
......
......@@ -20,6 +20,8 @@
internal enum Asset {
internal static let centeredDarkMap = ImageAsset(name: "centered-dark-map")
internal static let centeredLightMap = ImageAsset(name: "centered-light-map")
internal static let computerIcon = ImageAsset(name: "computer-icon")
internal static let globeIcon = ImageAsset(name: "globe-icon")
internal static let iconBack = ImageAsset(name: "icon-back")
internal static let iconCamera = ImageAsset(name: "icon-camera")
internal static let iconClose = ImageAsset(name: "icon-close")
......@@ -28,6 +30,7 @@ internal enum Asset {
internal static let logoLight = ImageAsset(name: "logo-light")
internal static let planSelected = ImageAsset(name: "plan-selected")
internal static let planUnselected = ImageAsset(name: "plan-unselected")
internal static let shieldIcon = ImageAsset(name: "shield-icon")
internal static let closeIcon = ImageAsset(name: "close-icon")
internal static let imageAccountFailed = ImageAsset(name: "image-account-failed")
internal static let imageNoInternet = ImageAsset(name: "image-no-internet")
......
......@@ -25,6 +25,8 @@ internal enum StoryboardScene {
internal static let loginViewController = SceneType<PIALibrary.LoginViewController>(storyboard: Welcome.self, identifier: "LoginViewController")
internal static let purchaseViewController = SceneType<PIALibrary.PurchaseViewController>(storyboard: Welcome.self, identifier: "PurchaseViewController")
internal static let purchaseTrialViewController = SceneType<PIALibrary.PurchaseTrialViewController>(storyboard: Welcome.self, identifier: "PurchaseTrialViewController")
internal static let redeemViewController = SceneType<PIALibrary.RedeemViewController>(storyboard: Welcome.self, identifier: "RedeemViewController")
internal static let restoreViewController = SceneType<PIALibrary.RestoreSignupViewController>(storyboard: Welcome.self, identifier: "RestoreSignupViewController")
......
......@@ -30,6 +30,7 @@ internal enum StoryboardSegue {
case signupViaRecoverSegue = "SignupViaRecoverSegue"
case signupViaRedeemSegue = "SignupViaRedeemSegue"
case signupViaRestoreSegue = "SignupViaRestoreSegue"
case viewMoreVPNPlansSegue = "ViewMoreVPNPlansSegue"
}
}
// swiftlint:enable explicit_type_interface identifier_name line_length type_body_length type_name
......
......@@ -47,12 +47,6 @@ internal enum L10n {
}
}
internal enum Purchase {
internal enum Subscription {
internal enum Apple {
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.
internal static let terms = L10n.tr("Signup", "purchase.subscription.apple.terms")
}
}
internal enum Uncredited {
internal enum Alert {
/// You have uncredited transactions. Do you want to recover your account details?
......
......@@ -327,6 +327,12 @@ public class Theme {
label.textAlignment = textAlignment
}
public func applySmallSubtitle(_ label: UILabel) {
let textAlignment = label.textAlignment
label.style(style: TextStyle.textStyle21)
label.textAlignment = textAlignment
}
/// :nodoc:
public func applyBody1Monospace(_ textView: UITextView, appearance: Appearance) {
textView.font = typeface.monospaceFont(size: 14.0)
......
Supports Markdown
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