mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for iOS 13, how to show uialertcontroller

This commit is contained in:
Johan Degraeve 2019-10-18 00:10:19 +02:00
parent 2490ad2ef8
commit 7b8b890bb6
7 changed files with 128 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip/Extensions/UIAlertController.swift
View File

@ -1,14 +1,6 @@
import UIKit
extension UIAlertController {
/// presents UIAlertController in rootViewController, the alert will pop up no matter where the user is
func presentInOwnWindow(animated: Bool, completion: (() -> Void)?) {
let alertWindow = UIWindow(frame: UIScreen.main.bounds)
alertWindow.rootViewController = UIViewController()
alertWindow.windowLevel = UIWindow.Level.alert + 1;
alertWindow.makeKeyAndVisible()
alertWindow.rootViewController?.present(self, animated: animated, completion: completion)
}
/// creates a UIAlertController of type alert with a title and message and adds an ok button, nothing else
/// - parameters:

39
xdrip/View Controllers/M5StackNavigationController/M5StacksViewController/M5StackViewController/M5StackViewController.swift
View File

@ -317,7 +317,7 @@ final class M5StackViewController: UIViewController {
}
// first ask user if ok to delete and if yes delete
UIAlertController(title: Texts_M5StackView.confirmDeletionM5Stack + " " + textToAdd + "?", message: nil, actionHandler: {
let alert = UIAlertController(title: Texts_M5StackView.confirmDeletionM5Stack + " " + textToAdd + "?", message: nil, actionHandler: {
// delete
self.m5StackManager?.deleteM5Stack(m5Stack: m5StackAsNSObject)
@ -327,7 +327,9 @@ final class M5StackViewController: UIViewController {
self.performSegue(withIdentifier: UnwindSegueIdentifiers.M5StackToM5StacksUnWindSegueIdentifier.rawValue, sender: self)
}, cancelHandler: nil).presentInOwnWindow(animated: true, completion: {})
}, cancelHandler: nil)
self.present(alert, animated:true)
}
@ -480,7 +482,10 @@ extension M5StackViewController: UITableViewDataSource, UITableViewDelegate {
case .address:
guard let m5StackAsNSObject = m5StackAsNSObject else {return}
UIAlertController(title: Texts_M5StackView.address, message: m5StackAsNSObject.address, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_M5StackView.address, message: m5StackAsNSObject.address, actionHandler: nil)
// present the alert
self.present(alert, animated: true, completion: nil)
case .name, .blePassword, .connectionStatus:
break
@ -503,7 +508,10 @@ extension M5StackViewController: UITableViewDataSource, UITableViewDelegate {
if m5StackName.userDefinedName == text {
// m5stack userdefined name already exists
UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.userdefinedNameAlreadyExists, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alreadyExistsAlert = UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.userdefinedNameAlreadyExists, actionHandler: nil)
// present the alert
self.present(alreadyExistsAlert, animated: true, completion: nil)
return
@ -601,43 +609,49 @@ extension M5StackViewController: M5StackBluetoothDelegate {
if !success {
// show warning, inform that user should set password or reset M5Stack
UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.authenticationFailureWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.authenticationFailureWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
// by the time user clicks 'ok', the M5stack will be disconnected by the M5StackManager (see authentication in M5StackManager)
self.shouldConnectTemporaryValue = m5Stack.shouldconnect
self.setConnectButtonLabelText()
}).presentInOwnWindow(animated: true, completion: nil)
})
self.present(alert, animated: true, completion: nil)
}
}
func blePasswordMissing(forM5Stack m5Stack: M5Stack) {
// show warning, inform that user should set password or reset M5Stack
UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.authenticationFailureWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.authenticationFailureWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
// by the time user clicks 'ok', the M5stack will be disconnected by the M5StackManager (see authentication in M5StackManager)
self.shouldConnectTemporaryValue = m5Stack.shouldconnect
self.setConnectButtonLabelText()
}).presentInOwnWindow(animated: true, completion: nil)
})
self.present(alert, animated: true, completion: nil)
}
func m5StackResetRequired(forM5Stack m5Stack: M5Stack) {
// show warning, inform that user should set password or reset M5Stack
UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.m5StackResetRequiredWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_M5StackView.m5StackResetRequiredWarning + " " + Texts_M5StackView.alwaysConnect, actionHandler: {
// by the time user clicks 'ok', the M5stack will be disconnected by the M5StackManager (see authentication in M5StackManager)
self.shouldConnectTemporaryValue = m5Stack.shouldconnect
self.setConnectButtonLabelText()
}).presentInOwnWindow(animated: true, completion: nil)
})
self.present(alert, animated: true, completion: nil)
}
func didConnect(forM5Stack m5Stack: M5Stack?, address: String?, name: String?, bluetoothTransmitter: M5StackBluetoothTransmitter) {
@ -656,7 +670,10 @@ extension M5StackViewController: M5StackBluetoothDelegate {
}
func error(message: String) {
UIAlertController(title: Texts_Common.warning, message: message, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: message, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
}

4
xdrip/View Controllers/M5StackNavigationController/M5StacksViewController/M5StacksViewController.swift
View File

@ -193,7 +193,9 @@ extension M5StacksViewController: UITableViewDataSource, UITableViewDelegate {
// the last row is the help info
if indexPath.row == m5Stacks.count {
UIAlertController(title: Texts_HomeView.info, message: Texts_M5StacksView.m5StackSoftWareHelpText + " " + ConstantsM5Stack.githubURLM5Stack, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.info, message: Texts_M5StacksView.m5StackSoftWareHelpText + " " + ConstantsM5Stack.githubURLM5Stack, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
} else {

103
xdrip/View Controllers/Root View Controller/RootViewController.swift
View File

@ -16,7 +16,11 @@ final class RootViewController: UIViewController {
@IBAction func calibrateButtonAction(_ sender: UIButton) {
if let transmitterType = UserDefaults.standard.transmitterType, transmitterType.canWebOOP(), UserDefaults.standard.webOOPEnabled {
UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.calibrationNotNecessary, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.calibrationNotNecessary, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
} else {
requestCalibration(userRequested: true)
}
@ -32,7 +36,11 @@ final class RootViewController: UIViewController {
@IBOutlet weak var preSnoozeButtonOutlet: UIButton!
@IBAction func preSnoozeButtonAction(_ sender: UIButton) {
UIAlertController(title: "Info", message: "Unfortuantely, presnooze functionality is not yet implemented", actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: "Info", message: "Unfortuantely, presnooze functionality is not yet implemented", actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
/// outlet for label that shows how many minutes ago and so on
@ -188,15 +196,19 @@ final class RootViewController: UIViewController {
// if licenseinfo not yet accepted, show license info with only ok button
if !UserDefaults.standard.licenseInfoAccepted {
UIAlertController(title: ConstantsHomeView.applicationName, message: Texts_HomeView.licenseInfo + ConstantsHomeView.infoEmailAddress, actionHandler: {
let alert = UIAlertController(title: ConstantsHomeView.applicationName, message: Texts_HomeView.licenseInfo + ConstantsHomeView.infoEmailAddress, actionHandler: {
// set licenseInfoAccepted to true
UserDefaults.standard.licenseInfoAccepted = true
// create info screen about transmitters
UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.transmitterInfo, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let infoScreenAlert = UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.transmitterInfo, actionHandler: nil)
}).presentInOwnWindow(animated: true, completion: nil)
self.present(infoScreenAlert, animated: true, completion: nil)
})
self.present(alert, animated: true, completion: nil)
}
// whenever app comes from-back to freground, updateLabels needs to be called
@ -240,7 +252,11 @@ final class RootViewController: UIViewController {
// setup nightscout synchronizer
nightScoutUploadManager = NightScoutUploadManager(bgReadingsAccessor: bgReadingsAccessor, messageHandler: { (title:String, message:String) in
UIAlertController(title: title, message: message, actionHandler: nil).presentInOwnWindow(animated: true, completion: {})
let alert = UIAlertController(title: title, message: message, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
})
// setup SoundPlayer
@ -263,7 +279,11 @@ final class RootViewController: UIViewController {
// setup dexcomShareUploadManager
dexcomShareUploadManager = DexcomShareUploadManager(bgReadingsAccessor: bgReadingsAccessor, messageHandler: { (title:String, message:String) in
UIAlertController(title: title, message: message, actionHandler: nil).presentInOwnWindow(animated: true, completion: {})
let alert = UIAlertController(title: title, message: message, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
})
// setup m5StackManager
@ -446,7 +466,11 @@ final class RootViewController: UIViewController {
// inform user that pairing request timed out
@objc private func informUserThatPairingTimedOut() {
UIAlertController(title: Texts_Common.warning, message: "time out", actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: "time out", actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
/// will call cgmTransmitter.initiatePairing() - also sets timer, if no successful pairing within a few seconds, then info will be given to user asking to wait another few minutes
@ -510,13 +534,21 @@ final class RootViewController: UIViewController {
// check if sensor active and if not don't continue
guard let activeSensor = activeSensor else {
UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.startSensorBeforeCalibration, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.startSensorBeforeCalibration, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
return
}
// if it's a user requested calibration, but there's no calibration yet, then give info and return - first calibration will be requested by app via notification
if calibrationsAccessor.firstCalibrationForActiveSensor(withActivesensor: activeSensor) == nil && userRequested {
UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.thereMustBeAreadingBeforeCalibration, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.thereMustBeAreadingBeforeCalibration, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
return
}
@ -925,7 +957,9 @@ final class RootViewController: UIViewController {
}
// display textoToshow
UIAlertController(title: Texts_HomeView.statusActionTitle, message: textToShow, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.statusActionTitle, message: textToShow, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
@ -947,13 +981,22 @@ final class RootViewController: UIViewController {
break
case .alreadyScanning:
// probably user started scanning two times, let's show a pop up that scanning is ongoing
UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.scanBluetoothDeviceOngoing, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.scanBluetoothDeviceOngoing, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
case .bluetoothNotPoweredOn( _):
// bluetooth is not on, user should switch it on
UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.bluetoothIsNotOn, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.bluetoothIsNotOn, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
case .other(let reason):
// other unknown error occured
UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: "Error while starting scanning. Reason : " + reason, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: "Error while starting scanning. Reason : " + reason, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
}
}
@ -1023,7 +1066,7 @@ final class RootViewController: UIViewController {
// if this is the first time user starts a sensor, give warning that time should be correct
// if not the first them, then immediately open the timePickAlertController
if (!UserDefaults.standard.startSensorTimeInfoGiven) {
UIAlertController(title: Texts_HomeView.startSensorActionTitle, message: Texts_HomeView.startSensorTimeInfo, actionHandler: {
let alert = UIAlertController(title: Texts_HomeView.startSensorActionTitle, message: Texts_HomeView.startSensorTimeInfo, actionHandler: {
// create and present pickerviewcontroller
DatePickerViewController.displayDatePickerViewController(datePickerViewData: datePickerViewData, parentController: self)
@ -1031,7 +1074,10 @@ final class RootViewController: UIViewController {
// no need to display sensor start time info next sensor start
UserDefaults.standard.startSensorTimeInfoGiven = true
}).presentInOwnWindow(animated: true, completion: nil)
})
self.present(alert, animated: true, completion: nil)
} else {
DatePickerViewController.displayDatePickerViewController(datePickerViewData: datePickerViewData, parentController: self)
}
@ -1046,7 +1092,11 @@ final class RootViewController: UIViewController {
extension RootViewController:CGMTransmitterDelegate {
func error(message: String) {
UIAlertController(title: Texts_Common.warning, message: message, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: message, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
func reset(successful: Bool) {
@ -1093,7 +1143,10 @@ extension RootViewController:CGMTransmitterDelegate {
}
// inform user
UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.transmitterPairingSuccessful, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.info, message: Texts_HomeView.transmitterPairingSuccessful, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
func cgmTransmitterDidConnect(address:String?, name:String?) {
@ -1107,7 +1160,10 @@ extension RootViewController:CGMTransmitterDelegate {
if userDidInitiateScanning {
userDidInitiateScanning = false
// additional info for the user
UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.bluetoothDeviceConnectedInfo, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_HomeView.scanBluetoothDeviceActionTitle, message: Texts_HomeView.bluetoothDeviceConnectedInfo, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
}
}
@ -1209,7 +1265,10 @@ extension RootViewController:CGMTransmitterDelegate {
// if it was too long since notification was fired, then forget about it
if Date() > maxTimeUserCanOpenApp {
trace("in cgmTransmitterNeedsPairing, user opened the app too late", log: self.log, type: .error)
UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.transmitterPairingTooLate, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.transmitterPairingTooLate, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
return
}
@ -1369,7 +1428,9 @@ extension RootViewController:UNUserNotificationCenterDelegate {
} else if response.notification.request.identifier == ConstantsNotifications.NotificationIdentifierForSensorNotDetected.sensorNotDetected {
// if user clicks notification "sensor not detected", then show uialert with title and body
UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.sensorNotDetected, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_HomeView.sensorNotDetected, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
} else if response.notification.request.identifier == ConstantsNotifications.NotificationIdentifierForTransmitterNeedsPairing.transmitterNeedsPairing {

12
xdrip/View Controllers/SettingsNavigationController/SettingsViewController/AlertTypesSettingsViewController/AlertTypeSettingsViewController/AlertTypeSettingsViewController.swift
View File

@ -36,12 +36,14 @@ final class AlertTypeSettingsViewController: UIViewController {
// delete the alerttype if one exists
if let alertTypeAsNSObject = alertTypeAsNSObject {
// first ask user if ok to delete and if yes delete
UIAlertController(title: Texts_AlertTypeSettingsView.confirmDeletionAlertType + alertTypeAsNSObject.name + "?", message: nil, actionHandler: {
let alert = UIAlertController(title: Texts_AlertTypeSettingsView.confirmDeletionAlertType + alertTypeAsNSObject.name + "?", message: nil, actionHandler: {
self.coreDataManager?.mainManagedObjectContext.delete(alertTypeAsNSObject)
self.coreDataManager?.saveChanges()
// go back to alerttypes settings screen
self.performSegue(withIdentifier: UnwindSegueIdentifiers.unwindToAlertTypesSettingsViewController.rawValue, sender: self)
}, cancelHandler: nil).presentInOwnWindow(animated: true, completion: {})
}, cancelHandler: nil)
self.present(alert, animated: true, completion: nil)
} else {
// go back to alerttypes settings screen
@ -146,8 +148,12 @@ final class AlertTypeSettingsViewController: UIViewController {
for alertTypeAlreadyStored in alertTypesAccessor.getAllAlertTypes() {
// if name == alertTypeAlreadyStored.name and alertTypeAlreadyStored is not the same object as alertTypeAsNSObject then not ok
if alertTypeAlreadyStored.name == name && (alertTypeAsNSObject == nil || alertTypeAlreadyStored != alertTypeAsNSObject) {
// define and present alertcontroller, this will show message and an ok button, without action when clicking ok
UIAlertController(title: Texts_Common.warning, message: Texts_AlertTypeSettingsView.alertTypeNameAlreadyExistsMessage, actionHandler: nil).presentInOwnWindow(animated: true, completion: {})
let alert = UIAlertController(title: Texts_Common.warning, message: Texts_AlertTypeSettingsView.alertTypeNameAlreadyExistsMessage, actionHandler: nil)
self.present(alert, animated: true, completion: nil)
return
}
}

6
xdrip/View Controllers/SettingsNavigationController/SettingsViewController/AlertsSettingsViewController/AlertSettingsViewController/AlertSettingsViewController.swift
View File

@ -37,14 +37,16 @@ final class AlertSettingsViewController: UIViewController {
if let alertEntry = alertEntryAsNSObject {
// first ask user if ok to delete and if yes delete
UIAlertController(title: Texts_Alerts.confirmDeletionAlert, message: nil, actionHandler: {
let alert = UIAlertController(title: Texts_Alerts.confirmDeletionAlert, message: nil, actionHandler: {
self.alertSettingsViewControllerData.coreDataManager.mainManagedObjectContext.delete(alertEntry)
self.alertSettingsViewControllerData.coreDataManager.saveChanges()
// go back to alerts settings screen
self.performSegue(withIdentifier: SegueIdentifiers.unwindToAlertsSettingsViewController.rawValue, sender: self)
// go back to alerts settings screen
self.performSegue(withIdentifier: SegueIdentifiers.unwindToAlertsSettingsViewController.rawValue, sender: self)
}, cancelHandler: nil).presentInOwnWindow(animated: true, completion: {})
}, cancelHandler: nil)
self.present(alert, animated: true, completion: nil)
} else {
// go back to alerts settings screen

3
xdrip/View Controllers/SettingsNavigationController/SettingsViewController/SettingsViewUtilities.swift
View File

@ -124,8 +124,9 @@ class SettingsViewUtilities {
case let .showInfoText(title, message):
UIAlertController(title: title, message: message, actionHandler: nil).presentInOwnWindow(animated: true, completion: nil)
let alert = UIAlertController(title: title, message: message, actionHandler: nil)
uIViewController.present(alert, animated: true, completion: nil)
}