Merge branch 'feature/ios-support' into 'master'

iOS support changes and mobile fixes

See merge request clients/cesium-grp/cesium!567

bower.json

@@ -2,14 +2,14 @@
   "name": "cesium",
   "private": "true",
   "devDependencies": {
-    "ionic": "driftyco/ionic-bower#1.3.1",
+    "ionic": "driftyco/ionic-bower#1.3.5",
     "ionic-material": "0.4.2"
   },
   "dependencies": {
     "angular-messages": "1.3.13",
     "robotodraft": "1.1.0",
     "angular-moment": "^0.10.3",
-    "angular-animate": "1.4.3",
+    "angular-animate": "1.5.3",
     "angular-sanitize": "1.5.3",
     "angular": "1.5.3",
     "angular-bind-notifier": "^1.1.7",
@@ -27,9 +27,9 @@
     "ion-digit-keyboard": "skol-pro/ion-digit-keyboard"
   },
   "resolutions": {
-    "angular-sanitize": "1.5.3",
-    "angular-animate": "1.5.3",
     "angular": "1.5.3",
-    "ionic": "1.3.1"
+    "ionic": "1.3.5",
+    "angular-animate": "1.5.3",
+    "angular-sanitize": "1.5.3"
   }
 }

config.xml

@@ -60,34 +60,48 @@
     </platform>
     <platform name="ios">
         <preference name="BackupWebStorage" value="local" />
-        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
-        <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
-        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
-        <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
-        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
-        <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
-        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-        <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
-        <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
-        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
-        <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
-        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
-        <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
-        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-        <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-        <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
+        <icon height="20" src="resources/ios/icon/Icon-App-20x20@1x.png" width="20" />
+        <icon height="40" src="resources/ios/icon/Icon-App-20x20@2x.png" width="40" />
+        <icon height="60" src="resources/ios/icon/Icon-App-20x20@3x.png" width="60" />
+        <icon height="29" src="resources/ios/icon/Icon-App-29x29@1x.png" width="29" />
+        <icon height="58" src="resources/ios/icon/Icon-App-29x29@2x.png" width="58" />
+        <icon height="87" src="resources/ios/icon/Icon-App-29x29@3x.png" width="87" />
+        <icon height="40" src="resources/ios/icon/Icon-App-40x40@1x.png" width="40" />
+        <icon height="80" src="resources/ios/icon/Icon-App-40x40@2x.png" width="80" />
+        <icon height="120" src="resources/ios/icon/Icon-App-40x40@3x.png" width="120" />
+        <icon height="50" src="resources/ios/icon/Icon-App-50x50@1x.png" width="50" />
+        <icon height="100" src="resources/ios/icon/Icon-App-50x50@2x.png" width="100" />
+        <icon height="57" src="resources/ios/icon/Icon-App-57x57@1x.png" width="57" />
+        <icon height="114" src="resources/ios/icon/Icon-App-57x57@2x.png" width="114" />
+        <icon height="120" src="resources/ios/icon/Icon-App-60x60@2x.png" width="120" />
+        <icon height="180" src="resources/ios/icon/Icon-App-60x60@3x.png" width="180" />
+        <icon height="72" src="resources/ios/icon/Icon-App-72x72@1x.png" width="72" />
+        <icon height="144" src="resources/ios/icon/Icon-App-72x72@2x.png" width="144" />
+        <icon height="76" src="resources/ios/icon/Icon-App-76x76@1x.png" width="76" />
+        <icon height="152" src="resources/ios/icon/Icon-App-76x76@2x.png" width="152" />
+        <icon height="167" src="resources/ios/icon/Icon-App-83.5x83.5@2x.png" width="167" />
+        <icon height="1024" src="resources/ios/icon/ItunesArtwork@2x.png" width="1024" />
         <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
         <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
         <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
         <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
+        <splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
         <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
         <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
         <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
         <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
         <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+        <edit-config file="*-Info.plist" mode="merge" target="NSCameraUsageDescription">
+            <string>To scan QRCode</string>
+        </edit-config>
+        <edit-config file="*-Info.plist" mode="merge" target="NSPhotoLibraryUsageDescription">
+            <string>To choose a profile picture</string>
+        </edit-config>
     </platform>
     <engine name="android" spec="^6.2.3" />
+    <engine name="ios" spec="^4.5.5" />
     <plugin name="cordova-plugin-camera" spec="^2.4.1" />
     <plugin name="cordova-plugin-console" spec="^1.0.7" />
     <plugin name="cordova-plugin-device" spec="^1.1.6" />
@@ -96,13 +110,13 @@
     <plugin name="cordova-plugin-minisodium" spec="^1.0.0" />
     <plugin name="cordova-plugin-secure-storage" spec="^2.6.8" />
     <plugin name="cordova-plugin-splashscreen" spec="^3.2.2" />
-    <plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <plugin name="cordova-plugin-vibration" spec="^2.1.5" />
     <plugin name="cordova-plugin-websocket" spec="^0.12.2" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
     <plugin name="cordova-plugin-x-toast" spec="^2.6.0" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
     <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
-        <variable name="CAMERA_USAGE_DESCRIPTION" value=" QRCode scan" />
+        <variable name="CAMERA_USAGE_DESCRIPTION" value=" " />
     </plugin>
 </widget>

package.json

@@ -32,6 +32,7 @@
   "dependencies": {
     "cordova": "^6.5.0",
     "cordova-android": "^6.2.3",
+    "cordova-ios": "^4.5.5",
     "cordova-plugin-camera": "^2.4.1",
     "cordova-plugin-compat": "^1.1.0",
     "cordova-plugin-console": "^1.0.7",
@@ -42,7 +43,7 @@
     "cordova-plugin-minisodium": "^1.0.0",
     "cordova-plugin-secure-storage": "^2.6.8",
     "cordova-plugin-splashscreen": "^3.2.2",
-    "cordova-plugin-statusbar": "^2.2.3",
+    "cordova-plugin-statusbar": "^2.4.2",
     "cordova-plugin-vibration": "^2.1.5",
     "cordova-plugin-websocket": "^0.12.2",
     "cordova-plugin-whitelist": "^1.3.2",
@@ -146,7 +147,8 @@
       }
     },
     "platforms": [
-      "android"
+      "android",
+      "ios"
     ]
   }
-}
+}
\ No newline at end of file

desktop @ df50262d

-Subproject commit df50262d000506dd813763b5533eb997fdc1acd6