[enh] Preparing next release, compatible with G1

[fix] fix android build

app/config.json

 {
   "default": {
+    "defaultLanguage": "fr-FR",
+    "timeout": 300000,
+    "cacheTimeMs": 300000,
+    "useLocalStorage": true,
+    "rememberMe": true,
+    "useRelative": false,
+    "decimalCount": 2,
+    "helptip": {
+      "enable": false
+    },
+    "node": {
+      "host": "g1.duniter.fr",
+      "port": "443"
+    },
+    "plugins":{
+      "es": {
+        "enable": true,
+        "host": "data.gchange.fr",
+        "port": "443"
+      },
+      "market": {
+        "enable": true,
+        "defaultTags": [
+          {
+            "tag": "Sou",
+            "name":  "Sou"
+          }
+        ],
+        "record": {
+          "location": {
+            "show": true,
+            "required": true,
+            "label": "MARKET.LOCAL_SALE.LOCATION",
+            "help": "MARKET.LOCAL_SALE.LOCATION_HELP",
+            "prefix": "MARKET.LOCAL_SALE.LOCATION_PREFIX"
+          },
+          "unit": {
+            "canEdit": false
+          }
+        }
+      }
+    }
+  },
+
+  "test-vide-grenier": {
     "defaultLanguage": "fr-FR",
     "timeout": 4000,
     "cacheTimeMs": 60000,
@@ -64,6 +109,9 @@
           },
           "unit": {
             "canEdit": false
+          },
+          "fees": {
+            "show": false
           }
         }
       }

bower.json

@@ -11,7 +11,17 @@
     "angular-moment": "^0.10.3",
     "angular-animate": "1.4.3",
     "angular-sanitize": "1.5.3",
