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

COVIDSafe code from version 1.13

Browse source
This commit is contained in:
covidsafe-support 2020-10-16 15:43:19 +11:00
parent a2b6a8bfb5
commit 2ac0a7e591
33 changed files with 970 additions and 576 deletions
Download patch file Download diff file Expand all files Collapse all files

59
CovidSafe/HomeViewController.swift
View file

@ -8,9 +8,7 @@ class HomeViewController: UIViewController {
private var observer: NSObjectProtocol?
@IBOutlet weak var bluetoothStatusOffView: UIView!
@IBOutlet weak var bluetoothStatusOnView: UIView!
@IBOutlet weak var bluetoothPermissionOffView: UIView!
@IBOutlet weak var bluetoothPermissionOnView: UIView!
@IBOutlet weak var shareView: UIView!
@IBOutlet weak var inactiveAppSectionView: UIView!
@IBOutlet weak var activeAppSectionView: UIView!
@ -172,6 +170,10 @@ class HomeViewController: UIViewController {
self.lottieBluetoothView?.play()
self.becomeFirstResponder()
self.updateJWTKeychainAccess()
if shouldShowPolicyUpdateMessage() {
showPolicyUpdateMessage()
}
}
override func viewWillDisappear(_ animated: Bool) {
@ -330,12 +332,10 @@ class HomeViewController: UIViewController {
}
fileprivate func toggleBluetoothStatusView() {
toggleViewVisibility(view: bluetoothStatusOnView, isVisible: !self.bluetoothPermissionOn && self.bluetoothStatusOn)
toggleViewVisibility(view: bluetoothStatusOffView, isVisible: self.bluetoothPermissionOn && !self.bluetoothStatusOn)
}
fileprivate func toggleBluetoothPermissionStatusView() {
toggleViewVisibility(view: bluetoothPermissionOnView, isVisible: !self.allPermissionOn && self.bluetoothPermissionOn)
toggleViewVisibility(view: bluetoothPermissionOffView, isVisible: !self.allPermissionOn && !self.bluetoothPermissionOn)
}
@ -357,6 +357,36 @@ class HomeViewController: UIViewController {
}
}
// MARK: policy update message
func shouldShowPolicyUpdateMessage() -> Bool {
// this is the min version that the disclamer should be diplayed on.
let minVersionShowPolicyUpdate = 77
let latestVersionShown = UserDefaults.standard.integer(forKey: "latestPolicyUpdateVersionShown")
guard let currentVersion = (Bundle.main.version as NSString?)?.integerValue else {
return false
}
if currentVersion >= minVersionShowPolicyUpdate && currentVersion > latestVersionShown {
UserDefaults.standard.set(currentVersion, forKey: "latestPolicyUpdateVersionShown")
return true
}
return false
}
func showPolicyUpdateMessage() {
let privacyPolicyUrl = URLHelper.getPrivacyPolicyURL()
let disclaimerAlert = CSAlertViewController(nibName: "CSAlertView", bundle: nil)
let disclaimerMsg = NSMutableAttributedString(string: "collection_message".localizedString(), attributes: [.font : UIFont.preferredFont(forTextStyle: .body)])
disclaimerMsg.addLink(enclosedIn: "*", urlString: privacyPolicyUrl)
disclaimerAlert.set(message: disclaimerMsg, buttonLabel: "dismiss".localizedString())
disclaimerAlert.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
disclaimerAlert.modalTransitionStyle = UIModalTransitionStyle.crossDissolve
present(disclaimerAlert, animated: true, completion: nil)
}
// MARK: API calls
func getMessagesFromServer(force: Bool = false, completion: @escaping () -> Void = {}) {
@ -393,10 +423,12 @@ class HomeViewController: UIViewController {
}
func getStatistics() {
self.covidStatisticsViewController.isLoading = true
StatisticsAPI.getStatistics { (stats, error) in
self.covidStatisticsViewController.isLoading = false
self.covidStatisticsViewController.setupData(statistics: stats, errorType: error, hasInternet: self.isInternetReachable())
if covidStatisticsViewController.showStatistics {
self.covidStatisticsViewController.isLoading = true
StatisticsAPI.getStatistics { (stats, error) in
self.covidStatisticsViewController.isLoading = false
self.covidStatisticsViewController.setupData(statistics: stats, errorType: error, hasInternet: self.isInternetReachable())
}
}
}
@ -466,13 +498,10 @@ class HomeViewController: UIViewController {
}
@IBAction func onPositiveButtonTapped(_ sender: UITapGestureRecognizer) {
guard let helpVC = UIStoryboard(name: "UploadData", bundle: nil).instantiateInitialViewController() else {
guard let uploadVC = UIStoryboard(name: "UploadData", bundle: nil).instantiateInitialViewController() else {
return
}
let nav = UploadDataNavigationController(rootViewController: helpVC)
nav.modalTransitionStyle = .coverVertical
nav.modalPresentationStyle = .fullScreen
present(nav, animated: true, completion: nil)
navigationController?.pushViewController(uploadVC, animated: true)
}
@IBAction func onHelpButtonTapped(_ sender: Any) {
@ -491,9 +520,7 @@ class HomeViewController: UIViewController {
@IBAction func onSettingsTapped(_ sender: Any) {
let settingsVC = SettingsViewController(nibName: "SettingsView", bundle: nil)
settingsVC.showUpdateAvailable = shouldShowUpdateApp
settingsVC.modalPresentationStyle = .overFullScreen
settingsVC.modalTransitionStyle = .coverVertical
self.present(settingsVC, animated: true, completion: nil)
navigationController?.pushViewController(settingsVC, animated: true)
}
@objc