Merge pull request #39 from someoneAnyone/dev

Dev

Author: someoneAnyone

External Assets/NightscouterWatchOSAssets.pcvd

@@ -72,6 +72,12 @@
       "filename" : "[email protected]",
       "scale" : "2x"
     },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "appIconiPadPro.png",
+      "scale" : "2x"
+    },
     {
       "size" : "16x16",
       "idiom" : "mac",

External Assets/NightscouteriOSAssets.pcvd

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
     </dependencies>
     <customFonts key="customFonts">
         <mutableArray key="HelveticaNeueLights.ttc">

Nightscouter.xcodeproj/project (mla483's conflicted copy 2015-06-28 (1)).pbxproj

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>152</string>
+	<string>UKNOWN</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -46,6 +46,24 @@
 		<string>com.nothingonline.$(PRODUCT_NAME:rfc1034identifier).site</string>
 		<string>com.nothingonline.$(PRODUCT_NAME:rfc1034identifier).new</string>
 	</array>
+	<key>UIApplicationShortcutItems</key>
+	<array>
+		<dict>
+			<key>UIApplicationShortcutItemIconType</key>
+			<string>UIApplicationShortcutIconTypeAdd</string>
+			<key>UIApplicationShortcutItemSubtitle</key>
+			<string></string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>Add New Site</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER).AddNew</string>
+			<key>UIApplicationShortcutItemUserInfo</key>
+			<dict>
+				<key>firstShorcutKey1</key>
+				<string>AddNew</string>
+			</dict>
+		</dict>
+	</array>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>

Nightscouter.xcodeproj/project (mla483's conflicted copy 2015-06-28).pbxproj

@@ -24,7 +24,7 @@ class ModelController: NSObject, UIPageViewControllerDataSource {
     var sites: [Site]
     var currentIndex: Int {
         didSet{
-            AppDataManager.sharedInstance.currentSiteIndex = currentIndex
+            AppDataManageriOS.sharedInstance.currentSiteIndex = currentIndex
         }
     }
 
@@ -63,7 +63,7 @@ class ModelController: NSObject, UIPageViewControllerDataSource {
             return nil
         }
 
-        index--
+        index -= 1
         return self.viewControllerAtIndex(index, storyboard: viewController.storyboard!)
     }
 
@@ -73,7 +73,7 @@ class ModelController: NSObject, UIPageViewControllerDataSource {
             return nil
         }
 
-        index++
+        index += 1
         if index == self.sites.count {
             return nil
         }

Nightscouter.xcodeproj/project.pbxproj

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array/>
+	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
+	<string>$(TeamIdentifierPrefix).com.nothingonline.nightscouter</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.com.nothingonline.nightscouter</string>

Nightscouter.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -6,5 +6,7 @@
 	<array/>
 	<key>StringsTable</key>
 	<string>Root</string>
+	<key>ApplicationGroupContainerIdentifier</key>
+	<string>group.com.nothingonline.nightscouter</string>
 </dict>
 </plist>