diff --git a/VoidLink/AlertControllerUtil.swift b/VoidLink/AlertControllerUtil.swift index a613bc40..2b7ce51c 100644 --- a/VoidLink/AlertControllerUtil.swift +++ b/VoidLink/AlertControllerUtil.swift @@ -29,6 +29,7 @@ import UIKit @objc public static var alertController:UIAlertController = UIAlertController() @objc public static var cancelButtonString:String = "Cancel" @objc public static var autoCompletion:Bool = false + @objc public static var isCountingDown:Bool = false @objc class func showAlert( in viewController: UIViewController? = nil, @@ -76,6 +77,7 @@ import UIKit } viewController.present(alertController, animated: true, completion: action) + isCountingDown = !autoCompletion && countdown > 0 if(countdown == 0) {return} @@ -91,6 +93,7 @@ import UIKit remainingSeconds -= 1 if remainingSeconds <= 0 { + isCountingDown = false isAlertDismissed = true timer.cancel() if autoCompletion { diff --git a/VoidLink/Base.lproj/iPad.storyboard b/VoidLink/Base.lproj/iPad.storyboard index df290c00..185d7df8 100644 --- a/VoidLink/Base.lproj/iPad.storyboard +++ b/VoidLink/Base.lproj/iPad.storyboard @@ -3057,7 +3057,7 @@ - + @@ -3958,22 +3958,22 @@ - + - + - + - + - + diff --git a/VoidLink/Base.lproj/iPhone.storyboard b/VoidLink/Base.lproj/iPhone.storyboard index 01aed6c7..b87a21c9 100644 --- a/VoidLink/Base.lproj/iPhone.storyboard +++ b/VoidLink/Base.lproj/iPhone.storyboard @@ -155,10 +155,10 @@ - +