Merge branch 'integrate-vyprvpn'

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- VyprVPN provider. [#72](https://github.com/passepartoutvpn/passepartout-ios/pull/72)
 - More infrastructure metadata.
 
 ## 1.6.0 Beta 1757 (2019-04-25)

Passepartout-iOS/Providers.xcassets/vyprvpn.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "vyprvpn@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "vyprvpn@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Passepartout-iOS/Scenes/AccountViewController.swift

@@ -77,6 +77,9 @@ class AccountViewController: UIViewController, TableModelHost {
         case .tunnelBear:
             return V.tunnelbear(name.rawValue)
             
+        case .vyprVPN:
+            return V.vyprvpn(name.rawValue)
+            
         case .windscribe:
             return V.windscribe(name.rawValue)
         }

Passepartout/Resources/de.lproj/Localizable.strings

@@ -142,6 +142,7 @@
 "account.sections.guidance.footer.infrastructure.pia" = "Benutze deine %@ Web-Zugangsdaten. Dein Benutzername ist üblicherweise numerischt mit einem \"p\" Präfix.";
 "account.sections.guidance.footer.infrastructure.protonvpn" = "Deine Zugangsdaten für %@ findest du unter \"Account > OpenVPN / IKEv2 Username\" auf der Webseite.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Benutze deine %@ Web-Zugangsdaten. Dein Benutzername ist üblicherweise deine Email.";
+"account.sections.guidance.footer.infrastructure.vyprvpn" = "Benutze deine %@ Web-Zugangsdaten. Dein Benutzername ist üblicherweise deine Email.";
 "account.sections.guidance.footer.infrastructure.windscribe" = "Deine Zugangsdaten für %@ findest du im OpenVPN Config Generator auf der Webseite.";
 "account.sections.registration.footer" = "Beantrage einen Account auf der %@ Webseite.";
 "account.cells.username.caption" = "Benutzername";

Passepartout/Resources/en.lproj/Localizable.strings

@@ -142,6 +142,7 @@
 "account.sections.guidance.footer.infrastructure.pia" = "Use your %@ website credentials. Your username is usually numeric with a \"p\" prefix.";
 "account.sections.guidance.footer.infrastructure.protonvpn" = "Find your %@ credentials in the \"Account > OpenVPN / IKEv2 Username\" section of the website.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Use your %@ website credentials. Your username is usually your e-mail.";
+"account.sections.guidance.footer.infrastructure.vyprvpn" = "Use your %@ website credentials. Your username is usually your e-mail.";
 "account.sections.guidance.footer.infrastructure.windscribe" = "Find your %@ credentials in the OpenVPN Config Generator on the website.";
 "account.sections.registration.footer" = "Go get an account on the %@ website.";
 "account.cells.username.caption" = "Username";

Passepartout/Resources/it.lproj/Localizable.strings

@@ -142,6 +142,7 @@
 "account.sections.guidance.footer.infrastructure.pia" = "Usa le credenziali del sito di %@. Il tuo username è generalmente numerico con un prefisso \"p\".";
 "account.sections.guidance.footer.infrastructure.protonvpn" = "Trova le tue credenziali nella sezione \"Account > OpenVPN / IKEv2 Username\" del sito di %@.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Usa le credenziali del sito di %@. Il tuo username è generalmente la tua e-mail.";
+"account.sections.guidance.footer.infrastructure.vyprvpn" = "Usa le credenziali del sito di %@. Il tuo username è generalmente la tua e-mail.";
 "account.sections.guidance.footer.infrastructure.windscribe" = "Trova le tue credenziali nell'OpenVPN Config Generator sul sito di %@.";
 "account.sections.registration.footer" = "Registra un account sul sito di %@.";
 "account.cells.username.caption" = "Username";

Passepartout/Resources/pt-br.lproj/Localizable.strings

@@ -146,6 +146,7 @@
 "account.sections.guidance.footer.infrastructure.pia" = "Utilize %@ credenciais do site. Seu usuário é normalmente numérico com prefixo \"p\".";
 "account.sections.guidance.footer.infrastructure.protonvpn" = "Encontre %@ credenciais na sessão \"Account > OpenVPN / IKEv2 Username\" do site.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Utilize %@ credenciais do site. Seu usuário é normalmente o seu email.";
+"account.sections.guidance.footer.infrastructure.vyprvpn" = "Utilize %@ credenciais do site. Seu usuário é normalmente o seu email.";
 "account.sections.guidance.footer.infrastructure.windscribe" = "Encontre %@ credenciais no gerador de configuração OpenVPN do site.";
 "account.sections.registration.footer" = "Registrar em %@ website.";
 "account.cells.username.caption" = "Usuário";

Passepartout/Resources/ru.lproj/Localizable.strings

@@ -142,6 +142,7 @@
 "account.sections.guidance.footer.infrastructure.pia" = "Используйте Ваши данные для входа с веб-сайта %@. Ваш логин обычно числовой с приставкой \"p\".";
 "account.sections.guidance.footer.infrastructure.protonvpn" = "Найдите Ваши данные для входа %@ \"Account > OpenVPN / IKEv2 Username\" секции веб-сайта.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Используйте данные для входа на %@ веб-сайт. Ваш логин обычно Ваш e-mail.";
+"account.sections.guidance.footer.infrastructure.vyprvpn" = "Используйте данные для входа на %@ веб-сайт. Ваш логин обычно Ваш e-mail.";
 "account.sections.guidance.footer.infrastructure.windscribe" = "Найдите Ваши данные для входа %@ в OpenVPN Config Generator на веб-сайте.";
 "account.sections.registration.footer" = "Создайте аккаунт на %@ веб-сайте.";
 "account.cells.username.caption" = "Логин";

Passepartout/Sources/AppConstants.swift

@@ -208,6 +208,7 @@ public class AppConstants {
             .pia: "https://www.privateinternetaccess.com/pages/buy-vpn/",
             .protonVPN: "https://protonvpn.net/?aid=keeshux",
             .tunnelBear: "https://click.tunnelbear.com/SHb8",
+            .vyprVPN: "https://www.vyprvpn.com/",
             .windscribe: "https://secure.link/kCsD0prd"
         ]
 

Passepartout/Sources/Services/Infrastructure.swift

@@ -38,6 +38,8 @@ public struct Infrastructure: Codable {
 
         case tunnelBear = "TunnelBear"
         
+        case vyprVPN = "VyprVPN"
+        
         case windscribe = "Windscribe"
     }
     

Passepartout/Sources/Services/InfrastructureFactory.swift

@@ -64,6 +64,7 @@ public class InfrastructureFactory {
         .pia,
         .protonVPN,
         .tunnelBear,
+        .vyprVPN,
         .windscribe
     ]
     

Passepartout/Sources/SwiftGen+Strings.swift

@@ -106,6 +106,10 @@ public enum L10n {
             public static func tunnelbear(_ p1: String) -> String {
               return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.tunnelbear", p1)
             }
+            /// Use your %@ website credentials. Your username is usually your e-mail.
+            public static func vyprvpn(_ p1: String) -> String {
+              return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.vyprvpn", p1)
+            }
             /// Find your %@ credentials in the OpenVPN Config Generator on the website.
             public static func windscribe(_ p1: String) -> String {
               return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.windscribe", p1)
@@ -554,18 +558,6 @@ public enum L10n {
   }
 
   public enum Provider {
-    public enum Pool {
-      public enum Sections {
-        public enum Free {
-          /// Free
-          public static let header = L10n.tr("Localizable", "provider.pool.sections.free.header")
-        }
-        public enum Paid {
-          /// Paid
-          public static let header = L10n.tr("Localizable", "provider.pool.sections.paid.header")
-        }
-      }
-    }
     public enum Preset {
       public enum Cells {
         public enum TechDetails {

README.md

@@ -60,8 +60,8 @@ Passepartout can connect to a few well-known VPN providers with an existing acco
 - [Private Internet Access][app-net-pia]
 - [ProtonVPN][app-net-protonvpn]
 - [TunnelBear][app-net-tunnelbear]
+- [VyprVPN][app-net-vyprvpn]
 - [Windscribe][app-net-windscribe]
-- ...more soon!
 
 In preset mode, you can pick pre-resolved IPv4 endpoints when DNS is problematic.
 
@@ -159,6 +159,7 @@ Website: [passepartoutvpn.app][about-website]
 [app-net-pia]: https://www.privateinternetaccess.com/pages/buy-vpn/
 [app-net-protonvpn]: https://protonvpn.net/?aid=keeshux
 [app-net-tunnelbear]: https://click.tunnelbear.com/SHb8
+[app-net-vyprvpn]: https://www.vyprvpn.com/
 [app-net-windscribe]: https://secure.link/kCsD0prd
 
 [dep-cocoapods]: https://guides.cocoapods.org/using/getting-started.html

fastlane/metadata/en-US/description.txt

@@ -21,8 +21,8 @@ FEATURES
   - Private Internet Access
   - ProtonVPN
   - TunnelBear
+  - VyprVPN
   - Windscribe
-  - ...more soon!
 - Import .ovpn configuration files.
 - Full transparency on what servers you're connecting to.
 

fastlane/metadata/it/description.txt

@@ -21,8 +21,8 @@ FEATURE
   - Private Internet Access
   - ProtonVPN
   - TunnelBear
+  - VyprVPN
   - Windscribe
-  - ...altri in arrivo!
 - Importa file di configurazione .ovpn.
 - Completa trasparenza sui server a cui ti connetti.