From 135c83f3ed62f4f88bf74add68ac7009059fc204 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 13 Dec 2018 09:39:06 -0500 Subject: migrate manual hook to resource, fix android notification icon #762 --- config.xml | 11 +++- hooks/before_prepare/01_pp_hacks.sh | 73 ++++++++------------- package.json | 12 ++-- resources/android/icon/drawable-hdpi-icon.png | Bin 3161 -> 3161 bytes resources/android/icon/drawable-ldpi-icon.png | Bin 1398 -> 1398 bytes resources/android/icon/drawable-mdpi-icon.png | Bin 2078 -> 2078 bytes resources/android/icon/drawable-xhdpi-icon.png | Bin 4154 -> 4154 bytes resources/android/icon/drawable-xxhdpi-icon.png | Bin 6195 -> 6195 bytes resources/android/icon/drawable-xxxhdpi-icon.png | Bin 8231 -> 8231 bytes .../android/splash/drawable-land-hdpi-screen.png | Bin 17726 -> 17726 bytes .../android/splash/drawable-land-ldpi-screen.png | Bin 6771 -> 6771 bytes .../android/splash/drawable-land-mdpi-screen.png | Bin 10105 -> 10105 bytes .../android/splash/drawable-land-xhdpi-screen.png | Bin 30192 -> 30192 bytes .../android/splash/drawable-land-xxhdpi-screen.png | Bin 40693 -> 40693 bytes .../splash/drawable-land-xxxhdpi-screen.png | Bin 53718 -> 53718 bytes .../android/splash/drawable-port-hdpi-screen.png | Bin 18160 -> 18160 bytes .../android/splash/drawable-port-ldpi-screen.png | Bin 6903 -> 6903 bytes .../android/splash/drawable-port-mdpi-screen.png | Bin 10366 -> 10366 bytes .../android/splash/drawable-port-xhdpi-screen.png | Bin 31026 -> 31026 bytes .../android/splash/drawable-port-xxhdpi-screen.png | Bin 41584 -> 41584 bytes .../splash/drawable-port-xxxhdpi-screen.png | Bin 54940 -> 54940 bytes .../drawable-hdpi-v11/ic_stat_notification.png | Bin 1139 -> 0 bytes .../drawable-mdpi-v11/ic_stat_notification.png | Bin 732 -> 0 bytes .../drawable-xhdpi-v11/ic_stat_notification.png | Bin 1644 -> 0 bytes .../drawable-xxhdpi-v11/ic_stat_notification.png | Bin 2702 -> 0 bytes .../drawable-xxxhdpi-v11/ic_stat_notification.png | Bin 3967 -> 0 bytes www/js/DataModel.js | 2 +- 27 files changed, 48 insertions(+), 50 deletions(-) delete mode 100755 www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png delete mode 100755 www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png delete mode 100755 www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png delete mode 100755 www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png delete mode 100755 www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png diff --git a/config.xml b/config.xml index 015378e1..49a4ebd2 100644 --- a/config.xml +++ b/config.xml @@ -44,6 +44,7 @@ + @@ -100,7 +101,14 @@ - + + + + + + + + @@ -172,4 +180,5 @@ + diff --git a/hooks/before_prepare/01_pp_hacks.sh b/hooks/before_prepare/01_pp_hacks.sh index 304aca79..440d0316 100755 --- a/hooks/before_prepare/01_pp_hacks.sh +++ b/hooks/before_prepare/01_pp_hacks.sh @@ -3,39 +3,24 @@ exe() { echo "\$ $@" ; "$@" ; } # Custom stuff I need to do for zmNinja -echo ---------------------------------------------------- +echo --------------------------------------------------------- echo Pliable Pixels build pre-preprocessing -echo ---------------------------------------------------- -echo Curr Dir: `pwd` +echo Nothing to be done - everything has mooved to config.xml +echo ---------------------------------------------------------- -#if [ -d "plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/" ]; then -# echo "Copying Modified GCMIntentService for custom sound" -# exe cp www/external/GCMIntentService.java plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/ -# exe cp www/external/GCMIntentService.java platforms/android/src/com/adobe/phonegap/push -#else -# echo "Directory plugins/phonegap-plugin-push/src/android/com/adobe/phonegap/push/ does not exist, skipping..." -#fi -#echo "Copying gradle hack for push-plugin-2.1.3" -#echo "-------------------------------------------" -# -#if [ -d "platforms/android" ]; then -# exe cp www/external/build-extras.gradle platforms/android -#else -# echo "Directory platforms/android does not exist, skipping..." -#fi -echo "Copying custom sound" -echo "---------------------" +#echo "Copying custom sound" +#echo "---------------------" -if [ -d "platforms/android" ]; then - exe mkdir -p platforms/android/res/raw/ - exe cp www/sounds/blop.mp3 platforms/android/res/raw/ - exe cp www/sounds/blop.caf platforms/ios/zmNinja/Resources -else - echo "Directory platforms/android does not exist, skipping..." -fi +#if [ -d "platforms/android" ]; then +# exe mkdir -p platforms/android/res/raw/ +# exe cp www/sounds/blop.mp3 platforms/android/res/raw/ +# exe cp www/sounds/blop.caf platforms/ios/zmNinja/Resources +#else +# echo "Directory platforms/android does not exist, skipping..." +#fi #echo "Copying plist hack for iOS for non SSL connections" #echo "--------------------------------------------------" @@ -45,23 +30,23 @@ fi # echo "Directory platforms/ios/zmNinja does not exist, skipping..." #fi -echo "Copying Android notification icons to resource dir" -echo "--------------------------------------------------" -if [ -d "platforms/android/res/" ]; then - exe cp -R www/external/android-notification-icons/ platforms/android/res/ - exe cp -f www/external/android-tv-banner/banner.png platforms/android/res/drawable - -else - echo "Directory platforms/android/res/ does not exist, skipping..." -fi - -echo "Copying Google services to android/app" -echo "--------------------------------------------------" -if [ -d "platforms/android" ]; then - exe cp google-services.json platforms/android/app/ -else - echo "Directory platforms/android doesn't exist" -fi +#echo "Copying Android notification icons to resource dir" +#echo "--------------------------------------------------" +#if [ -d "platforms/android/res/" ]; then +# exe cp -R www/external/android-notification-icons/ platforms/android/res/ +# exe cp -f www/external/android-tv-banner/banner.png platforms/android/res/drawable + +#else +# echo "Directory platforms/android/res/ does not exist, skipping..." +#fi + +#echo "Copying Google services to android/app" +#echo "--------------------------------------------------" +#if [ -d "platforms/android" ]; then +# exe cp google-services.json platforms/android/app/ +#else +# echo "Directory platforms/android doesn't exist" +#fi #echo "Fixing insecure SSL permission problem" #echo "--------------------------------------------------" diff --git a/package.json b/package.json index 2a23f8df..7dfda160 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,14 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.037", + "version": "1.3.038", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", "cordova": { - "platforms": [], + "platforms": [ + "android" + ], "plugins": { "cordova-plugin-add-swift-support": {}, "cordova-plugin-android-permissions": {}, @@ -60,6 +62,7 @@ }, "dependencies": { "clivas": "^0.2.0", + "cordova-android": "7.1.4", "cordova-custom-config": "5.0.2", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", @@ -98,7 +101,8 @@ "keypress": "^0.2.1", "menu": "^0.2.5", "minimist": "^1.2.0", - "mkdirp": "^0.5.1" + "mkdirp": "^0.5.1", + "phonegap-plugin-push": "~2.2.3" }, "devDependencies": { "@ionic/v1-toolkit": "^1.0.14", @@ -174,4 +178,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 aff13206..5e033024 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index e4f0c0bb..9ab39ad4 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index ab69ced4..22414263 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index f7ba0c71..16a3788b 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index c41af2c8..1df1a831 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 28de6a54..2368b543 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 9e523f9e..df83dcf3 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index c1dd0c3e..29988487 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 657d73cb..617720d3 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 0e7a58c8..0b5329cd 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 300fd464..ffdf72c8 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index a128472f..05209dd6 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index b48f145c..2f6584f6 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index c9ec1474..bbb576ed 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 55012148..16ae587d 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 0c8bc556..45f75fbd 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 5ca29148..b442580c 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index 45d4f5b3..bd4a945c 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png deleted file mode 100755 index 173932de..00000000 Binary files a/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png and /dev/null differ diff --git a/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png deleted file mode 100755 index 69685c86..00000000 Binary files a/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png and /dev/null differ diff --git a/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png deleted file mode 100755 index 780fc21f..00000000 Binary files a/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png and /dev/null differ diff --git a/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png deleted file mode 100755 index bb0a69c4..00000000 Binary files a/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png and /dev/null differ diff --git a/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png deleted file mode 100755 index d02d7189..00000000 Binary files a/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png and /dev/null differ diff --git a/www/js/DataModel.js b/www/js/DataModel.js index ba9417f5..e19a4a0c 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.037"; + var zmAppVersion = "1.3.038"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; -- cgit v1.2.3