Merge pull request #26 from someoneAnyone/dev

Updating to current Test Flight Release
someoneAnyone · Nov 10, 2015 · df117a7 · df117a7
2 parents 5a14c19 + 5c44b45
commit df117a7
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1 @@
-language: objective-c
-
-branches:
-only:
-- master
-
-osx_image: xcode7
+language: objective-c
diff --git a/Nightscouter/AppDelegate.swift b/Nightscouter/AppDelegate.swift
@@ -106,10 +106,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         completionHandler(.NewData)
     }
-    
-    func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
+
+    func application(app: UIApplication, openURL url: NSURL, options: [String : AnyObject]) -> Bool {
         print(">>> Entering \(__FUNCTION__) <<<")
-        print("Recieved URL: \(url) from sourceApplication: \(sourceApplication) annotation: \(annotation))")
+
+        print("Recieved URL: \(url) with options: \(options)")
 
         let schemes = AppDataManager.sharedInstance.supportedSchemes!
         if (!schemes.contains((url.scheme))) { // If the incoming scheme is not contained within the array of supported schemes return false.

diff --git a/Nightscouter/Base.lproj/Main.storyboard b/Nightscouter/Base.lproj/Main.storyboard
diff --git a/Nightscouter/Info.plist b/Nightscouter/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>135</string>
+	<string>138</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSUserActivityTypes</key>

diff --git a/Nightscouter/SiteDetailViewController.swift b/Nightscouter/SiteDetailViewController.swift
@@ -257,9 +257,8 @@ extension SiteDetailViewController {
 
     @IBAction func gotoSiteSettings(sender: UIBarButtonItem) {
 
-        let alertController = UIAlertController(title: Constants.LocalizedString.uiAlertScreenOverrideTitle.localized, message: Constants.LocalizedString.uiAlertScreenOverrideMessage.localized, preferredStyle: UIAlertControllerStyle.ActionSheet)
+        let alertController = UIAlertController(title: Constants.LocalizedString.uiAlertScreenOverrideTitle.localized, message: Constants.LocalizedString.uiAlertScreenOverrideMessage.localized, preferredStyle: .ActionSheet)
 
-        alertController.view.tintColor = NSAssetKit.darkNavColor
 
         let cancelAction = UIAlertAction(title: Constants.LocalizedString.generalCancelLabel.localized, style: .Cancel) { (action) in
             #if DEBUG
@@ -273,26 +272,44 @@ extension SiteDetailViewController {
         if site!.overrideScreenLock == true {
             yesString = checkEmoji
         }
-        let yesAction = UIAlertAction(title: "\(yesString)\(Constants.LocalizedString.generalYesLabel.localized)", style: UIAlertActionStyle.Default) { (action) -> Void in
+
+        let yesAction = UIAlertAction(title: "\(yesString)\(Constants.LocalizedString.generalYesLabel.localized)", style: .Default) { (action) -> Void in
             self.updateScreenOverride(true)
             #if DEBUG
                 print("Yes action: \(action)")
             #endif
         }
+
         alertController.addAction(yesAction)
+
+        if #available(iOS 9.0, *) {
+            alertController.preferredAction = yesAction
+        }
+
 
         var noString = "   "
         if (site!.overrideScreenLock == false) {
             noString = checkEmoji
         }
-        let noAction = UIAlertAction(title: "\(noString)\(Constants.LocalizedString.generalNoLabel.localized)", style: UIAlertActionStyle.Default) { (action) -> Void in
+
+        let noAction = UIAlertAction(title: "\(noString)\(Constants.LocalizedString.generalNoLabel.localized)", style: .Destructive) { (action) -> Void in
             self.updateScreenOverride(false)
             #if DEBUG
                 print("No action: \(action)")
             #endif
         }
         alertController.addAction(noAction)
+
+        alertController.view.tintColor = NSAssetKit.darkNavColor
 
+        self.view.window?.tintColor = nil
+
+        // Resolving Incident with Identifier: 1169918A-77AC-4D15-8610-E62C1D74E386
+        // Crash in UIPopoverPresentationController
+        if let popoverController = alertController.popoverPresentationController {
+            popoverController.barButtonItem = sender
+        }
+
         self.presentViewController(alertController, animated: true) {
             #if DEBUG
                 print("presentViewController: \(alertController.debugDescription)")

diff --git a/Nightscouter/SiteListTableViewController.swift b/Nightscouter/SiteListTableViewController.swift
@@ -381,7 +381,6 @@ class SiteListTableViewController: UITableViewController, NightscoutAPIClientDel
     func presentAlertDialog(siteURL:NSURL, index: Int, error: NSError) {
 
         let alertController = UIAlertController(title: Constants.LocalizedString.uiAlertBadSiteTitle.localized, message: String(format: Constants.LocalizedString.uiAlertBadSiteMessage.localized, siteURL, error.localizedDescription), preferredStyle: .Alert)
-        alertController.view.tintColor = NSAssetKit.darkNavColor
 
         let cancelAction = UIAlertAction(title: Constants.LocalizedString.generalCancelLabel.localized, style: .Cancel) { (action) in
             // ...
@@ -414,6 +413,10 @@ class SiteListTableViewController: UITableViewController, NightscoutAPIClientDel
         }
         alertController.addAction(removeAction)
 
+        alertController.view.tintColor = NSAssetKit.darkNavColor
+
+        self.view.window?.tintColor = nil
+
         self.navigationController?.popToRootViewControllerAnimated(true)
 
         self.presentViewController(alertController, animated: true) {

diff --git a/NightscouterKit/Models/ServerConfiguration.swift b/NightscouterKit/Models/ServerConfiguration.swift
@@ -311,7 +311,20 @@ public extension ServerConfiguration {
 
         if let settingsDictionary = root[ConfigurationPropertyKey.settingsKey] as? [String: AnyObject] {
             let units = Units(rawValue: (settingsDictionary[ConfigurationPropertyKey.unitsKey] as! String).lowercaseString)!
-            let timeFormat = Int((settingsDictionary[ConfigurationPropertyKey.timeFormatKey] as! String))!
+
+
+            var timeFormat: Int = 12
+
+            if let stringTimeFormat = settingsDictionary[ConfigurationPropertyKey.timeFormatKey] as? String {
+                timeFormat = Int(stringTimeFormat)!
+            }
+
+
+            if let intTimeFormat = settingsDictionary[ConfigurationPropertyKey.timeFormatKey] as? Int {
+                timeFormat = intTimeFormat
+            }
+
+
             let nightMode = settingsDictionary[ConfigurationPropertyKey.nightModeKey] as! Bool
             let showRawbg = RawBGMode(rawValue: settingsDictionary[ConfigurationPropertyKey.showRawbgKey] as! String)!
             let customTitle = settingsDictionary[ConfigurationPropertyKey.customTitleKey] as! String

diff --git a/NightscouterToday/Info.plist b/NightscouterToday/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>135</string>
+	<string>138</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>