diff --git a/config.xml b/config.xml index d17d1c9b191070560691aa51be52e4e11b487b91..c06c9d40a544d00b8c25dd9e4ce37f9bc7e2b41e 100644 --- a/config.xml +++ b/config.xml @@ -98,6 +98,9 @@ <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" /> + <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" /> + <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" /> + <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" /> <edit-config file="*-Info.plist" mode="merge" target="NSCameraUsageDescription"> <string>To scan QRCode</string> </edit-config> diff --git a/doc/development_guide.md b/doc/development_guide.md index 4ef33d77df315700a3684a8c2925d7d6d9916467..34e9af096992cd8c9c34bd5bc87d31d9999b2a6e 100644 --- a/doc/development_guide.md +++ b/doc/development_guide.md @@ -16,14 +16,14 @@ To build Cesium, you will have to: > Then reload your terminal, for instance by executing the commande `bash` - - Configure NodeJS to use a version 5: (**WARNING**: upper version will NOT work !) + - Configure NodeJS to use a version 6: (**WARNING**: upper version will NOT work !) ``` - nvm install 5 + nvm install 6 ``` - Installing node.js build tools: ``` - npm install -g gulp bower@1.8.0 cordova@6.5.0 ionic@1.7.16 + npm install -g gulp bower@1.8.0 cordova@9.0.0 ionic@1.7.16 ``` ## Get the source code and dependencies diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 508ad7494d126cb37852b8747cc54fc449d9e662..3f84fc1b2b36263e0eef1f0a9d23269b873ab613 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 deb0e21ead9fa46b8bbc407c97c1b8e57bb28b62..3de9b4f79ba0742e8cca99c24289d8a62d8e74d4 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 3952360a0ece67ab284c8bf7b920cd83e8e87516..4b455d317a5be633643484260d0b46d393b13312 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 b90d76eeb8d24482946dac2783c4b4dfa92cc61c..fe47ccce8d00fe26b3bdf4656a64e1d6a1d6e764 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 7643167f4a9dd6c4adbbdd701ae8ab221af964b5..391b4af13a2b8f878c1db28ff3cfc6ba708dfec0 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 6d864ca12666306bdbc7c41db2614802b0cb8498..09e50b7b356d1ab45939fb63515b5e3a77b0d802 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 770300311876c49ec29df0370214fd1bb9112483..91225500e5f0b6c8359dfa3832dba2a1a3292c5d 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 cd6ca24bdbe30613fa71a9ac168c6978f309ced4..03b7592f9aff651ca26c6d4e7c288b0633dd27b9 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 8419e2047ac86484cb450763fbc9017927cb7d43..8dcb44465d573a466c6ca9256780bce7d5e969a6 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 a39b7abdc70f616d4da06dd4a15616e461ebf471..0ab32df1c11520273a55f44752bb32edab26f66a 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 3d5664fedaa9f7882b252c0f448265fb46b558fc..fc39c458b1c72f012e982695a1cdc0ff7b2152b0 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 eca368aa0b724d19628bd90109b8de5b8569852d..b822cf3ffce561e7a0e09676e893efd4be725cf3 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 30b82490ea7983422f0e2cf049fb692b945ca8e3..fe5941ee82fb0574c19949cfe9190e7ca4f51cec 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 a0b5c113c39a45842b65638ee8a94bb0c65c56d7..313541c0f44fb2b8bd7070d21ad925ce5e2e4c1e 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 116fc6fc2127c5f0e60ac347eae5142db44d1a48..07cfc27fc5abd01fd66e7bde270c5205a391fc27 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 668ad9fcdaa60a83d969f2f828510bf95f95db6e..09e5624b26916a92036982d7a040c119c706fb7a 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 1d83bf558836548ff1920c5050e7c978dad5ce9e..6e1f092042b4cfbf806739774c734bf3c142bb39 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 0fb5c790988336455af1f073a78ca2c6a46009bd..aa870eb4482435ee45ddd7a7ffa0f47d920b08c1 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/resources/ios/splash/Default-2436h.png b/resources/ios/splash/Default-2436h.png index 8c9746231d20939acb6e802ed936406f6e0e1756..97bdde9cfe178383a5029cb897129c4affb9ecee 100644 Binary files a/resources/ios/splash/Default-2436h.png and b/resources/ios/splash/Default-2436h.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index dfc66e1d68dee8ad6e47fd18173214d5ab0b4ea7..e98faf8d818c61840b2694e1db122b9ae14ffd32 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index 33fe58034a5ee38f2c7c334d1fb025e7e36f8490..43ca9d882a5926dc0eeeebd3a3bcfbf2363ba342 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index 2e391503aa735249f53042494232894764d74d2a..a337aa2eae0c6ce27305981512e9f81cf590547f 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-2436h.png b/resources/ios/splash/Default-Landscape-2436h.png index 4856b6c2bcc2fa2b9b6dad29010b0c12fb167ef5..1fa21165c57b1014f0d46ad809f5e7fcd7e45590 100644 Binary files a/resources/ios/splash/Default-Landscape-2436h.png and b/resources/ios/splash/Default-Landscape-2436h.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index 0957d256b731e4a2cff8c413382203c3083277ff..8cecaed6a591ff074586e0babbbbbe84c280f006 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index ebac9e8dc1f2b8e0a85350a07a773d2aa8b5bb47..e65bfc1360758e0c57f070be4e294251a71db7ad 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png new file mode 100644 index 0000000000000000000000000000000000000000..59bee1b13eba5cc403e59b365915e317383d441d Binary files /dev/null and b/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index f6e0897c0a4ef2ab41c663d578efd444b5c686fd..368daff2ec5f57d6d939e2a4fb31f0dc97dc6cb7 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index 38bb4888a4382ef2700a33d8132c8dcbfec708ad..b6bf0aaec751e73cad79903463a83d9112e4b021 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png new file mode 100644 index 0000000000000000000000000000000000000000..60e43bde28c06081b0f37460992930b6f86642bf Binary files /dev/null and b/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index f128c3c4b724bea6588f75536c714099c5cdb30d..de95277492c2d5b8a5ca5f8f70ce506ebfa8b0c4 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index 0259b36b4bc71ee349e52bc8e694555872657019..d441ca80b0dc26203d1f7d52cc5d52764ec6f5f0 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png new file mode 100644 index 0000000000000000000000000000000000000000..695d802faa5b4dc747240ee74212f8c7d2674910 Binary files /dev/null and b/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 92990d588b64c03331549d041ebc6b034c0b3077..07cfc27fc5abd01fd66e7bde270c5205a391fc27 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/resources/splash.png b/resources/splash.png index cbddba06ab1b118a755a2396bfeed32945ef925a..4f4b10a9d530964043de3a7c8bc85856998f5ae7 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/www/js/app.js b/www/js/app.js index 187b7de167e42793bf7527227be5494923bbb08b..478af2680b797222545e54616a1b94351ad34882 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -141,10 +141,8 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht ionicReady().then(function() { if (ionic.Platform.isIOS()) { if(window.StatusBar) { - // needed to fix Xcode 9 / iOS 11 issue with blank space at bottom of webview - // https://github.com/meteor/meteor/issues/9041 - StatusBar.overlaysWebView(false); - StatusBar.overlaysWebView(true); + // fix font color not white on iOS 11+ + StatusBar.styleLightContent(); } } }); diff --git a/www/js/config.js b/www/js/config.js index 1d0b9e82b47865e6c7a0b0149df132797bdb25ae..cb881333d6aa9c8470233cccdb7e9d382ed787c6 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -94,7 +94,7 @@ angular.module("cesium.config", []) } }, "version": "1.4.6", - "build": "2019-09-07T13:19:34.949Z", + "build": "2019-09-07T17:13:37.741Z", "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" }) diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js index b7308055b93fc5a52e6fcf752fd3d061ccfc6268..c2e765ce192f42574ed5c979a603fd8b709374b0 100644 --- a/www/js/controllers/app-controllers.js +++ b/www/js/controllers/app-controllers.js @@ -510,6 +510,15 @@ function HomeController($scope, $state, $timeout, $ionicHistory, $translate, UIU $scope.locales = angular.copy(csSettings.locales); $scope.enter = function(e, state) { + if (ionic.Platform.isIOS()) { + if(window.StatusBar) { + // needed to fix Xcode 9 / iOS 11 issue with blank space at bottom of webview + // https://github.com/meteor/meteor/issues/9041 + StatusBar.overlaysWebView(false); + StatusBar.overlaysWebView(true); + } + } + if (state && state.stateParams && state.stateParams.error) { // Error query parameter $scope.error = state.stateParams.error; $scope.node = csCurrency.data.node;