diff --git a/app/config.json b/app/config.json
index e4231d45c221a9e018497d61f8eda58eb2fcf433..ae0671c9d152c7379fb228d7553cb5cb6eed8ddb 100644
--- a/app/config.json
+++ b/app/config.json
@@ -36,21 +36,18 @@
"feed": {
"jsonFeed": {
"fr-FR": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json",
- "en": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-en.json"
+ "en": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-en.json",
+ "es": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-es.json"
},
"maxContentLength": 1300
},
- "node": {
- "host": "g111.duniter.org",
- "port": 443
- },
"fallbackNodes": [
{
"host": "g1.cgeek.fr",
"port": 443
},
{
- "host": "g1.librelois.fr",
+ "host": "g1.cloud-libre.eu",
"port": 443
},
{
@@ -58,128 +55,25 @@
"port": 443
},
{
- "host": "duniter.moul.re",
+ "host": "g1.mithril.re",
"port": 443
},
{
- "host": "g1.presles.fr",
+ "host": "vit.fdn.org",
"port": 443
},
{
"host": "g1.duniter.org",
"port": 443
- }
- ],
- "developers": [
- {"name": "Benoit Lavenier", "pubkey": "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE"}
- ],
- "plugins":{
- "es": {
- "enable": true,
- "askEnable": true,
- "useRemoteStorage": true,
- "host": "g1.data.e-is.pro",
- "port": 443,
- "fallbackNodes": [
- {
- "host": "g1.data.le-sou.org",
- "port": 443
- },
- {
- "host": "g1.data.mithril.re",
- "port": 443
- }
- ],
- "notifications": {
- "txSent": true,
- "txReceived": true,
- "certSent": true,
- "certReceived": true
- },
- "defaultCountry": "France"
- }
- }
- },
-
- "default_fr": {
- "cacheTimeMs": 300000,
- "demo": false,
- "readonly": false,
- "fallbackLanguage": "fr",
- "rememberMe": true,
- "showUDHistory": true,
- "timeout": 10000,
- "timeWarningExpireMembership": 5184000,
- "timeWarningExpire": 7776000,
- "keepAuthIdle": 600,
- "useLocalStorage": true,
- "useRelative": false,
- "expertMode": false,
- "decimalCount": 2,
- "httpsMode": false,
- "shareBaseUrl": "https://demo.cesium.app/",
- "helptip": {
- "enable": true,
- "installDocUrl": {
- "fr-FR": "https://duniter.fr/wiki/doc/installer/",
- "en": "https://duniter.org/en/wiki/duniter/install/"
- }
- },
- "license": {
- "en": "license/license_g1-en",
- "fr-FR": "license/license_g1-fr-FR",
- "es-ES": "license/license_g1-es-ES",
- "eo-EO": "license/license_g1-eo-EO",
- "ca": "license/license_g1-ca",
- "pt-PT": "license/license_g1-pt-PT",
- "it-IT": "license/license_g1-it-IT",
- "de-DE": "license/license_g1-de-DE"
- },
- "feed": {
- "jsonFeed": {
- "fr-FR": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json",
- "en": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-en.json"
- },
- "maxContentLength": 1300
- },
- "node": {
- "host": "g1.duniter.org",
- "port": 443
- },
- "fallbackNodes": [
- {
- "host": "g1.cgeek.fr",
- "port": 443
},
{
- "host": "g1.librelois.fr",
- "port": 443
- },
- {
- "host": "g1.e-is.pro",
- "port": 443
- },
- {
- "host": "duniter.moul.re",
- "port": 443
- },
- {
- "host": "g1.presles.fr",
- "port": 443
- },
- {
- "host": "g1.le-sou.org",
- "port": 443
- },
- {
- "host": "duniter.normandie-libre.fr",
- "port": 443
- },
- {
- "host": "g1.duniter.org",
+ "host": "g1v1.p2P.legal",
"port": 443
}
],
+ "developers": [
+ {"name": "Benoit Lavenier", "pubkey": "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE"}
+ ],
"plugins":{
"es": {
"enable": true,
@@ -199,6 +93,10 @@
{
"host": "g1.data.mithril.re",
"port": 443
+ },
+ {
+ "host": "g1.data.e-is.pro",
+ "port": 443
}
],
"notifications": {
diff --git a/dist/desktop b/dist/desktop
index 6e01a54b4fd3b6fd3b7a4b708643694ea45edc13..e5b6b4baad35456b9a0a39cd9f875e308fb9bad7 160000
--- a/dist/desktop
+++ b/dist/desktop
@@ -1 +1 @@
-Subproject commit 6e01a54b4fd3b6fd3b7a4b708643694ea45edc13
+Subproject commit e5b6b4baad35456b9a0a39cd9f875e308fb9bad7
diff --git a/resources/android/build/app/build-extras.gradle b/resources/android/build/app/build-extras.gradle
deleted file mode 100644
index 20be010b101db1efd6f0e3ab7ca8da3bda7badb7..0000000000000000000000000000000000000000
--- a/resources/android/build/app/build-extras.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-configurations.all {
- resolutionStrategy {
- //force 'androidx.legacy:legacy-support-v4:1.0.0'
- //force 'androidx.appcompat:appcompat:1.2.0'
- }
-}
-dependencies {
- implementation(project(path: ":CordovaLib")) {
- //exclude group: 'com.android.support', module:'support-v4'
- }
-}
-android {
- //compileSdkVersion=30
-}
diff --git a/resources/android/splash/splashscreen.xml b/resources/android/splash/splashscreen.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b970b789691a419f5a3973144233bb181836f532
--- /dev/null
+++ b/resources/android/splash/splashscreen.xml
@@ -0,0 +1,291 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <group android:scaleX="0.13176"
+ android:scaleY="0.13176"
+ android:translateX="21.06"
+ android:translateY="21.06">
+ <path
+ android:pathData="M390.99,122.28C418.21,157.18 434.92,200.28 441.2,248.24C441.19,276.71 435.71,305.29 425.31,333.28C371.1,416.73 274.95,449.21 167.67,434.28C136.41,416.04 109.01,390.08 86.27,358.02C67.78,323.79 57.94,284.4 56.49,242.06C62.21,199.77 79.62,161.91 106.3,129.62C162.52,85.44 239.03,70.18 321.97,82.52C345.51,92.54 368.66,105.88 390.99,122.28Z"
+ android:fillColor="#FFFFFF"/>
+ <path
+ android:pathData="M324.59,193.42C253.25,304.2 169.63,334.67 69.9,336.41 103.72,398.97 170.29,441.08 246.33,440.09 336.19,438.92 411.25,377.91 434.1,295.46c-1.39,-3.41 -3.21,-7.05 -5.6,-10.94C419.62,272.2 388.77,215.98 324.59,193.42Z"
+ android:strokeAlpha="0.5"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ffd086"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.5"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M325.15,193.01C313.98,258.43 269.08,312.3 279.75,354.31C293.25,407.44 238.77,419.51 194.51,433.92C211.05,438.17 228.43,440.32 246.33,440.09C349.9,438.74 433.81,357.9 440.79,256.35C432.31,253.94 424.15,250.27 418.61,244.08C401.68,225.19 358.22,204.63 325.15,193.01Z"
+ android:strokeAlpha="0.5"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#270b0b"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4969697"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M325.15,193.01C313.98,258.43 269.08,312.3 279.75,354.31C293.25,407.44 238.77,419.51 194.51,433.92C211.05,438.17 228.43,440.32 246.33,440.09C349.9,438.74 433.81,357.9 440.79,256.35C432.31,253.94 424.15,250.27 418.61,244.08C401.68,225.19 358.22,204.63 325.15,193.01Z"
+ android:strokeAlpha="0.5"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#CB8903"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4969695"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M282.69,180.67l12.17,0l0,13.22l-12.17,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fabb37"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M212.74,136.72l11.59,0l0,12.65l-11.59,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#ffd086"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M238.53,145.83l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fabb37"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M237.68,259.52l24.24,0l0,24.24l-24.24,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fbc14c"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M240.39,168.03l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fabb37"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M266.3,235.13l12.65,0l0,13.7l-12.65,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#cc8902"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M291.24,210.5l9.48,0l0,9.48l-9.48,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fabb37"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M257.07,213.16l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fabb37"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M195.22,294.95l20.02,0l0,21.08l-20.02,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fbc14c"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M214.18,264.4l13.7,0l0,15.81l-13.7,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#fbc14c"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M243.16,237.52l-12.69,0l-0,12.65l12.69,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#cc8902"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M270.34,192.67l10.54,0l0,11.59l-10.54,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#ffd086"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M280.22,163.07l-12.69,0l-0,12.65l12.69,0z"
+ android:strokeAlpha="0.99607843"
+ android:strokeWidth="18.07"
+ android:fillColor="#cc8902"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M324.59,193.42C253.25,304.2 169.63,334.67 69.9,336.41 103.72,398.97 170.29,441.08 246.33,440.09 336.19,438.92 411.25,377.91 434.1,295.46c-1.39,-3.41 -3.21,-7.05 -5.6,-10.94C419.62,272.2 388.77,215.98 324.59,193.42Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1.22"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF7A00"
+ android:fillType="evenOdd"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M325.15,193.01C313.98,258.43 269.08,312.3 279.75,354.31C293.25,407.44 238.77,419.51 194.51,433.92C211.05,438.17 228.43,440.32 246.33,440.09C349.9,438.74 433.81,357.9 440.79,256.35C432.31,253.94 424.15,250.27 418.61,244.08C401.68,225.19 358.22,204.63 325.15,193.01Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1.22"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF7A00"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.993939"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M325.15,193.01C313.98,258.43 269.08,312.3 279.75,354.31C293.25,407.44 238.77,419.51 194.51,433.92C211.05,438.17 228.43,440.32 246.33,440.09C349.9,438.74 433.81,357.9 440.79,256.35C432.31,253.94 424.15,250.27 418.61,244.08C401.68,225.19 358.22,204.63 325.15,193.01Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1.22"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF7A00"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.993939"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M266.14,38.46C265.06,38.16 263.98,37.87 262.89,37.58C228.32,28.5 193.55,26.83 160.25,31.59C374.63,22.72 466.78,173.24 439.31,353.41L448.18,354.83C474.18,190.78 402.95,76.25 266.14,38.46Z"
+ android:strokeAlpha="0.78"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.78"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M56.03,323.9C56.23,325 56.44,326.1 56.66,327.2C63.6,362.26 77.29,394.27 96.11,422.14C-5.53,233.18 89.61,84.53 263.67,30.53L261.07,21.93C102.15,70.22 30.25,184.32 56.03,323.9Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M389.87,100.01C389.17,99.13 388.47,98.26 387.77,97.39C365.23,69.64 338.16,47.76 308.48,31.93C486.7,151.39 472.15,327.28 343.56,456.43L349.89,462.81C467.76,345.8 477.93,211.31 389.87,100.01Z"
+ android:strokeAlpha="0.4"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M336.1,461.47C337.19,461.24 338.29,461 339.38,460.76C374.27,452.98 405.94,438.52 433.35,419.03C246.89,525.18 95.99,433.65 37.82,260.94L29.29,263.74C81.38,421.45 197.19,490.59 336.1,461.47Z"
+ android:strokeAlpha="0.84"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.84"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M27.33,237.68C26.96,238.73 26.58,239.79 26.22,240.85C14.56,274.64 10.29,309.19 12.52,342.75C19.8,128.32 176.83,47.74 354.42,88.69L356.5,79.94C194.87,41.69 75.31,104.1 27.33,237.68Z"
+ android:strokeAlpha="0.4"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M454.96,190.72C454.78,189.62 454.59,188.51 454.39,187.41C448.03,152.24 434.87,120 416.51,91.83C515.01,282.44 417.42,429.5 242.48,480.61L244.94,489.26C404.64,443.6 478.43,330.7 454.96,190.72Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M209.13,466.55C210.17,466.96 211.21,467.36 212.26,467.75C245.73,480.32 280.15,485.53 313.75,484.2C99.6,471.12 23.31,311.96 69.06,135.55L60.38,133.23C17.75,293.76 76.9,414.98 209.13,466.55Z"
+ android:strokeAlpha="0.4"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M63.73,120.32C62.89,121.06 62.06,121.81 61.22,122.56C34.72,146.54 14.3,174.74 0.08,205.22C109.88,20.89 286.3,26.04 422.11,147.57L428.15,140.91C305.02,29.44 170.18,26.45 63.73,120.32Z"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M454.1,283.08C454.5,282.03 454.89,280.98 455.28,279.93C467.58,246.37 472.52,211.9 470.92,178.31C459.53,392.57 300.99,470.13 124.22,425.78L121.97,434.48C282.84,475.83 403.58,415.72 454.1,283.08Z"
+ android:strokeAlpha="0.4"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#40B2FF"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="0.4"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M254.38,72.68L254.38,100.08C254.1,100.08 253.82,100.08 253.54,100.08C252.06,100.08 250.59,100.1 249.13,100.14L249.13,72.68ZM412.91,252.64L435.5,252.64L435.5,257.88L413.04,257.88C413.03,256.14 412.98,254.39 412.91,252.64ZM254.38,418.61L254.38,437.84L249.13,437.84L249.13,418.56C250.6,418.6 252.07,418.62 253.54,418.62C253.82,418.62 254.1,418.62 254.38,418.61ZM94.05,257.88L70.34,257.88L70.34,252.64L94.19,252.64C94.11,254.38 94.06,256.13 94.05,257.88Z"
+ android:fillColor="#402800"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M344.19,97.81L324.35,132.18C323.6,131.76 322.85,131.35 322.09,130.94L341.96,96.52ZM376.66,181.7L409.26,162.88L410.55,165.11L378.01,183.89C377.57,183.16 377.11,182.43 376.66,181.7ZM381.52,328.7L410.55,345.46L409.26,347.69L380.27,330.95C380.69,330.2 381.11,329.45 381.52,328.7ZM327.98,384.68L344.19,412.76L341.96,414.04L325.76,385.98C326.5,385.55 327.24,385.12 327.98,384.68ZM178.81,384.26L161.61,414.04L159.38,412.76L176.61,382.92C177.34,383.37 178.07,383.81 178.81,384.26ZM125.96,329.42L94.31,347.69L93.03,345.46L124.73,327.15C125.13,327.91 125.54,328.66 125.96,329.42ZM128.17,185.4L93.03,165.11L94.31,162.88L129.5,183.19C129.05,183.92 128.61,184.66 128.17,185.4ZM179.99,133.49L159.38,97.81L161.61,96.52L182.22,132.21C181.47,132.63 180.73,133.06 179.99,133.49Z"
+ android:fillColor="#402800"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M57.77,128.85l12.17,0l0,13.22l-12.17,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M251.72,18.74l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M411.91,131.1l24.24,0l0,24.24l-24.24,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M117.25,422.86l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M341.23,451.63l12.65,0l0,13.7l-12.65,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M437.64,343.09l15.81,0l0,15.81l-15.81,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M236.58,475.23l20.02,0l0,21.08l-20.02,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M39.7,256.15l-12.69,0l-0,12.65l12.69,0z"
+ android:strokeAlpha="0.996078"
+ android:strokeWidth="21.23"
+ android:fillColor="#5096C8"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M154.53,230.66C148.8,230.66 144.28,232.57 140.96,236.38C137.65,240.2 135.99,245.42 135.99,252.05C135.99,258.86 137.59,264.13 140.79,267.85C143.98,271.57 148.54,273.43 154.45,273.43C158.09,273.43 162.23,272.77 166.89,271.47L166.89,276.78C163.28,278.13 158.82,278.81 153.53,278.81C145.85,278.81 139.93,276.48 135.76,271.83C131.59,267.17 129.5,260.55 129.5,251.97C129.5,246.6 130.51,241.9 132.52,237.86C134.53,233.82 137.42,230.71 141.21,228.52C145,226.34 149.46,225.25 154.59,225.25C160.06,225.25 164.84,226.24 168.92,228.24L166.36,233.44C162.41,231.59 158.47,230.66 154.53,230.66ZM193.47,278.81C187.69,278.81 183.14,277.05 179.8,273.54C176.46,270.02 174.79,265.14 174.79,258.89C174.79,252.59 176.34,247.59 179.44,243.88C182.54,240.18 186.71,238.32 191.93,238.32C196.83,238.32 200.7,239.93 203.55,243.15C206.4,246.37 207.83,250.62 207.83,255.9L207.83,259.64L180.93,259.64C181.04,264.22 182.2,267.7 184.4,270.08C186.6,272.46 189.69,273.65 193.68,273.65C197.88,273.65 202.04,272.76 206.15,271.01L206.15,276.28C204.06,277.18 202.08,277.83 200.22,278.23C198.36,278.61 196.11,278.81 193.47,278.81M191.86,243.27C188.73,243.27 186.23,244.3 184.36,246.34C182.5,248.38 181.4,251.21 181.07,254.83L201.49,254.83C201.49,251.1 200.66,248.24 198.99,246.26C197.33,244.27 194.95,243.27 191.86,243.27ZM242.76,267.44C242.76,271.08 241.4,273.88 238.7,275.85C235.99,277.82 232.18,278.81 227.29,278.81C222.11,278.81 218.07,277.99 215.17,276.35L215.17,270.87C217.05,271.82 219.06,272.56 221.21,273.11C223.36,273.65 225.43,273.92 227.43,273.92C230.52,273.92 232.9,273.43 234.56,272.45C236.22,271.46 237.05,269.96 237.05,267.94C237.05,266.42 236.39,265.12 235.08,264.04C233.76,262.96 231.18,261.68 227.36,260.21C223.73,258.85 221.14,257.67 219.61,256.66C218.07,255.65 216.93,254.51 216.19,253.22C215.44,251.94 215.06,250.41 215.06,248.62C215.06,245.44 216.36,242.93 218.95,241.09C221.54,239.24 225.09,238.32 229.61,238.32C233.81,238.32 237.92,239.18 241.94,240.89L239.83,245.7C235.91,244.08 232.36,243.27 229.18,243.27C226.37,243.27 224.26,243.71 222.83,244.59C221.41,245.48 220.7,246.69 220.7,248.23C220.7,249.28 220.96,250.17 221.5,250.9C222.04,251.64 222.9,252.34 224.09,253.01C225.27,253.67 227.55,254.64 230.93,255.9C235.56,257.58 238.68,259.28 240.31,260.99C241.94,262.7 242.76,264.85 242.76,267.44ZM257.99,278.1L252.07,278.1L252.07,239.04L257.99,239.04L257.99,278.1M251.57,228.45C251.57,227.1 251.91,226.11 252.57,225.48C253.24,224.84 254.07,224.53 255.07,224.53C256.02,224.53 256.84,224.85 257.53,225.49C258.22,226.13 258.56,227.12 258.56,228.45C258.56,229.78 258.22,230.77 257.53,231.43C256.84,232.08 256.02,232.4 255.07,232.4C254.07,232.4 253.24,232.08 252.57,231.43C251.91,230.77 251.57,229.78 251.57,228.45ZM275.93,239.04L275.93,264.38C275.93,267.56 276.66,269.93 278.11,271.5C279.56,273.07 281.83,273.86 284.92,273.86C289,273.86 291.99,272.74 293.88,270.51C295.77,268.27 296.71,264.63 296.71,259.56L296.71,239.04L302.63,239.04L302.63,278.1L297.74,278.1L296.89,272.86L296.57,272.86C295.36,274.78 293.68,276.25 291.53,277.28C289.38,278.3 286.93,278.81 284.17,278.81C279.42,278.81 275.86,277.68 273.49,275.43C271.13,273.17 269.95,269.56 269.95,264.59L269.95,239.04L275.93,239.04ZM364.57,278.1L364.57,252.68C364.57,249.57 363.91,247.24 362.58,245.68C361.25,244.13 359.18,243.35 356.37,243.35C352.69,243.35 349.97,244.41 348.21,246.52C346.45,248.64 345.58,251.89 345.58,256.29L345.58,278.1L339.66,278.1L339.66,252.68C339.66,249.57 338.99,247.24 337.66,245.68C336.33,244.13 334.26,243.35 331.43,243.35C327.72,243.35 325.01,244.46 323.28,246.68C321.56,248.9 320.7,252.55 320.7,257.61L320.7,278.1L314.78,278.1L314.78,239.04L319.59,239.04L320.55,244.38L320.84,244.38C321.96,242.48 323.54,241 325.57,239.93C327.6,238.86 329.87,238.32 332.39,238.32C338.5,238.32 342.49,240.53 344.37,244.95L344.65,244.95C345.82,242.91 347.5,241.29 349.71,240.11C351.92,238.92 354.44,238.32 357.27,238.32C361.68,238.32 364.99,239.46 367.19,241.73C369.39,244 370.48,247.63 370.48,252.62L370.48,278.1L364.57,278.1Z"
+ android:fillColor="#402800"/>
+ </group>
+</vector>
diff --git a/scripts/release-android-sign.sh b/scripts/release-android-sign.sh
index 41be37a31a4644ba741c6566c00aa050e86fb86c..50a497e718cc07163a36c67b64659edeb9a66cd4 100755
--- a/scripts/release-android-sign.sh
+++ b/scripts/release-android-sign.sh
@@ -22,6 +22,7 @@ APK_FILE_ALTERNATIVE=${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-
cd ${PROJECT_DIR}
+
# Checking files
echo "Checking keystore file..."
if [[ ! -f "${KEYSTORE_FILE}" ]]; then
@@ -39,6 +40,8 @@ if [[ ! -f "${APK_UNSIGNED_FILE}" ]]; then
APK_UNSIGNED_FILE=${APK_FILE_ALTERNATIVE}
fi
+echo "--- Signing Android APK..."
+
# Remove previous version (only if unsigned exists)
if [[ -f "${APK_SIGNED_FILE}" ]]; then
echo "Delete previous signed APK file: ${APK_SIGNED_FILE}"
@@ -72,5 +75,4 @@ echo "Verify APK signature..."
[[ $? -ne 0 ]] && exit 1
echo "Verify APK signature [OK]"
-echo "Successfully generated signed APK at: ${APK_SIGNED_FILE}"
-exit 0
+echo "--- Successfully generated signed APK at: ${APK_SIGNED_FILE}"
diff --git a/scripts/release-to-github.sh b/scripts/release-to-github.sh
index deae934369aab322203a008292276ee9969023c6..26cabca18c3e3bea11dc6d41160a38380fb52082 100755
--- a/scripts/release-to-github.sh
+++ b/scripts/release-to-github.sh
@@ -26,7 +26,6 @@ if [[ "_$current" == "_" ]]; then
echo " - Check version format is: x.y.z (x and y should be an integer)"
exit 1
fi
-echo "Sending v$current extension to Github..."
### get auth token
if [[ "_${GITHUB_TOKEN}" == "_" ]]; then
@@ -49,7 +48,7 @@ case "$1" in
result=$(curl -i "$REPO_API_URL/releases/tags/v$current")
release_url=$(echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "$REPO_API_URL/releases/\d+")
if [[ $release_url != "" ]]; then
- echo "Deleting existing release..."
+ echo "--- Deleting existing release..."
curl -H 'Authorization: token $GITHUB_TOKEN' -XDELETE $release_url
fi
exit 0;
@@ -57,12 +56,12 @@ case "$1" in
pre)
prerelease="true"
- echo "Creating new pre-release v$current..."
+ echo "--- Creating new pre-release v$current..."
;;
rel)
prerelease="false"
- echo "Creating new release v$current..."
+ echo "--- Creating new release v$current..."
;;
*)
echo "No task given, or wrong arguments"
@@ -84,7 +83,7 @@ fi
result=$(curl -s -H ''"$GITHUT_AUTH"'' "$REPO_API_URL/releases/tags/v$current")
release_url=$(echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://[A-Za-z0-9/.-]+/releases/\d+")
if [[ "_$release_url" != "_" ]]; then
- echo "Deleting existing release... $release_url"
+ echo "--- Deleting existing release... $release_url"
result=$(curl -H ''"$GITHUT_AUTH"'' -s -XDELETE $release_url)
if [[ "_$result" != "_" ]]; then
error_message=$(echo "$result" | grep -P "\"message\": \"[^\"]+" | grep -oP ": \"[^\"]+\"")
@@ -95,7 +94,11 @@ else
echo "Release not exists yet on github."
fi
-echo "Creating new release..."
+echo "--- Clean previous SHA256 files..."
+rm -rf ${PROJECT_DIR}/dist/**/*.sha256
+echo ""
+
+echo "--- Creating new release..."
echo " - tag: v$current"
echo " - description: $description"
result=$(curl -X POST -H ''"$GITHUT_AUTH"'' -s $REPO_API_URL/releases -d '{"tag_name": "v'"$current"'","target_commitish": "master","name": "'"$current"'","body": "'"$description"'","draft": false,"prerelease": '"$prerelease"'}')
@@ -108,7 +111,7 @@ if [[ "_$upload_url" = "_" ]]; then
fi
### Sending files
-echo "Uploading files to ${upload_url} ..."
+echo "--- Uploading files to ${upload_url} ..."
# Upload web file
WEB_BASENAME="${PROJECT_NAME}-v$current-web.zip"
@@ -174,6 +177,7 @@ else
missing_file=true
fi
+echo ""
if [[ ${missing_file} == true ]]; then
echo "-------------------------------------------"
echo "ERROR: missing some artifacts (see logs)"
diff --git a/scripts/release.sh b/scripts/release.sh
index 15b605e33a071c5693d878c3b5aaa82aad9b0442..f8f0ff7a79bc46c1c90c7ade4dd617af6c5f06ef 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -84,10 +84,7 @@ echo "----------------------------------"
echo "- Compiling sources..."
echo "----------------------------------"
cd ${PROJECT_DIR} || exit 1
-gulp config build --env default_fr || exit 1
-
-echo "Clean previous sha256 files..."
-rm -rf ${PROJECT_DIR}/dist/*.sha256
+gulp config build --env default || exit 1
echo "----------------------------------"
echo "- Building Android artifact..."