diff options
| -rwxr-xr-x | build_android.sh | 14 | ||||
| -rw-r--r-- | config.xml | 160 | ||||
| -rw-r--r-- | package.json | 7 | ||||
| -rw-r--r-- | plugins/fetch.json | 12 |
4 files changed, 97 insertions, 96 deletions
diff --git a/build_android.sh b/build_android.sh index 2d4407d2..06f1f1e9 100755 --- a/build_android.sh +++ b/build_android.sh @@ -28,7 +28,15 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "--------------------------------------------" echo "Adding crosswalk..." ionic plugin add cordova-plugin-crosswalk-webview + + + echo "Adding crosswalk cert plugin..." + cordova plugin remove cordova-plugin-certificates + cordova plugin add https://github.com/danjarvis/cordova-plugin-crosswalk-certificate + ionic platform remove android + ionic platform add android cp "$NINJAKEYSTORE" platforms/android + ionic build android --release cp platforms/android/build/outputs/apk/android-x86-release-unsigned.apk release_files/ @@ -57,7 +65,13 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then rm -fr platforms/android/build/outputs/* echo "Adding default browser..." ionic plugin remove cordova-plugin-crosswalk-webview + + cordova plugin remove cordova-plugin-crosswalk-certificate + cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin + ionic platform remove android + ionic platform add android cp "$NINJAKEYSTORE" platforms/android + ionic build android --release -- --minSdkVersion=21 cp platforms/android/build/outputs/apk/android-release-unsigned.apk release_files/ @@ -1,86 +1,82 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<widget id="com.pliablepixels.zmninjapro" android-packageName="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.1.93" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> - <name>zmNinja</name> - <description> +<?xml version='1.0' encoding='utf-8'?> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.1.93" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> + <name>zmNinja</name> + <description> High performance ZoneMinder client </description> - <author email="pliablepixels@gmail.com" href="http://pliablepixels.us/"> + <author email="pliablepixels@gmail.com" href="http://pliablepixels.us/"> Pliable Pixels </author> - <content src="index.html"/> - <access origin="*" subdomains="true"/> - <access origin="mailto:*" launch-external="yes"/> - <allow-navigation href="*"/> - <allow-intent href="*"/> - <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect"/> - <preference name="xwalkMode" value="embedded"/> - <preference name="xwalkMultipleApk" value="true"/> - <preference name="CrosswalkAnimatable" value="true"/> - <preference name="webviewbounce" value="false"/> - <preference name="UIWebViewBounce" value="false"/> - <preference name="DisallowOverscroll" value="true"/> - <preference name="BackupWebStorage" value="none"/> - <preference name="AutoHideSplashScreen" value="false"/> - <preference name="ShowSplashScreenSpinner" value="false"/> - <preference name="SplashScreen" value="screen"/> - <preference name="deployment-target" value="7.0"/> - <preference name="SplashScreenDelay" value="300"/> - <preference name="SplashMaintainAspectRatio" value="true"/> - <preference name="FadeSplashScreen" value="false"/> - <preference name="BackgroundColor" value="0xff555555"/> - <preference name="xwalkVersion" value="xwalk_core_library_beta:18+"/> - <feature name="StatusBar"> - <param name="ios-package" onload="true" value="CDVStatusBar"/> - </feature> - <platform name="ios"> - <icon src="resources/ios/icon/icon.png" width="57" height="57"/> - <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/> - <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/> - <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/> - <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/> - <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/> - <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/> - <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/> - <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/> - <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/> - <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/> - <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/> - <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/> - <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/> - <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/> - <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/> - <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/> - <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/> - <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/> - <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/> - <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/> - <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/> - <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/> - <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/> - <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/> - <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/> - <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/> - <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/> - </platform> - <platform name="android"> - <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/> - <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/> - <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/> - <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/> - <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/> - <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/> - <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/> - <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/> - <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/> - <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/> - <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/> - <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/> - <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/> - <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/> - <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/> - <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/> - <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/> - <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/> - </platform> - <icon src="resources/android/icon/drawable-xhdpi-icon.png"/> -</widget>
\ No newline at end of file + <content src="index.html" /> + <access origin="*" subdomains="true" /> + <access launch-external="yes" origin="mailto:*" /> + <allow-navigation href="*" /> + <allow-intent href="*" /> + <preference name="CrosswalkAnimatable" value="true" /> + <preference name="webviewbounce" value="false" /> + <preference name="UIWebViewBounce" value="false" /> + <preference name="DisallowOverscroll" value="true" /> + <preference name="BackupWebStorage" value="none" /> + <preference name="AutoHideSplashScreen" value="false" /> + <preference name="ShowSplashScreenSpinner" value="false" /> + <preference name="SplashScreen" value="screen" /> + <preference name="deployment-target" value="7.0" /> + <preference name="SplashScreenDelay" value="300" /> + <preference name="SplashMaintainAspectRatio" value="true" /> + <preference name="FadeSplashScreen" value="false" /> + <preference name="BackgroundColor" value="0xff555555" /> + <feature name="StatusBar"> + <param name="ios-package" onload="true" value="CDVStatusBar" /> + </feature> + <platform name="ios"> + <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="120" src="resources/ios/icon/icon-40@3x.png" width="120" /> + <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="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" /> + <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" /> + <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="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" /> + </platform> + <platform name="android"> + <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" /> + <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" /> + <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" /> + <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" /> + <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" /> + <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" /> + <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" /> + <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" /> + <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" /> + <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" /> + <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" /> + <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" /> + <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" /> + <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" /> + <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" /> + <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" /> + <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" /> + <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" /> + </platform> + <icon src="resources/android/icon/drawable-xhdpi-icon.png" /> +</widget> diff --git a/package.json b/package.json index c15b3a69..fe90cbe5 100644 --- a/package.json +++ b/package.json @@ -66,10 +66,9 @@ "id": "org.apache.cordova.media" }, { - "locator": "https://github.com/danjarvis/cordova-plugin-crosswalk-certificate", - "id": "cordova-plugin-crosswalk-certificate" - }, - "cordova-plugin-crosswalk-webview" + "locator": "https://github.com/hypery2k/cordova-certificate-plugin", + "id": "cordova-plugin-certificates" + } ], "cordovaPlatforms": [ {}, diff --git a/plugins/fetch.json b/plugins/fetch.json index 6e851524..baf9ae3c 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -160,21 +160,13 @@ "is_top_level": true, "variables": {} }, - "cordova-plugin-crosswalk-certificate": { + "cordova-plugin-certificates": { "source": { "type": "git", - "url": "https://github.com/danjarvis/cordova-plugin-crosswalk-certificate", + "url": "https://github.com/hypery2k/cordova-certificate-plugin", "subdir": "." }, "is_top_level": true, "variables": {} - }, - "cordova-plugin-crosswalk-webview": { - "source": { - "type": "registry", - "id": "cordova-plugin-crosswalk-webview" - }, - "is_top_level": true, - "variables": {} } }
\ No newline at end of file |