-    "angular": "1.5.3"
+    "angular": "1.5.3",
+    "angular-bind-notifier": "^1.1.7",
+    "angular-image-crop": "^2.0.0",
+    "ng-idle": "^1.3.2",
+    "chart.js": "chartjs#^2.6.0",
+    "Leaflet.awesome-markers": "^2.0.2",
+    "leaflet-search": "^2.7.2",
+    "angular-leaflet-directive": "angular-leaflet#^0.10.0",
+    "Leaflet.EasyButton": "~1.3.2",
+    "leaflet.loading": "Leaflet.loading#^0.1.24",
+    "ui-leaflet": "^2.0.0"
   },
   "resolutions": {
     "angular-sanitize": "1.5.3",

config.xml

 <?xml version='1.0' encoding='utf-8'?>
 <widget id="fr.gchange"
-        ersion="0.4.4" android:version="0.4.4"
+        version="0.4.4" android:version="0.4.4"
         android-versionCode="440"
         xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"
 >
@@ -13,17 +13,37 @@
   </author>
     <content src="index.html" />
     <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <allow-intent href="tel:*" />
+    <allow-intent href="sms:*" />
+    <allow-intent href="mailto:*" />
+    <allow-intent href="geo:*" />
+    <allow-navigation href="http://*/*" />
+    <allow-navigation href="https://*/*" />
+    <allow-navigation href="data:*" />
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="webviewbounce" value="false" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
+    <preference name="SplashScreen" value="screen" />
+    <preference name="SplashScreenDelay" value="4000" />
+    <preference name="xwalkVersion" value="19" />
+    <preference name="xwalkMultipleApk" value="false" />
     <preference name="android-minSdkVersion" value="16" />
+    <preference name="android-targetSdkVersion" value="25" />
     <allow-navigation href="https://data.gchange.fr/*" />
     <allow-navigation href="https://g1.duniter.org/*" />
     <allow-navigation href="https://g1.duniter.fr/*" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
+    <feature name="Device">
+        <param name="android-package" onload="true" value="org.apache.cordova.device.Device" />
+    </feature>
+    <feature name="MiniSodium">
+        <param name="android-package" onload="true" value="me.lockate.plugins.MiniSodium" />
+    </feature>
     <platform name="android">
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
@@ -33,4 +53,21 @@
         <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
     </platform>
     <engine name="android" spec="^6.2.3" />
+    <plugin name="cordova-plugin-camera" spec="^2.4.1" />
+    <plugin name="cordova-plugin-console" spec="^1.0.7" />
+    <plugin name="cordova-plugin-device" spec="^1.1.6" />
+    <plugin name="cordova-plugin-dialogs" spec="^1.3.3" />
+    <plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
+    <plugin name="cordova-plugin-minisodium" spec="^1.0.0" />
+    <plugin name="cordova-plugin-secure-storage" spec="^2.6.8" />
+    <plugin name="cordova-plugin-splashscreen" spec="^3.2.2" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
+    <plugin name="cordova-plugin-vibration" spec="^2.1.5" />
+    <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="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
+        <variable name="CAMERA_USAGE_DESCRIPTION" value=" " />
+    </plugin>
 </widget>

gulpfile.js

@@ -2,7 +2,6 @@
 
 var gulp = require('gulp');
 var gutil = require('gulp-util');
-var bower = require('bower');
 var concat = require('gulp-concat');
 var path = require("path");
 var sass = require('gulp-sass');
@@ -33,6 +32,7 @@ var clean = require('gulp-clean');
 var htmlmin = require('gulp-htmlmin');
 var jshint = require('gulp-jshint');
 var sourcemaps = require('gulp-sourcemaps');
+var concatCss = require('gulp-concat-css');
 
 var paths = {
   sass: ['./scss/**/*.scss'],
@@ -51,13 +51,22 @@ gulp.task('default', ['sass', 'config', 'templatecache', 'ng_translate', 'ng_ann
   'templatecache_plugin', 'ng_translate_plugin', 'ng_annotate_plugin', 'css_plugin'
 ]);
 
-gulp.task('sass', function(done) {
+gulp.task('sass-images', function (done) {
+    gulp.src('./scss/leaflet/images/**/*.*')
+        .pipe(gulp.dest('./www/img/'))
+        .on('end', done);
+});
+
+gulp.task('sass', ['sass-images'], function(done) {
+
+  es.concat(
+    // Default App style
     gulp.src('./scss/ionic.app.scss')
       .pipe(sass()).on('error', sass.logError)
       .pipe(base64({
               baseDir: "./www/css",
-                    extensions: ['svg', 'png', /\.jpg#datauri$/i],
-                    maxSize: 14 * 1024
+              extensions: ['svg', 'png', 'gif', /\.jpg#datauri$/i],
+              maxImageSize: 14 * 1024
             }))
       .pipe(gulp.dest('./www/css/'))
       .pipe(cleanCss({
@@ -65,7 +74,31 @@ gulp.task('sass', function(done) {
        }))
       .pipe(sourcemaps.write())
       .pipe(rename({ extname: '.min.css' }))
+      .pipe(gulp.dest('./www/css/')),
+
+    // Leaflet App style
+    gulp.src('./scss/leaflet.app.scss')
+      .pipe(sass()).on('error', sass.logError)
+      // Fix bad images path
+      .pipe(replace("url('../images/", "url('../img/"))
+      .pipe(replace("url(\"../images/", "url(\"../img/"))
+      .pipe(replace("url('images/", "url('../img/"))
+      .pipe(replace("url(\"images/", "url(\"../img/"))
+      .pipe(replace("url(images/", "url(../img/"))
+      .pipe(base64({
+        baseDir: "./www/css/",
+        extensions: ['png', 'gif', /\.jpg#datauri$/i],
+        maxImageSize: 14 * 1024,
+        deleteAfterEncoding: true
+      }))
       .pipe(gulp.dest('./www/css/'))
+      .pipe(cleanCss({
+        keepSpecialComments: 0
+      }))
+      .pipe(sourcemaps.write())
+      .pipe(rename({ extname: '.min.css' }))
+      .pipe(gulp.dest('./www/css/'))
+  )
   .on('end', done);
 });
 
@@ -81,12 +114,6 @@ gulp.task('watch', function() {
   gulp.watch(paths.css_plugin, ['css_plugin']);
 });
 
-gulp.task('install', ['git-check'], function() {
-  return bower.commands.install()
-    .on('log', function(data) {
-      gutil.log('bower', gutil.colors.cyan(data.id), data.message);
-    });
-});
 
 gulp.task('git-check', function(done) {
   if (!sh.which('git')) {

package.json

@@ -28,12 +28,12 @@
         "new": "https://github.com/duniter-gchange/gchange-client/issues/new?labels=bug"
     },
     "dependencies": {
-        "@ionic/cloud": "^0.16.0",
         "bluebird": "^3.5.0",
         "cordova-android": "^6.2.3",
         "cordova-plugin-camera": "^2.4.1",
         "cordova-plugin-compat": "^1.1.0",
         "cordova-plugin-console": "^1.0.7",
+        "cordova-plugin-crosswalk-webview": "^2.3.0",
         "cordova-plugin-device": "^1.1.6",
         "cordova-plugin-dialogs": "^1.3.3",
         "cordova-plugin-inappbrowser": "^1.7.1",
@@ -66,6 +66,7 @@
         "gulp-base64": "^0.1.3",
         "gulp-clean": "^0.3.2",
         "gulp-clean-css": "^2.0.10",
+        "gulp-concat-css": "^2.3.0",
         "gulp-css-base64": "^1.3.4",
         "gulp-csso": "^2.0.0",
         "gulp-filter": "^4.0.0",
@@ -91,6 +92,26 @@
         "shelljs": "^0.3.0",
         "yargs": "^4.3.1"
     },
+    "cordovaPlugins": [
+        "cordova-plugin-whitelist",
+        "cordova-plugin-splashscreen",
+        "cordova-plugin-console",
+        "ionic-plugin-keyboard",
+        "cordova-plugin-device",
+        "cordova-plugin-statusbar",
+        "cordova-plugin-camera",
+        "cordova-plugin-websocket",
+        "cordova-plugin-vibration",
+        "cordova-plugin-dialogs",
+        "cordova-plugin-minisodium",
+        "cordova-plugin-secure-storage",
+        {
+            "locator": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git",
+            "id": "phonegap-plugin-barcodescanner"
+        },
+        "cordova-plugin-inappbrowser",
+        "cordova-plugin-x-toast"
+    ],
     "cordovaPlatforms": [
         "android"
     ],

package.json.cesium

-{
-    "name": "cesium",
-    "version": "0.14.0",
-    "description": "Unhosted webapp client for Duniter network",
-    "repository": {
-        "type": "git",
-        "url": "git@github.com:duniter/cesium.git"
-    },
-    "scripts": {
-        "postinstall": "bower install",
-        "install-for-mobile": "ionic state restore",
-        "start": "ionic serve"
-    },
-    "keywords": [
-        "duniter",
-        "cesium",
-        "ionic",
-        "angular",
-        "cordova",
-        "crypto-currency"
-    ],
-    "author": "Duniter team",
-    "license": "GPL-3.0",
-    "readmeFilename": "README.md",
-    "bugs": {
-        "url": "https://github.com/duniter/cesium/issues",
-        "new": "https://github.com/duniter/cesium/issues/new?labels=bug"
-    },
-    "dependencies": {
-        "bower": "^1.8.0",
-        "cordova-android": "^6.2.3",
-        "cordova-plugin-camera": "^2.4.1",
-        "cordova-plugin-compat": "^1.1.0",
-        "cordova-plugin-console": "^1.0.7",
-        "cordova-plugin-device": "^1.1.6",
-        "cordova-plugin-dialogs": "^1.3.3",
-        "cordova-plugin-inappbrowser": "^1.7.1",
-        "cordova-plugin-minisodium": "^1.0.0",
-        "cordova-plugin-secure-storage": "^2.6.8",
-        "cordova-plugin-splashscreen": "^3.2.2",
-        "cordova-plugin-statusbar": "^2.2.3",
-        "cordova-plugin-vibration": "^2.1.5",
-        "cordova-plugin-websocket": "^0.12.2",
-        "cordova-plugin-whitelist": "^1.3.2",
-        "cordova-plugin-x-toast": "^2.6.0",
-        "delete-empty": "^0.1.3",
-        "gulp": "^3.9.1",
-        "gulp-bump": "^2.1.0",
-        "gulp-concat": "^2.2.0",
-        "gulp-rename": "^1.2.0",
-        "gulp-sass": "^2.2.0",
-        "ionic": "^1.7.16",
-        "ionic-plugin-keyboard": "^2.2.1",
-        "node-sass": "^3.3.3",
-        "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
-    },
-    "devDependencies": {
-        "cordova-uglify": "^0.2.3",
-        "del": "^2.2.0",
-        "fs": "0.0.2",
-        "gulp": "^3.9.1",
-        "gulp-angular-templatecache": "^1.8.0",
-        "gulp-angular-translate": "^0.1.4",
-        "gulp-base64": "^0.1.3",
-        "gulp-clean": "^0.3.2",
-        "gulp-clean-css": "^2.0.10",
-        "gulp-css-base64": "^1.3.4",
-        "gulp-csso": "^2.0.0",
-        "gulp-filter": "^4.0.0",
-        "gulp-header": "^1.7.1",
-        "gulp-html-remove": "^0.1.1",
-        "gulp-htmlmin": "^2.0.0",
-        "gulp-jshint": "^2.0.1",
-        "gulp-ng-annotate": "^2.0.0",
-        "gulp-ng-constant": "^1.1.0",
-        "gulp-remove-code": "^1.0.2",
-        "gulp-replace": "^0.5.4",
-        "gulp-rev": "^7.0.0",
-        "gulp-rev-replace": "^0.4.3",
-        "gulp-sourcemaps": "^1.6.0",
-        "gulp-uglify": "^1.5.3",
-        "gulp-useref": "^3.1.0",
-        "gulp-util": "^2.2.14",
-        "gulp-zip": "^3.2.0",
-        "ionic-minify": "^2.0.8",
-        "jshint": "^2.9.2",
-        "mv": "^2.1.1",
-        "playup": "^1.0.2",
-        "shelljs": "^0.3.0",
-        "yargs": "^4.3.1"
-    },
-    "cordovaPlatforms": [
-        "android",
-        "firefoxos"
-    ],
-    "cordova": {
-        "plugins": {
-            "cordova-plugin-camera": {},
-            "cordova-plugin-console": {},
-            "cordova-plugin-device": {},
-            "cordova-plugin-dialogs": {},
-            "cordova-plugin-inappbrowser": {},
-            "cordova-plugin-minisodium": {},
-            "cordova-plugin-secure-storage": {},
-            "cordova-plugin-splashscreen": {},
-            "cordova-plugin-statusbar": {},
-            "cordova-plugin-vibration": {},
-            "cordova-plugin-websocket": {},
-            "cordova-plugin-whitelist": {},
-            "cordova-plugin-x-toast": {},
-            "ionic-plugin-keyboard": {},
-            "phonegap-plugin-barcodescanner": {
-                "CAMERA_USAGE_DESCRIPTION": " "
-            }
-        },
-        "platforms": [
-            "android"
-        ]
-    }
-}
\ No newline at end of file

scss/leaflet.app.scss

+@charset "UTF-8";
+@import "leaflet/leaflet";
+@import "leaflet/leaflet.search";
+@import "leaflet/leaflet.easy-button";
+@import "leaflet/leaflet.loading";
+@import "leaflet/leaflet.awesome-markers";

scss/leaflet/README.md

+This SCCS config has been done by hand, from original leaflet CSS files, and CSS of plugins used in Cesium.
+ 
+Hox to update this config:
+ - Execute 'bower install' to get dependencies (into www/lib)
+ - Search leaflet lib (in 'www/lib')
+ - Copy all source CSS file into current directory
+ - Rename CSS files into '_<basename>.scss'
+ - Copy all images resources into current 'images' directory
+  
+make sure to update the file 'leaflet.app.scss' (e.g. when adding some Leaflet plugins)

scss/leaflet/_leaflet.awesome-markers.scss

+/*
+Author: L. Voogdt
+License: MIT
+Version: 1.0
+*/
+
+/* Marker setup */
+.awesome-marker {
+  background: url('images/markers-soft.png') no-repeat 0 0;
+  width: 35px;
+  height: 46px;
+  position:absolute;
+  left:0;
+  top:0;
+  display: block;
+  text-align: center;
+}
+
+.awesome-marker-shadow {
+  background: url('images/markers-shadow.png') no-repeat 0 0;
+  width: 36px;
+  height: 16px;
+}
+
+/* Retina displays */
+@media (min--moz-device-pixel-ratio: 1.5),(-o-min-device-pixel-ratio: 3/2),
+(-webkit-min-device-pixel-ratio: 1.5),(min-device-pixel-ratio: 1.5),(min-resolution: 1.5dppx) {
+ .awesome-marker {
+  background-image: url('images/markers-soft@2x.png');
+  background-size: 720px 46px;
+ }
+ .awesome-marker-shadow {
+  background-image: url('images/markers-shadow@2x.png');
+  background-size: 35px 16px;
+ }
+}
+
+.awesome-marker i {
+  color: #333;
+  margin-top: 10px;
+  display: inline-block;
+  font-size: 14px;
+}
+
+.awesome-marker .icon-white {
+  color: #fff;
+}
+
+/* Colors */
+.awesome-marker-icon-red {
+  background-position: 0 0;
+}
+
+.awesome-marker-icon-darkred {
+  background-position: -180px 0;
+}
+
+.awesome-marker-icon-lightred {
+  background-position: -360px 0;
+}
+
+.awesome-marker-icon-orange {
+  background-position: -36px 0;
+}
+
+.awesome-marker-icon-beige {
+  background-position: -396px 0;
+}
+
+.awesome-marker-icon-green {
+  background-position: -72px 0;
+}
+
+.awesome-marker-icon-darkgreen {
+  background-position: -252px 0;
+}
+
+.awesome-marker-icon-lightgreen {
+  background-position: -432px 0;
+}
+
+.awesome-marker-icon-blue {
+  background-position: -108px 0;
+}
+
+.awesome-marker-icon-darkblue {
+  background-position: -216px 0;
+}
+
+.awesome-marker-icon-lightblue {
+  background-position: -468px 0;
+}
+
+.awesome-marker-icon-purple {
+  background-position: -144px 0;
+}
+
+.awesome-marker-icon-darkpurple {
+  background-position: -288px 0;
+}
+
+.awesome-marker-icon-pink {
+  background-position: -504px 0;
+}
+
+.awesome-marker-icon-cadetblue {
+  background-position: -324px 0;
+}
+
+.awesome-marker-icon-white {
+  background-position: -574px 0;
+}
+
+.awesome-marker-icon-gray {
+  background-position: -648px 0;
+}
+
+.awesome-marker-icon-lightgray {
+  background-position: -612px 0;
+}
+
+.awesome-marker-icon-black {
+  background-position: -682px 0;
+}

scss/leaflet/_leaflet.easy-button.scss

+.leaflet-bar button,
+.leaflet-bar button:hover {
+  background-color: #fff;
+  border: none;
+  border-bottom: 1px solid #ccc;
+  width: 26px;
+  height: 26px;
+  line-height: 26px;
+  display: block;
+  text-align: center;
+  text-decoration: none;
+  color: black;
+}
+
+.leaflet-bar button {
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  overflow: hidden;
+  display: block;
+}
+
+.leaflet-bar button:hover {
+  background-color: #f4f4f4;
+}
+
+.leaflet-bar button:first-of-type {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+.leaflet-bar button:last-of-type {
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom: none;
+}
+
+.leaflet-bar.disabled,
+.leaflet-bar button.disabled {
+  cursor: default;
+  pointer-events: none;
+  opacity: .4;
+}
+
+.easy-button-button .button-state{
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+
+.leaflet-touch .leaflet-bar button {
+  width: 30px;
+  height: 30px;
+  line-height: 30px;
+}

scss/leaflet/_leaflet.loading.scss

+.leaflet-control-loading:empty {
+    /* Spinner via ajaxload.info, base64-encoded */
+    background-image: url(data:image/gif;base64,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);
+    background-repeat: no-repeat;
+}
+
+.leaflet-control-loading,
+.leaflet-control-zoom a.leaflet-control-loading,
+.leaflet-control-zoomslider a.leaflet-control-loading,
+.leaflet-control-layer-container {
+    display: none;
+}
+
+.leaflet-control-loading.is-loading,
+.leaflet-control-zoom a.leaflet-control-loading.is-loading,
+.leaflet-control-zoomslider a.leaflet-control-loading.is-loading,
+.leaflet-control-layer-container.is-loading {
+    display: block;
+}
+
+/* Necessary for display consistency in Leaflet >= 0.6 */
+.leaflet-bar-part-bottom {
+    border-bottom: medium none;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+}

scss/leaflet/_leaflet.scss

+/* required styles */
+
+.leaflet-map-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-pane,
+.leaflet-tile-container,
+.leaflet-overlay-pane,
+.leaflet-shadow-pane,
+.leaflet-marker-pane,
+.leaflet-popup-pane,
+.leaflet-overlay-pane svg,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
+.leaflet-container {
+	overflow: hidden;
+	-ms-touch-action: none;
+	touch-action: none;
+	}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	-webkit-user-select: none;
+	   -moz-user-select