COVIDSafe code from version 1.13 (#25)

This commit is contained in:
COVIDSafe Support 2020-10-16 15:45:07 +11:00 committed by GitHub
parent a2b6a8bfb5
commit 3ea83834f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 970 additions and 576 deletions

View file

@ -80,10 +80,14 @@ class OTPViewController: UIViewController, RegistrationHandler {
let pinIssuesString = NSLocalizedString("ReceivePinIssue", comment: "Text for pin receive issues button")
let pinIssuesText = NSAttributedString(string: pinIssuesString, attributes: buttonAtt)
self.pinIssuesButton?.setAttributedTitle(pinIssuesText, for: .normal)
stepCounterLabel.text = String.localizedStringWithFormat( "stepCounter".localizedString(),
3,
UserDefaults.standard.bool(forKey: "allowedPermissions") ? 3 : 4
)
if reauthenticating {
stepCounterLabel.text = String.localizedStringWithFormat( "stepCounter".localizedString(), 2, 2)
} else {
stepCounterLabel.text = String.localizedStringWithFormat( "stepCounter".localizedString(),
3,
UserDefaults.standard.bool(forKey: "allowedPermissions") ? 3 : 4
)
}
}
override func viewWillAppear(_ animated: Bool) {
@ -143,6 +147,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
}
} else {
timer?.invalidate()
resendCodeButton?.isHidden = false
expiredMessageLabel?.text = "CodeHasExpired".localizedString()
expiredMessageLabel?.textColor = UIColor(0xA31919)
@ -173,6 +178,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
UserDefaults.standard.set(session, forKey: "session")
}
startTimer()
resendCodeButton?.isHidden = true
}
@IBAction func issuesWithPinTapped(_ sender: UIButton) {
@ -273,9 +279,7 @@ class OTPViewController: UIViewController, RegistrationHandler {
} else {
DispatchQueue.main.async {
let homeVC = HomeViewController(nibName: "HomeView", bundle: nil)
homeVC.modalPresentationStyle = .overFullScreen
homeVC.modalTransitionStyle = .coverVertical
self.present(homeVC, animated: true, completion: nil)
self.navigationController?.setViewControllers([homeVC], animated: true)
}
}
}