#801 asset cleanup, typo fixes in doc

53 files changed, 16 insertions, 9 deletions

diff --git a/config.xml b/config.xml
index 571bcb65..f76248f3 100644
--- a/config.xml
+++ b/config.xml
@@ -102,8 +102,8 @@
             <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
         </config-file>
         <resource-file src="build-extras.gradle" target="build-extras.gradle" />
-        <resource-file src="www/external/android-notification-icons/ic_stat_notification.png" target="app/src/main/res/drawable/ic_stat_notification.png" />
-        <resource-file src="www/external/android-tv-banner/banner.png" target="res/drawable/banner.png" />
+        <resource-file src="etc/android-notification-icons/ic_stat_notification.png" target="app/src/main/res/drawable/ic_stat_notification.png" />
+        <resource-file src="etc/android-tv-banner/banner.png" target="res/drawable/banner.png" />
         <resource-file src="google-services.json" target="app/google-services.json" />
         <resource-file src="www/sounds/blop.mp3" target="res/raw/blop.mp3" />
         <preference name="android-manifest/@android:installLocation" value="auto" />
@@ -176,4 +176,6 @@
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
     </plugin>
     <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <engine name="android" spec="7.1.4" />
+    <engine name="ios" spec="4.5.5" />
 </widget>
diff --git a/docs/guides/source.rst b/docs/guides/source.rst
index deb0b95e..17950a4c 100644
--- a/docs/guides/source.rst
+++ b/docs/guides/source.rst
@@ -118,13 +118,15 @@ As of Mar 2019, cordova-ios does not support multiple targets, nor does
 it support automatic building of notification extensions. So there is manual work to be done:
 
 - Open up ``platforms/ios/zmNinja.xcworkspace`` in XCode
+- Go to ``File->Workspace Settings`` and select ``Legacy Build System``
+- Go to ``Target->zmNinja->Build Settings`` and set "Swift Language Version" to ``Swift 4``
 - Go to ``File->New->Target->Notification Service Extension``, select Objective C 
 - In the "Product Name" put in ``zmNinjaNotification`` (your BundleID should now read  ``com.pliablepixels.zmninja-pro.zmNinjaNotification``)
 - Say "Yes" to "Activate zmNinjaNotification scheme?" popup
 - Now go to zmNinjaNotification target and make version and  build same as zmNinja
 - Now in XCode Targets, select ``zmNinjaNotification``, and make sure you select a Team and make sure Deployment Target is 10 or above
 - Change Deployment target to 10.1 (same as zmNinja target)
