Skip to content

Commit

Permalink
#801 asset cleanup, typo fixes in doc
Browse files Browse the repository at this point in the history
  • Loading branch information
pliablepixels committed Mar 31, 2019
1 parent 22033b6 commit 684bcc6
Show file tree
Hide file tree
Showing 53 changed files with 16 additions and 9 deletions.
6 changes: 4 additions & 2 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
4 changes: 3 additions & 1 deletion docs/guides/source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``

Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {},
Expand Down Expand Up @@ -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": {}
}
},
Expand Down Expand Up @@ -180,4 +183,4 @@
]
}
}
}
}
Binary file modified resources/android/icon/drawable-hdpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-ldpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-mdpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xhdpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xxhdpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xxxhdpi-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-hdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-ldpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-mdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xxhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xxxhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-hdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-ldpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-mdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xxhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xxxhdpi-screen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-1024.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-40@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-50.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-50@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-60.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/icon/icon-60@2x.png
Binary file modified resources/ios/icon/icon-60@3x.png
Binary file modified resources/ios/icon/icon-72.png
Binary file modified resources/ios/icon/icon-72@2x.png
Binary file modified resources/ios/icon/icon-76.png
Binary file modified resources/ios/icon/icon-76@2x.png
Binary file modified resources/ios/icon/icon-83.5@2x.png
Binary file modified resources/ios/icon/icon-small.png
Binary file modified resources/ios/icon/icon-small@2x.png
Binary file modified resources/ios/icon/icon-small@3x.png
Binary file modified resources/ios/icon/icon.png
Binary file modified resources/ios/icon/icon@2x.png
Binary file modified resources/ios/splash/Default-568h@2x~iphone.png
Binary file modified resources/ios/splash/Default-667h.png
Binary file modified resources/ios/splash/Default-736h.png
Binary file modified resources/ios/splash/Default-Landscape-736h.png
Binary file modified resources/ios/splash/Default-Landscape@2x~ipad.png
Binary file modified resources/ios/splash/Default-Landscape@~ipadpro.png
Binary file modified resources/ios/splash/Default-Landscape~ipad.png
Binary file modified resources/ios/splash/Default-Portrait@2x~ipad.png
Binary file modified resources/ios/splash/Default-Portrait@~ipadpro.png
Binary file modified resources/ios/splash/Default-Portrait~ipad.png
Binary file modified resources/ios/splash/Default@2x~iphone.png
Binary file modified resources/ios/splash/Default@2x~universal~anyany.png
Binary file modified resources/ios/splash/Default~iphone.png

0 comments on commit 684bcc6

Please sign in to comment.