diff --git a/Dockerfile b/Dockerfile index f6f5b8cd44e7769a37b7363cd88e692c2a0e9cd7..f95e060fda307576a58e843aff7cb0729a8d8114 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro" ENV DEBIAN_FRONTEND=noninteractive \ ANDROID_HOME=/opt/android-sdk-linux \ - NODE_VERSION=5.12.0 \ - NPM_VERSION=3.8.6 \ + NODE_VERSION=6.17.1 \ + NPM_VERSION=6.10.3 \ IONIC_VERSION=1.7.16 \ BOWER_VERSION=1.8.0 \ - CORDOVA_VERSION=6.5.0 \ + CORDOVA_VERSION=9.0.0 \ GRADLE_VERSION=4.1 \ NDK_VERSION=r10e diff --git a/config.xml b/config.xml index c06c9d40a544d00b8c25dd9e4ce37f9bc7e2b41e..678b1ca67f9d9fa7482322a4ec37854e4e90181c 100644 --- a/config.xml +++ b/config.xml @@ -25,6 +25,7 @@ <preference name="SplashScreen" value="screen" /> <preference name="SplashScreenDelay" value="4000" /> <preference name="KeyboardDisplayRequiresUserAction" value="false" /> + <preference name="KeyboardResizeMode" value="ionic" /> <preference name="xwalkVersion" value="19" /> <preference name="xwalkMultipleApk" value="false" /> <preference name="android-minSdkVersion" value="16" /> @@ -65,6 +66,7 @@ <platform name="ios"> <preference name="BackupWebStorage" value="local" /> <preference name="StatusBarOverlaysWebView" value="true" /> + <preference name="KeyboardShrinksView" value="true" /> <icon height="20" src="resources/ios/icon/Icon-App-20x20@1x.png" width="20" /> <icon height="40" src="resources/ios/icon/Icon-App-20x20@2x.png" width="40" /> <icon height="60" src="resources/ios/icon/Icon-App-20x20@3x.png" width="60" /> @@ -125,7 +127,7 @@ <plugin name="cordova-plugin-websocket" spec="^0.12.2" /> <plugin name="cordova-plugin-whitelist" spec="^1.3.2" /> <plugin name="cordova-plugin-x-toast" spec="^2.6.0" /> - <plugin name="ionic-plugin-keyboard" spec="^2.2.1" /> + <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" /> <plugin name="cordova-plugin-minisodium" spec="https://github.com/E-IS/cordova-plugin-minisodium.git" /> <plugin name="phonegap-plugin-barcodescanner" spec="https://github.com/phonegap/phonegap-plugin-barcodescanner.git"> <variable name="CAMERA_USAGE_DESCRIPTION" value="Scan QRCode" /> diff --git a/package.json b/package.json index 2c4b98df40303099bb939130d6a7b6192e6d95ca..3720b82e5415d9fbb3d3ca30823022bdcbd8ded0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cesium", - "version": "1.4.6", + "version": "1.4.7", "description": "Cesium Wallet for G1 libre currency", "repository": { "type": "git", @@ -32,7 +32,7 @@ "dependencies": { "cordova": "^9.0.0", "cordova-android": "6.4.0", - "cordova-ios": "https://github.com/bpresles/cordova-ios.git#5.1.0", + "cordova-ios": "git+https://github.com/bpresles/cordova-ios.git#5.1.0", "cordova-osx": "^5.0.0", "cordova-plugin-camera": "^2.4.1", "cordova-plugin-compat": "^1.2.0", @@ -40,6 +40,8 @@ "cordova-plugin-crosswalk-webview": "^2.3.0", "cordova-plugin-device": "^1.1.7", "cordova-plugin-dialogs": "^1.3.4", + "cordova-plugin-ionic-keyboard": "^2.2.0", + "cordova-plugin-ionic-webview": "^4.1.2", "cordova-plugin-minisodium": "git+https://github.com/bpresles/cordova-plugin-minisodium.git", "cordova-plugin-secure-storage": "^2.6.8", "cordova-plugin-splashscreen": "^3.2.2", @@ -48,7 +50,6 @@ "cordova-plugin-websocket": "^0.12.2", "cordova-plugin-whitelist": "^1.3.4", "cordova-plugin-x-toast": "^2.7.2", - "ionic-plugin-keyboard": "^2.2.1", "moment": "~2.19.3", "numeral": "1.5.3", "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git" @@ -121,7 +122,9 @@ { "id": "phonegap-plugin-barcodescanner", "locator": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git" - } + }, + "cordova-plugin-ionic-keyboard", + "cordova-plugin-ionic-webview" ], "cordovaPlatforms": [ { @@ -131,12 +134,16 @@ }, { "platform": "android", - "locator": "osx" + "version": "6.4.0", + "locator": "android@6.4.0" } ], "cordova": { "plugins": { - "cordova-plugin-camera": {}, + "cordova-plugin-camera": { + "CAMERA_USAGE_DESCRIPTION": "Scan QRCode or avatar", + "PHOTOLIBRARY_USAGE_DESCRIPTION": "Avatar" + }, "cordova-plugin-console": {}, "cordova-plugin-device": {}, "cordova-plugin-dialogs": {}, @@ -148,10 +155,11 @@ "cordova-plugin-websocket": {}, "cordova-plugin-whitelist": {}, "cordova-plugin-x-toast": {}, - "ionic-plugin-keyboard": {}, + "cordova-plugin-ionic-keyboard": {}, "phonegap-plugin-barcodescanner": { "CAMERA_USAGE_DESCRIPTION": "Scan QRCode" - } + }, + "cordova-plugin-ionic-webview": {} }, "platforms": [ "ios", @@ -159,4 +167,4 @@ "osx" ] } -} \ No newline at end of file +}