diff --git a/config.xml b/config.xml index c1e61af27814f9dd09669fb6d0fb646b2a569f04..d6d23106d24f2f8ede319c7afd2b6f1d4a0a6ccd 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,10 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="12800" id="fr.duniter.cesium" version="0.12.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget + android-versionCode="12800" + id="fr.duniter.cesium" + version="0.12.8" + xmlns="http://www.w3.org/ns/widgets" + xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Cesium</name> <description> An simple App for Duniter wallet diff --git a/release.sh b/release.sh index 990bd9395010b18f85fe8b198d0fe3543d3ba391..4763bc6941872ef5df8d505cc807eef0ec930111 100755 --- a/release.sh +++ b/release.sh @@ -11,12 +11,13 @@ fi DIRNAME=`pwd` ### Releasing -current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"` +current=`grep -oP "version\": \"\d+.\d+.\d+((a|b)[0-9]+)?" package.json | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?"` echo "Current version: $current" -currentAndroid=`grep -P "android-versionCode=\"\d+\"" config.xml | grep -oP "\d+"` +currentAndroid=`grep -oP "android-versionCode=\"[0-9]+\"" config.xml | grep -oP "\d+"` echo "Current Android version: $currentAndroid" if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then + echo "new build version: $2" echo "new build android version: $3" case "$1" in @@ -55,6 +56,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then git tag "v$2" git push + echo "**********************************" echo "* Build release succeed !" echo "**********************************" diff --git a/www/index.html b/www/index.html index 8542505394e711cfec2d1ec6f6d803f98e2afa87..5adbe9d86fcedc667355a7b881ebeb3ac2b765a6 100644 --- a/www/index.html +++ b/www/index.html @@ -116,7 +116,6 @@ <script src="dist/dist_js/app/controllers/wot-controllers.js"></script> <script src="dist/dist_js/app/controllers/network-controllers.js"></script> <script src="dist/dist_js/app/controllers/currency-controllers.js"></script> - <script src="dist/dist_js/app/controllers/currency-charts-controllers.js"></script> <script src="dist/dist_js/app/controllers/transfer-controllers.js"></script> <script src="dist/dist_js/app/controllers/settings-controllers.js"></script> <script src="dist/dist_js/app/controllers/blockchain-controllers.js"></script> diff --git a/www/templates/menu.html b/www/templates/menu.html index 8dc3c4e89247cfa51e267a5f53b135c01eb49726..8cde9c1da04f130bbb8265a71601045cb003fcca 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -39,7 +39,9 @@ width="225"> <ion-header-bar> <h1 class="title dark hidden-sm hidden-xs" > - {{'MENU.TITLE'|translate}} <ng-if ng-if="$root.currency">{{$root.currency.name|currencySymbol:false }}</ng-if> + <span class="animate-fade-in animate-show-hide ng-hide" ng-show="$root.currency.name"> + {{'MENU.TITLE'|translate}} {{$root.currency.name|currencySymbol:false }} + </span> </h1> <div class="visible-sm visible-xs hero">