diff --git a/enzevalos_iphone/IntroButtonViewController.swift b/enzevalos_iphone/IntroButtonViewController.swift index 63bdd37ff8d0d5a65ce8420be1caa031662a4f02..f3272896be77ef7193389b5e158451ce981ef7fc 100644 --- a/enzevalos_iphone/IntroButtonViewController.swift +++ b/enzevalos_iphone/IntroButtonViewController.swift @@ -30,7 +30,7 @@ class IntroButtonViewController: UIViewController, IntroInfoButton { static let storyboardID = "buttonViewController" - static func storyboardInstance(description: String, buttonAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, buttonText: String? = nil, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String? = nil, titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroButtonViewController? { + static func storyboardInstance(description: String, buttonAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, buttonText: String? = nil, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String? = nil, titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroButtonViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroButtonViewController { @@ -43,7 +43,7 @@ class IntroButtonViewController: UIViewController, IntroInfoButton { } controller.doneAction = doneAction controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroContactTableViewController.swift b/enzevalos_iphone/IntroContactTableViewController.swift index bc406bf21b277258a70bf50c794a07ba31d1f8a9..e7a793e1aea96b80c5eb8a2cd927c464d42a5600 100644 --- a/enzevalos_iphone/IntroContactTableViewController.swift +++ b/enzevalos_iphone/IntroContactTableViewController.swift @@ -24,14 +24,14 @@ class IntroContactTableViewController: UITableViewController, IntroInfoButton { @IBOutlet var doubleTapRecognizer: UITapGestureRecognizer! static let storyboardID = "contactTableViewController" - static func storyboardInstance(contacts: [String: [(EnzevalosContact, PersistentKey, [Mail_Address])]], nextAction: (() -> ())? = nil, titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroContactTableViewController? { + static func storyboardInstance(contacts: [String: [(EnzevalosContact, PersistentKey, [Mail_Address])]], nextAction: (() -> ())? = nil, titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroContactTableViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroContactTableViewController { controller.contacts = contacts controller.nextAction = nextAction controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroDescriptionViewController.swift b/enzevalos_iphone/IntroDescriptionViewController.swift index 98f78d4b6ba53d99da9435730967b8eebc975d26..c99d42fea7d02069cbe09efa243678f519f3779b 100644 --- a/enzevalos_iphone/IntroDescriptionViewController.swift +++ b/enzevalos_iphone/IntroDescriptionViewController.swift @@ -36,7 +36,7 @@ class IntroDescriptionViewController: UIViewController, IntroInfoButton { var spinningAction: (() -> ())? static let storyboardID = "descriptionViewController" - static func storyboardInstance(description: String, descriptionImage: UIImage? = nil, skipButtonAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, showSpinner: Bool = false, spinnerText: String = "", spinningAction: (() -> ())? = nil, titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroDescriptionViewController? { + static func storyboardInstance(description: String, descriptionImage: UIImage? = nil, skipButtonAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, showSpinner: Bool = false, spinnerText: String = "", spinningAction: (() -> ())? = nil, titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroDescriptionViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroDescriptionViewController { @@ -47,7 +47,7 @@ class IntroDescriptionViewController: UIViewController, IntroInfoButton { controller.spinnerText = spinnerText controller.spinningAction = spinningAction controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroInputViewController.swift b/enzevalos_iphone/IntroInputViewController.swift index 695d623058743f6aa33f428da694dd18d0eb3987..3ab9976f3e173388fd5be859e722a076c60659cb 100644 --- a/enzevalos_iphone/IntroInputViewController.swift +++ b/enzevalos_iphone/IntroInputViewController.swift @@ -30,7 +30,7 @@ class IntroInputViewController: UIViewController, IntroInfoButton { static let storyboardID = "inputViewController" - static func storyboardInstance(description: String, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String? = nil, useReturnAsDone: Bool = true, useTextView: Bool = false, titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroInputViewController? { + static func storyboardInstance(description: String, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String? = nil, useReturnAsDone: Bool = true, useTextView: Bool = false, titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroInputViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroInputViewController { @@ -42,7 +42,7 @@ class IntroInputViewController: UIViewController, IntroInfoButton { controller.useReturnAsDone = useReturnAsDone controller.useTextView = useTextView controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroPageViewController.swift b/enzevalos_iphone/IntroPageViewController.swift index 490ec5e68eccdeb8ad328df4d81c341b425f29bd..9db373bd4e541100854a5d336303db2ae106f801 100644 --- a/enzevalos_iphone/IntroPageViewController.swift +++ b/enzevalos_iphone/IntroPageViewController.swift @@ -12,13 +12,13 @@ class IntroPageViewController: UIPageViewController, IntroInfoButton { static let storyboardID = "pageViewController" - static func storyboardInstance(orderedViewControllers: [UIViewController], titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroPageViewController? { + static func storyboardInstance(orderedViewControllers: [UIViewController], titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroPageViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroPageViewController { controller.orderedViewControllers = orderedViewControllers controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroSecretViewController.swift b/enzevalos_iphone/IntroSecretViewController.swift index fbcc0a373d52764b65bfba6b459b5d6e31bf9f44..81a1f489279f4789c78f0792cb1752e5bf4fdb32 100644 --- a/enzevalos_iphone/IntroSecretViewController.swift +++ b/enzevalos_iphone/IntroSecretViewController.swift @@ -30,7 +30,7 @@ class IntroSecretViewController: UIViewController, IntroInfoButton { static let storyboardID = "secretViewController" - static func storyboardInstance(description: String, secret: String, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String = NSLocalizedString("Done", comment: "finish action"), titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon, alternateText: String? = nil) -> IntroSecretViewController? { + static func storyboardInstance(description: String, secret: String, doneAction: ((_ sender: Any) -> ())? = nil, doneText: String = NSLocalizedString("Done", comment: "finish action"), titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon, alternateText: String? = nil) -> IntroSecretViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroSecretViewController { @@ -39,7 +39,7 @@ class IntroSecretViewController: UIViewController, IntroInfoButton { controller.doneAction = doneAction controller.doneText = doneText controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else { diff --git a/enzevalos_iphone/IntroYesNoViewController.swift b/enzevalos_iphone/IntroYesNoViewController.swift index d225f1397f4aa0541158892b919c29b03453a368..66e6378707101bbefbde8fb968d7f913a0823168 100644 --- a/enzevalos_iphone/IntroYesNoViewController.swift +++ b/enzevalos_iphone/IntroYesNoViewController.swift @@ -25,7 +25,7 @@ class IntroYesNoViewController: UIViewController, IntroInfoButton { var tapableTitle: Bool = true static let storyboardID = "yesNoViewController" - static func storyboardInstance(description: String, yesAction: ((_ sender: Any) -> ())? = nil, noAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, buttonText: String? = nil, titleText: String = "", titleDecription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroYesNoViewController? { + static func storyboardInstance(description: String, yesAction: ((_ sender: Any) -> ())? = nil, noAction: ((_ sender: Any) -> ())? = nil, useTextView: Bool = false, buttonText: String? = nil, titleText: String = "", titleDescription: String = "", titleAction: ((_ sender: Any) -> ())? = nil, url: String? = TravelHandler.website, titleImage: UIImage? = TravelHandler.planeIcon) -> IntroYesNoViewController? { let storyboard = UIStoryboard(name: "Intro", bundle: nil) if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroYesNoViewController { @@ -34,7 +34,7 @@ class IntroYesNoViewController: UIViewController, IntroInfoButton { controller.noAction = noAction controller.useTextView = useTextView controller.titleText = titleText - controller.titleDescription = titleDecription + controller.titleDescription = titleDescription if titleAction == nil { controller.titleAction = controller.defaultTitleAction } else {