Skip to content

GitLab

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

Merge branch '62-piax-06-login-screen-redesign' into 'release/2.0.0' 

Resolve "PIAX 06. Login screen redesign"

See merge request ios/client-library-apple!118
parents 10042310 5f576ede
Expand all Hide whitespace changes
Inline Side-by-side
PIALibrary/Resources/UI/iOS/ar.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "استلم محتويات بطاقة هدية";
"restore.email.placeholder" = "البريد الإلكتروني";
"restore.submit" = "تأكيد";
"restore.subtitle" = "إذا اشتريت خطة من خلال هذا التطبيق ولم تصلك بيانات تسجيل دخولك، يمكنك إرسالها مرة أخرى من هنا.\nلن يتم تحصيل رسوم منك أثناء هذه العملية.";
"restore.subtitle" = "إذا اشتريت خطة من خلال هذا التطبيق ولم تصلك بيانات تسجيل دخولك، يمكنك إرسالها مرة أخرى من هنا. لن يتم تحصيل رسوم منك أثناء هذه العملية.";
"restore.title" = "استرداد الشراء غير المقيد في الحساب";
PIALibrary/Resources/UI/iOS/da.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Indløs gavekort";
"restore.email.placeholder" = "E-mailadresse";
"restore.submit" = "BEKRÆFT";
"restore.subtitle" = "Hvis du har købt en plan gennem denne app og ikke har modtaget dine legitimationsoplysninger, kan du anmode om at sende dem igen herfra.\nDu vil ikke blive opkrævet i løbet af denne proces.";
"restore.subtitle" = "Hvis du har købt en plan gennem denne app og ikke har modtaget dine legitimationsoplysninger, kan du anmode om at sende dem igen herfra. Du vil ikke blive opkrævet i løbet af denne proces.";
"restore.title" = "Gendan ukrediteret køb";
PIALibrary/Resources/UI/iOS/de.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Geschenkkarte einlösen";
"restore.email.placeholder" = "E-Mail-Adresse";
"restore.submit" = "BESTÄTIGEN";
"restore.subtitle" = "Wenn du durch diese App einen Plan gekauft hast und deine Anmeldedaten nicht erhalten hast, kannst du sie von hier aus erneut senden.\nDir wird während dieses Prozesses nichts in Rechnung gestellt.";
"restore.subtitle" = "Wenn du durch diese App einen Plan gekauft hast und deine Anmeldedaten nicht erhalten hast, kannst du sie von hier aus erneut senden. Dir wird während dieses Prozesses nichts in Rechnung gestellt.";
"restore.title" = "Nicht gutgeschriebenen Kauf wiederherstellen";
PIALibrary/Resources/UI/iOS/en.lproj/Welcome.strings
View file @ a0248dea
......@@ -54,7 +54,7 @@
"plan.accessibility.per_month" = "per month";
"restore.title" = "Restore uncredited purchase";
"restore.subtitle" = "If you purchased a plan through this app and didn't receive your credentials, you can send them again from here.\nYou will not be charged during this process.";
"restore.subtitle" = "If you purchased a plan through this app and didn't receive your credentials, you can send them again from here. You will not be charged during this process.";
"restore.email.placeholder" = "Email address";
"restore.submit" = "CONFIRM";
......
PIALibrary/Resources/UI/iOS/es-MX.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Canjear tarjeta de regalo";
"restore.email.placeholder" = "Correo electrónico";
"restore.submit" = "CONFIRMAR";
"restore.subtitle" = "Si compraste un plan con esta aplicación y no recibiste tus credenciales, puedes enviarlas de nuevo desde aquí.\nNo se te harán cargos durante este proceso.";
"restore.subtitle" = "Si compraste un plan con esta aplicación y no recibiste tus credenciales, puedes enviarlas de nuevo desde aquí. No se te harán cargos durante este proceso.";
"restore.title" = "Restablecer compra no acreditada";
PIALibrary/Resources/UI/iOS/it.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Riscatta la carta regalo";
"restore.email.placeholder" = "Indirizzo email";
"restore.submit" = "CONFERMA";
"restore.subtitle" = "Se hai acquistato un piano mediante questa app ma non hai ricevuto le tue credenziali, puoi inviarle nuovamente da qui.\nNon verrà effettuato alcun addebito durante la procedura.";
"restore.subtitle" = "Se hai acquistato un piano mediante questa app ma non hai ricevuto le tue credenziali, puoi inviarle nuovamente da qui. Non verrà effettuato alcun addebito durante la procedura.";
"restore.title" = "Ripristina acquisto non accreditato";
PIALibrary/Resources/UI/iOS/ko.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "기프트 카드 청구";
"restore.email.placeholder" = "이메일 주소";
"restore.submit" = "확인";
"restore.subtitle" = "이 앱을 통해 요금 플랜을 구매하셨는데 자격 증명 정보를 받지 못하신 경우 이곳에서 다시 보내실 수 있습니다.\n이 과정 중 요금이 부과되지 않습니다.";
"restore.subtitle" = "이 앱을 통해 요금 플랜을 구매하셨는데 자격 증명 정보를 받지 못하신 경우 이곳에서 다시 보내실 수 있습니다. 이 과정 중 요금이 부과되지 않습니다.";
"restore.title" = "인정되지 않은 구매 항목 복원";
PIALibrary/Resources/UI/iOS/nb.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Løs inn gavekort";
"restore.email.placeholder" = "E-postadresse";
"restore.submit" = "BEKREFT";
"restore.subtitle" = "Hvis du kjøpte en plan via appen og ikke har mottatt opplysningene dine, kan du sende dem igjen her i fra.\nDu belastes ikke under denne prosessen.";
"restore.subtitle" = "Hvis du kjøpte en plan via appen og ikke har mottatt opplysningene dine, kan du sende dem igjen her i fra. Du belastes ikke under denne prosessen.";
"restore.title" = "Gjenopprett ukreditert kjøp";
PIALibrary/Resources/UI/iOS/nl.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Cadeaubon inwisselen";
"restore.email.placeholder" = "E-mailadres";
"restore.submit" = "BEVESTIGEN";
"restore.subtitle" = "Als u een abonnement via deze app heeft aangeschaft en u heeft uw gegevens niet ontvangen, dan kunt u ze hier opnieuw verzenden.\nEr worden geen kosten in rekening gebracht tijdens dit proces.";
"restore.subtitle" = "Als u een abonnement via deze app heeft aangeschaft en u heeft uw gegevens niet ontvangen, dan kunt u ze hier opnieuw verzenden. Er worden geen kosten in rekening gebracht tijdens dit proces.";
"restore.title" = "Aankoop herstellen";
PIALibrary/Resources/UI/iOS/pl.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Wykorzystaj kartę podarunkową";
"restore.email.placeholder" = "Adres e-mail";
"restore.submit" = "POTWIERDŹ";
"restore.subtitle" = "Jeśli kupił(a)ś plan, korzystając z tej aplikacji, ale nie dostałe(a)ś danych logowania, możesz wysłać je ponownie stąd.\nOpłata nie zostanie za to pobrana.";
"restore.subtitle" = "Jeśli kupił(a)ś plan, korzystając z tej aplikacji, ale nie dostałe(a)ś danych logowania, możesz wysłać je ponownie stąd. Opłata nie zostanie za to pobrana.";
"restore.title" = "Przywróć pominięty zakup";
PIALibrary/Resources/UI/iOS/th.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "ใช้สิทธิ์บัตรของขวัญ";
"restore.email.placeholder" = "อีเมลแอดเดรส";
"restore.submit" = "ยืนยัน";
"restore.subtitle" = "หากคุณทำการซื้อแผนผ่านแอพนี้และยังไม่ได้รับข้อมูลประจำตัว คุณสามารถส่งอีกครั้งได้จากที่นี่\nคุณจะไม่ถูกเรียกเก็บเงินซ้ำอีกครั้งในกระบวนการนี้";
"restore.subtitle" = "หากคุณทำการซื้อแผนผ่านแอพนี้และยังไม่ได้รับข้อมูลประจำตัว คุณสามารถส่งอีกครั้งได้จากที่นี่ คุณจะไม่ถูกเรียกเก็บเงินซ้ำอีกครั้งในกระบวนการนี้";
"restore.title" = "คืนค่าการซื้อยังไม่ได้คิดเครดิต";
PIALibrary/Resources/UI/iOS/tr.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "Hediye kartını kullan";
"restore.email.placeholder" = "E-posta adresi";
"restore.submit" = "ONAYLA";
"restore.subtitle" = "Bu uygulamadan bir plan satın aldıktan sonra hesap bilgilerinizi alamadıysanız, onları buradan tekrar gönderebilirsiniz.\nBu işlem için sizden ücret alınmayacak.";
"restore.subtitle" = "Bu uygulamadan bir plan satın aldıktan sonra hesap bilgilerinizi alamadıysanız, onları buradan tekrar gönderebilirsiniz. Bu işlem için sizden ücret alınmayacak.";
"restore.title" = "Bilgileri gönderilmeyen satın alma işlemini tekrarlayın";
PIALibrary/Resources/UI/iOS/zh-Hans.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "兑换礼品卡";
"restore.email.placeholder" = "电子邮件地址";
"restore.submit" = "确认";
"restore.subtitle" = "如果您通过此 app 购买了套餐，但没有收到凭据，可以从这里重新发送。\n在此过程中您不会被收费。";
"restore.subtitle" = "如果您通过此 app 购买了套餐，但没有收到凭据，可以从这里重新发送。 在此过程中您不会被收费。";
"restore.title" = "恢复未入账的购买";
PIALibrary/Resources/UI/iOS/zh-Hant.lproj/Welcome.strings
View file @ a0248dea
......@@ -44,5 +44,5 @@
"redeem.title" = "兌換禮品卡";
"restore.email.placeholder" = "電子郵件地址";
"restore.submit" = "確定";
"restore.subtitle" = "如果您透過此應用程式購買方案後收不到您的憑證資料，您可以透過這裡要求再次傳送。\n此操作不會收取任何費用。";
"restore.subtitle" = "如果您透過此應用程式購買方案後收不到您的憑證資料，您可以透過這裡要求再次傳送。 此操作不會收取任何費用。";
"restore.title" = "回復未貸記購買項目";
PIALibrary/Sources/UI/iOS/BorderedTextField.swift
View file @ a0248dea
......@@ -77,7 +77,7 @@ public class BorderedTextField: UITextField {
/// :nodoc:
public override func awakeFromNib() {
super.awakeFromNib()
rightViewMode = .unlessEditing
borderStyle = .none
textColor = .darkText
self.delegate = self
......@@ -138,6 +138,12 @@ public class BorderedTextField: UITextField {
return UIEdgeInsetsInsetRect(bounds,
UIEdgeInsetsMake(0, 16, 0, 16))
}
public override func rightViewRect(forBounds bounds: CGRect) -> CGRect {
var rightViewRect = super.rightViewRect(forBounds: bounds)
rightViewRect.origin.x -= 16
return rightViewRect
}
}
......
PIALibrary/Sources/UI/iOS/SwiftGen+SeguesStoryboards.swift
View file @ a0248dea
......@@ -21,8 +21,10 @@ internal enum StoryboardSegue {
}
internal enum Welcome: String, SegueType {
case confirmPurchaseVPNPlanSegue = "ConfirmPurchaseVPNPlanSegue"
case loginAccountSegue = "LoginAccountSegue"
case purchaseVPNPlanSegue = "PurchaseVPNPlanSegue"
case redeemGiftCardSegue = "RedeemGiftCardSegue"
case restorePurchaseSegue = "RestorePurchaseSegue"
case signupQRCameraScannerSegue = "SignupQRCameraScannerSegue"
case signupViaPurchaseSegue = "SignupViaPurchaseSegue"
case signupViaRecoverSegue = "SignupViaRecoverSegue"
......
PIALibrary/Sources/UI/iOS/SwiftGen+Strings.swift
View file @ a0248dea
......@@ -285,7 +285,7 @@ internal enum L10n {
internal enum Restore {
/// CONFIRM
internal static let submit = L10n.tr("Welcome", "restore.submit")
/// If you purchased a plan through this app and didn't receive your credentials, you can send them again from here.\nYou will not be charged during this process.
/// If you purchased a plan through this app and didn't receive your credentials, you can send them again from here. You will not be charged during this process.
internal static let subtitle = L10n.tr("Welcome", "restore.subtitle")
/// Restore uncredited purchase
internal static let title = L10n.tr("Welcome", "restore.title")
......
PIALibrary/Sources/UI/iOS/ViewControllers/AutolayoutViewController.swift
View file @ a0248dea
......@@ -122,12 +122,16 @@ open class AutolayoutViewController: UIViewController, ModalController, Restylab
private func restoreFormElementBorder(_ element: UIView) {
if let element = element as? UITextField {
Theme.current.applyInput(element)
element.rightView = nil
}
}
private func updateFormElementBorder(_ element: UIView) {
if let element = element as? UITextField {
Theme.current.applyInputError(element)
let iconWarning = UIImageView(image:Asset.iconWarning.image.withRenderingMode(.alwaysTemplate))
iconWarning.tintColor = .piaRed
element.rightView = iconWarning
}
}
......
PIALibrary/Sources/UI/iOS/ViewControllers/ConfirmVPNPlanViewController.swift
View file @ a0248dea
......@@ -193,5 +193,4 @@ public class ConfirmVPNPlanViewController: AutolayoutViewController, BrandableNa
for: [])
}
}
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