mirror-AU-COVIDSafe/mobile-ios
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-ios.git synced 2025-04-19 21:15:21 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.7 (#8)

Browse source
This commit is contained in:
COVIDSafe Support 2020-07-03 14:26:13 +10:00 • committed by GitHub
parent 2063cea613
commit 6f92ff8fb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 4504 additions and 1281 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CovidSafe/OTPViewController.swift
View file

@ -63,7 +63,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
.foregroundColor: UIColor.covidSafeColor,
.underlineStyle: NSUnderlineStyle.single.rawValue
]
let wrongNumberText = NSAttributedString(string: NSLocalizedString("IsThisNumberWrong",
let wrongNumberText = NSAttributedString(string: NSLocalizedString("enter_pin_wrong_number",
comment: "Is the entered mobile number incorrect"),
attributes: linkAtt)
self.wrongNumberButton?.setAttributedTitle(wrongNumberText, for: .normal)
@ -72,7 +72,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
.foregroundColor: UIColor.covidSafeColor,
.underlineStyle: NSUnderlineStyle.single.rawValue
]
let resendPin = NSLocalizedString("ResendPin", comment: "Text for resend pin button")
let resendPin = NSLocalizedString("enter_pin_resend_pin", comment: "Text for resend pin button")
let resendCodeText = NSAttributedString(string: resendPin, attributes: buttonAtt)
self.resendCodeButton?.setAttributedTitle(resendCodeText, for: .normal)
@ -144,6 +144,9 @@ class OTPViewController: UIViewController, RegistrationHandler {
verifyButton?.isEnabled = false
verifyButton?.backgroundColor = self.verifyDisabledColor
if UIAccessibility.isVoiceOverRunning {
UIAccessibility.post(notification: .layoutChanged, argument: expiredMessageLabel)
}
}
}
@ -156,7 +159,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
let errorAlert = UIAlertController(title: "PhoneVerificationErrorTitle".localizedString(),
message: "PhoneVerificationErrorMessage".localizedString(),
preferredStyle: .alert)
errorAlert.addAction(UIAlertAction(title: "OK".localizedString(), style: .default, handler: { _ in
errorAlert.addAction(UIAlertAction(title: "global_OK".localizedString(), style: .default, handler: { _ in
NSLog("Unable to verify phone number")
}))
self?.present(errorAlert, animated: true)
@ -194,7 +197,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
let errorAlert = UIAlertController(title: "PhoneNumberFormatErrorTitle".localizedString(),
message: "PhoneNumberFormatErrorMessage".localizedString(),
preferredStyle: .alert)
errorAlert.addAction(UIAlertAction(title: "OK".localizedString(), style: .default, handler: { _ in
errorAlert.addAction(UIAlertAction(title: "global_OK".localizedString(), style: .default, handler: { _ in
self.navigationController?.popViewController(animated: true)
NSLog("Unable to verify phone number")
}))
@ -246,10 +249,16 @@ class OTPViewController: UIViewController, RegistrationHandler {
viewController.errorMessageLabel?.text = "InvalidOTP".localizedString(comment: "Must be a 6-digit code")
self.errorMessageLabel?.isHidden = false
self.codeInputView?.invalidCode = true
if UIAccessibility.isVoiceOverRunning {
UIAccessibility.post(notification: .layoutChanged, argument: viewController.errorMessageLabel)
}
case .WrongOTP:
viewController.errorMessageLabel?.text = "WrongOTP".localizedString(comment: "Wrong PIN entered")
viewController.errorMessageLabel?.text = "wrong_ping_number".localizedString(comment: "Wrong PIN entered")
self.errorMessageLabel?.isHidden = false
self.codeInputView?.invalidCode = true
if UIAccessibility.isVoiceOverRunning {
UIAccessibility.post(notification: .layoutChanged, argument: viewController.errorMessageLabel)
}
case .Success:
if (self.reauthenticating) {
self.dismiss(animated: true, completion: nil)