-- ```cp www/external/NotificationService.m platforms/ios/zmNinjaNotication/``
+- ``cp etc/NotificationService.m platforms/ios/zmNinjaNotification/``
 - ``cd platforms/ios/``
 - ``pod install``
 
diff --git a/package.json b/package.json
index aeef0e56..0cb7c05b 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,15 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.3.056",
+  "version": "1.3.056",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
   "cordova": {
-    "platforms": [],
+    "platforms": [
+      "android",
+      "ios"
+    ],
     "plugins": {
       "cordova-plugin-add-swift-support": {},
       "cordova-plugin-android-permissions": {},
@@ -49,13 +52,13 @@
         "FCM_VERSION": "11.6.2"
       },
       "cordova-custom-config": {},
-      "cordova-plugin-ionic-webview": {
-        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
       "cordova-plugin-advanced-websocket": {},
       "cordova-plugin-photo-library": {
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "save event images from ZM"
       },
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-media-pp-fork": {}
     }
   },
@@ -180,4 +183,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png
index ef7bb789..9fd9692e 100644
--- a/resources/android/icon/drawable-hdpi-icon.png
+++ b/resources/android/icon/drawable-hdpi-icon.png
diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png
index 41fd6e9e..a2b3b90f 100644
--- a/resources/android/icon/drawable-ldpi-icon.png
+++ b/resources/android/icon/drawable-ldpi-icon.png
diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png
index 6e4bf8a8..1a724f6e 100644
--- a/resources/android/icon/drawable-mdpi-icon.png
+++ b/resources/android/icon/drawable-mdpi-icon.png
diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png
index 05176939..22155bf4 100644
--- a/resources/android/icon/drawable-xhdpi-icon.png
+++ b/resources/android/icon/drawable-xhdpi-icon.png
diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png
index 4ac2dd90..b5710c9b 100644
--- a/resources/android/icon/drawable-xxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxhdpi-icon.png
diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png
index ae19bc09..a0e3e582 100644
--- a/resources/android/icon/drawable-xxxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxxhdpi-icon.png
diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png
index b3b59cdd..cee9c53c 100644
--- a/resources/android/splash/drawable-land-hdpi-screen.png
+++ b/resources/android/splash/drawable-land-hdpi-screen.png
diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png
index 90bb4d42..594b7526 100644
--- a/resources/android/splash/drawable-land-ldpi-screen.png
+++ b/resources/android/splash/drawable-land-ldpi-screen.png
diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png
index 46dbfb77..58d71a35 100644
--- a/resources/android/splash/drawable-land-mdpi-screen.png
+++ b/resources/android/splash/drawable-land-mdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png
index 4ec43b6d..a7f1eedd 100644
--- a/resources/android/splash/drawable-land-xhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xhdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png
index 989ad30b..7f6183b7 100644
--- a/resources/android/splash/drawable-land-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxhdpi-screen.png
diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png
index 6282cea3..091a059e 100644
--- a/resources/android/splash/drawable-land-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-land-xxxhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png
index 89cd9973..893f0033 100644
--- a/resources/android/splash/drawable-port-hdpi-screen.png
+++ b/resources/android/splash/drawable-port-hdpi-screen.png
diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png
index 363f8bf5..4f19d48f 100644
--- a/resources/android/splash/drawable-port-ldpi-screen.png
+++ b/resources/android/splash/drawable-port-ldpi-screen.png
diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png
index e537ac63..c7ef1558 100644
--- a/resources/android/splash/drawable-port-mdpi-screen.png
+++ b/resources/android/splash/drawable-port-mdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png
index 8a9995e9..bd3e32ee 100644
--- a/resources/android/splash/drawable-port-xhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png
index f1cadf43..1f020189 100644
--- a/resources/android/splash/drawable-port-xxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxhdpi-screen.png
diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png
index 6c4b8824..afed96a3 100644
--- a/resources/android/splash/drawable-port-xxxhdpi-screen.png
+++ b/resources/android/splash/drawable-port-xxxhdpi-screen.png
diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
index 93753bba..fe217dd0 100644
--- a/resources/ios/icon/icon-1024.png
+++ b/resources/ios/icon/icon-1024.png
diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
index 013ff02f..465c20db 100644
--- a/resources/ios/icon/icon-40.png
+++ b/resources/ios/icon/icon-40.png
diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
index 09513eb8..82626bdc 100644
--- a/resources/ios/icon/icon-40@2x.png
+++ b/resources/ios/icon/icon-40@2x.png
diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
index a2d59257..37e01f31 100644
--- a/resources/ios/icon/icon-40@3x.png
+++ b/resources/ios/icon/icon-40@3x.png
diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
index 5ff30ea5..2ea385ec 100644
--- a/resources/ios/icon/icon-50.png
+++ b/resources/ios/icon/icon-50.png
diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
index 094ce76a..10c25468 100644
--- a/resources/ios/icon/icon-50@2x.png
+++ b/resources/ios/icon/icon-50@2x.png
diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
index 77037ee5..892523e0 100644
--- a/resources/ios/icon/icon-60.png
+++ b/resources/ios/icon/icon-60.png
diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
index f12e8d70..9d9b28ad 100644
--- a/resources/ios/icon/icon-60@2x.png
+++ b/resources/ios/icon/icon-60@2x.png
diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
index 71b86a9e..a73c946d 100644
--- a/resources/ios/icon/icon-60@3x.png
+++ b/resources/ios/icon/icon-60@3x.png
diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
index 41c73690..1d79628d 100644
--- a/resources/ios/icon/icon-72.png
+++ b/resources/ios/icon/icon-72.png
diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
index 840fd680..488df5d8 100644
--- a/resources/ios/icon/icon-72@2x.png
+++ b/resources/ios/icon/icon-72@2x.png
diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
index ec854b0f..6843b174 100644
--- a/resources/ios/icon/icon-76.png
+++ b/resources/ios/icon/icon-76.png
diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
index 01bdbcc6..9d59fa4d 100644
--- a/resources/ios/icon/icon-76@2x.png
+++ b/resources/ios/icon/icon-76@2x.png
diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
index 30302165..95a378bd 100644
--- a/resources/ios/icon/icon-83.5@2x.png
+++ b/resources/ios/icon/icon-83.5@2x.png
diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
index aadadc0e..53ee03ad 100644
--- a/resources/ios/icon/icon-small.png
+++ b/resources/ios/icon/icon-small.png
diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
index 7c6a48dc..46cc45fd 100644
--- a/resources/ios/icon/icon-small@2x.png
+++ b/resources/ios/icon/icon-small@2x.png
diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
index 5ff86579..2e95b690 100644
--- a/resources/ios/icon/icon-small@3x.png
+++ b/resources/ios/icon/icon-small@3x.png
diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 364d0c57..56dcbd72 100644
--- a/resources/ios/icon/icon.png
+++ b/resources/ios/icon/icon.png
diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
index ae9fab03..71ba66f6 100644
--- a/resources/ios/icon/icon@2x.png
+++ b/resources/ios/icon/icon@2x.png
diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
index 5db341ec..bb2ed119 100644
--- a/resources/ios/splash/Default-568h@2x~iphone.png
+++ b/resources/ios/splash/Default-568h@2x~iphone.png
diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
index 32639a01..3bb9199e 100644
--- a/resources/ios/splash/Default-667h.png
+++ b/resources/ios/splash/Default-667h.png
diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
index dae085c7..379197d5 100644
--- a/resources/ios/splash/Default-736h.png
+++ b/resources/ios/splash/Default-736h.png
diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
index 0e3794ff..0632c94d 100644
--- a/resources/ios/splash/Default-Landscape-736h.png
+++ b/resources/ios/splash/Default-Landscape-736h.png
diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
index 7a0f6214..bffc1b5a 100644
--- a/resources/ios/splash/Default-Landscape@2x~ipad.png
+++ b/resources/ios/splash/Default-Landscape@2x~ipad.png
diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
index 93999968..4fd1dfe8 100644
--- a/resources/ios/splash/Default-Landscape@~ipadpro.png
+++ b/resources/ios/splash/Default-Landscape@~ipadpro.png
diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
index ae041697..e423a804 100644
--- a/resources/ios/splash/Default-Landscape~ipad.png
+++ b/resources/ios/splash/Default-Landscape~ipad.png
diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
index b8b8760b..16b9f7b8 100644
--- a/resources/ios/splash/Default-Portrait@2x~ipad.png
+++ b/resources/ios/splash/Default-Portrait@2x~ipad.png
diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
index 17408930..80aaa724 100644
--- a/resources/ios/splash/Default-Portrait@~ipadpro.png
+++ b/resources/ios/splash/Default-Portrait@~ipadpro.png
diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
index fbefcae1..0e038183 100644
--- a/resources/ios/splash/Default-Portrait~ipad.png
+++ b/resources/ios/splash/Default-Portrait~ipad.png
diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
index dc459fbe..4c1c644b 100644
--- a/resources/ios/splash/Default@2x~iphone.png
+++ b/resources/ios/splash/Default@2x~iphone.png
diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png
index 236d52ff..64a45bbd 100644
--- a/resources/ios/splash/Default@2x~universal~anyany.png
+++ b/resources/ios/splash/Default@2x~universal~anyany.png
diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
index 627927bf..8a9138bb 100644
--- a/resources/ios/splash/Default~iphone.png
+++ b/resources/ios/splash/Default~iphone.png