diff options
| -rw-r--r-- | config.xml | 3 | ||||
| -rw-r--r-- | package-lock.json | 13 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | www/css/style.css | 34 | ||||
| -rwxr-xr-x | www/js/app.js | 16 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
6 files changed, 63 insertions, 11 deletions
@@ -105,6 +105,7 @@ <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save media to your Camera Roll" /> </plugin> <plugin name="cordova-plugin-add-swift-support" spec="^1.7.0" /> + <plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.4.0" /> <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" /> <plugin name="cordova-plugin-app-version" spec="^0.1.9" /> <plugin name="cordova-plugin-certificates" spec="git+https://github.com/hypery2k/cordova-certificate-plugin.git" /> @@ -132,7 +133,7 @@ <plugin name="cordova-plugin-settings-hook" spec="^0.2.7" /> <plugin name="cordova-plugin-splashscreen" spec="^4.0.3" /> <plugin name="cordova-plugin-statusbar" spec="git+https://github.com/apache/cordova-plugin-statusbar.git" /> - <plugin name="cordova-plugin-touchid" spec="^0.4.0" /> + <plugin name="cordova-plugin-touch-id" spec="^3.2.0" /> <plugin name="cordova-plugin-websocket" spec="^0.12.2" /> <plugin name="cordova-plugin-whitelist" spec="^1.3.2" /> <plugin name="cordova-sqlite-storage" spec="^1.5.3" /> diff --git a/package-lock.json b/package-lock.json index 91216f3a..efb1bb2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -674,6 +674,11 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-1.7.0.tgz", "integrity": "sha512-BzCsTaRrX2RP5WT3bPzVa0DQXUq6CCh2hQOmcBuPmwcxFpMiu3HCMrQsMjOE9HOtxTa22nGs49vOZLf9hiWyGQ==" }, + "cordova-plugin-android-fingerprint-auth": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-android-fingerprint-auth/-/cordova-plugin-android-fingerprint-auth-1.4.0.tgz", + "integrity": "sha1-MSYv60t57ZqSTOBD+nc1eNWI+4Y=" + }, "cordova-plugin-android-permissions": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.0.0.tgz", @@ -777,10 +782,10 @@ "cordova-plugin-statusbar": { "version": "git+https://github.com/apache/cordova-plugin-statusbar.git#4642be07a60503341ea0cd4f7e865fde8c57d4f8" }, - "cordova-plugin-touchid": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-touchid/-/cordova-plugin-touchid-0.4.0.tgz", - "integrity": "sha1-FlRVStTV4AeuJt86FkkwkReUbJQ=" + "cordova-plugin-touch-id": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-touch-id/-/cordova-plugin-touch-id-3.2.0.tgz", + "integrity": "sha1-eGBkuvI5QODokx4OLEjhmOPe+WQ=" }, "cordova-plugin-websocket": { "version": "0.12.2", diff --git a/package.json b/package.json index 2b65f7a4..ea5ce625 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "cordova-plugin-pin-dialog": {}, "cordova-plugin-settings-hook": {}, "cordova-plugin-splashscreen": {}, - "cordova-plugin-touchid": {}, "cordova-plugin-websocket": {}, "cordova-plugin-whitelist": {}, "cordova-sqlite-storage": {}, @@ -53,6 +52,8 @@ "cordova.plugins.diagnostic": {}, "cordova-plugin-email": {}, "cordova-plugin-certificates": {}, + "cordova-plugin-touch-id": {}, + "cordova-plugin-android-fingerprint-auth": {}, "cordova-plugin-statusbar": {} } }, @@ -64,6 +65,7 @@ "cordova-ios": "^4.4.0", "cordova-library-helper": "^1.0.4", "cordova-plugin-add-swift-support": "^1.7.0", + "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git", @@ -86,7 +88,7 @@ "cordova-plugin-settings-hook": "^0.2.7", "cordova-plugin-splashscreen": "^4.0.3", "cordova-plugin-statusbar": "git+https://github.com/apache/cordova-plugin-statusbar.git", - "cordova-plugin-touchid": "^0.4.0", + "cordova-plugin-touch-id": "^3.2.0", "cordova-plugin-websocket": "^0.12.2", "cordova-plugin-whitelist": "^1.3.2", "cordova-sqlite-storage": "^1.5.3", diff --git a/www/css/style.css b/www/css/style.css index 82160ea0..15decf09 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -1331,4 +1331,38 @@ body { * { font-family: -apple-system, "Helvetica Neue", sans-serif; +} + +/*Disabling platform specific tweaks */ +.platform-ios.platform-cordova:not(.fullscreen) .bar-header +{ + height: 44px !important; +} +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) +{ + height: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader).item-input-inset .item-input-wrapper +{ + margin-top: 0px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) > * +{ + margin-top: 0px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .tabs-top > .tabs, .platform-ios.platform-cordova:not(.fullscreen) .tabs.tabs-top +{ + top: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .has-header, .platform-ios.platform-cordova:not(.fullscreen) .bar-subheader +{ + top: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .has-subheader { + top: 88px !important; }
\ No newline at end of file diff --git a/www/js/app.js b/www/js/app.js index e7e9d883..0bca8099 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -28,7 +28,8 @@ angular.module('zmApp', [ 'pascalprecht.translate', 'jett.ionic.scroll.sista', 'uk.ac.soton.ecs.videogular.plugins.cuepoints', - 'dcbImgFallback' + 'dcbImgFallback', + ]) @@ -482,8 +483,13 @@ angular.module('zmApp', [ // console.log ("DIRECTIVE: IMAGE ERROR"); loader.remove(); + var url = 'img/novideo.png'; - $element.prop('src', url); + // var hurl = "holder.js/2000x$2000?auto=yes&theme=sky&text=..."; + + $element.prop('src', url); + // $element.prop('data-src', hurl); + imageLoadingDataShare.set(0); }); @@ -1619,7 +1625,11 @@ angular.module('zmApp', [ console.log("statusbar"); NVRDataModel.log("Updating statusbar"); StatusBar.styleDefault(); - //StatusBar.overlaysWebView(true); + if ($rootScope.platformOS=='ios') { + console.log ("<<<<<<<<<<<<<<<< OVERLAY"); + StatusBar.overlaysWebView(false); + } + StatusBar.backgroundColorByHexString("#2980b9"); } diff --git a/www/templates/montage.html b/www/templates/montage.html index bcdfdf6c..baaea947 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -101,7 +101,7 @@ <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> - <!--<div ng-if="!isModalActive" >--> + <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> <div ng-if="$root.authSession!='undefined' && !isBackground() "> <div ng-if = "!minimal"> |