diff --git a/resources/README.md b/resources/README.md new file mode 100644 index 0000000000000000000000000000000000000000..46c696e2a80317c1b96a2201c973de2e867e81de --- /dev/null +++ b/resources/README.md @@ -0,0 +1,8 @@ +These are Cordova resources. You can replace icon.png and splash.png and run +`ionic cordova resources` to generate custom icons and splash screens for your +app. See `ionic cordova resources --help` for details. + +Cordova reference documentation: + +- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html +- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/ diff --git a/resources/android/xml/network_security_config.xml b/resources/android/xml/network_security_config.xml new file mode 100644 index 0000000000000000000000000000000000000000..de61259aac8f4a9c2ddceb7972529ad2490f60f7 --- /dev/null +++ b/resources/android/xml/network_security_config.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <domain-config cleartextTrafficPermitted="true"> + <domain includeSubdomains="true">localhost</domain> + </domain-config> +</network-security-config> diff --git a/resources/firefoxos/icon/logo_128px.png b/resources/firefoxos/icon/logo_128px.png deleted file mode 100644 index 295d17aff561b02c0841edc3656453bd874fd9fb..0000000000000000000000000000000000000000 Binary files a/resources/firefoxos/icon/logo_128px.png and /dev/null differ diff --git a/resources/firefoxos/icon/logo_60px.png b/resources/firefoxos/icon/logo_60px.png deleted file mode 100644 index 9a284d5d8ea2ed6a2013fadf6b5724d7729c6b0e..0000000000000000000000000000000000000000 Binary files a/resources/firefoxos/icon/logo_60px.png and /dev/null differ diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png new file mode 100644 index 0000000000000000000000000000000000000000..be633f451ad30e396a638d97a013c4d93de43e1e Binary files /dev/null and b/resources/ios/icon/icon-1024.png differ diff --git a/resources/ios/icon/icon-20.png b/resources/ios/icon/icon-20.png new file mode 100644 index 0000000000000000000000000000000000000000..08993e093ac99df8aa2adf807f3c2b1a6b6b20d4 Binary files /dev/null and b/resources/ios/icon/icon-20.png differ diff --git a/resources/ios/icon/icon-20@2x.png b/resources/ios/icon/icon-20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..acbecd2cbde8406351e09fd3a50cf74f5a242900 Binary files /dev/null and b/resources/ios/icon/icon-20@2x.png differ diff --git a/resources/ios/icon/icon-20@3x.png b/resources/ios/icon/icon-20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..00de715c2e2284ee55b47577fb55993893eff6c3 Binary files /dev/null and b/resources/ios/icon/icon-20@3x.png differ diff --git a/resources/ios/icon/icon-24@2x.png b/resources/ios/icon/icon-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4b455d317a5be633643484260d0b46d393b13312 Binary files /dev/null and b/resources/ios/icon/icon-24@2x.png differ diff --git a/resources/ios/icon/icon-27.5@2x.png b/resources/ios/icon/icon-27.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c623f279e68a05b52f13e846a2dc7745acfa0bdf Binary files /dev/null and b/resources/ios/icon/icon-27.5@2x.png differ diff --git a/resources/ios/icon/icon-29.png b/resources/ios/icon/icon-29.png new file mode 100644 index 0000000000000000000000000000000000000000..8a55da53c19347340d87171598917b40107247fb Binary files /dev/null and b/resources/ios/icon/icon-29.png differ diff --git a/resources/ios/icon/icon-29@2x.png b/resources/ios/icon/icon-29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..185277b1abae0de1b59e0a8e5aaa8a33d5c185f5 Binary files /dev/null and b/resources/ios/icon/icon-29@2x.png differ diff --git a/resources/ios/icon/icon-29@3x.png b/resources/ios/icon/icon-29@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3393f844d61aaabdb5dd06f29ea37e9630460a8f Binary files /dev/null and b/resources/ios/icon/icon-29@3x.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png new file mode 100644 index 0000000000000000000000000000000000000000..acbecd2cbde8406351e09fd3a50cf74f5a242900 Binary files /dev/null and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..61d82a739fbae4b3f046103e7c549aa2f4f821ef Binary files /dev/null and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cc349ded17a3c1e16602d48df3f9dfb69dfe1c67 Binary files /dev/null and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-44@2x.png b/resources/ios/icon/icon-44@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..00a2ff3d61ef5218e3c5c54ae96bc7edd345774a Binary files /dev/null and b/resources/ios/icon/icon-44@2x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png new file mode 100644 index 0000000000000000000000000000000000000000..9e9a5c1f5afdf33d3a0284af2738674accf69307 Binary files /dev/null and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe547b12615fa2c85bf1bed94af47f833b8e4917 Binary files /dev/null and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png new file mode 100644 index 0000000000000000000000000000000000000000..00de715c2e2284ee55b47577fb55993893eff6c3 Binary files /dev/null and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cc349ded17a3c1e16602d48df3f9dfb69dfe1c67 Binary files /dev/null and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..389882810121b13e88d0c5258017c38baff9b34b Binary files /dev/null and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png new file mode 100644 index 0000000000000000000000000000000000000000..3f84fc1b2b36263e0eef1f0a9d23269b873ab613 Binary files /dev/null and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..391b4af13a2b8f878c1db28ff3cfc6ba708dfec0 Binary files /dev/null and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png new file mode 100644 index 0000000000000000000000000000000000000000..971034a67bdf6eea74bf2915088302ec9d89d2f2 Binary files /dev/null and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b538930a7d69623e8a3982bcc6a2afa05c09ccb6 Binary files /dev/null and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8dbb2f66859e533d4ab0f71b380d87e6f7e647 Binary files /dev/null and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-86@2x.png b/resources/ios/icon/icon-86@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9798fc2d9d11d4b924ce3fc24a14f91b8d3fa4b7 Binary files /dev/null and b/resources/ios/icon/icon-86@2x.png differ diff --git a/resources/ios/icon/icon-98@2x.png b/resources/ios/icon/icon-98@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5ebd9db699592f559fe1e2d5cfeda7b8d8097d48 Binary files /dev/null and b/resources/ios/icon/icon-98@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png new file mode 100644 index 0000000000000000000000000000000000000000..8a55da53c19347340d87171598917b40107247fb Binary files /dev/null and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..185277b1abae0de1b59e0a8e5aaa8a33d5c185f5 Binary files /dev/null and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3393f844d61aaabdb5dd06f29ea37e9630460a8f Binary files /dev/null and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a90d46c829663a3501d257761fa67275ec73a0f3 Binary files /dev/null and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..946c6cefe08fad11f331c0cc5f411bb36f063c4e Binary files /dev/null and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ubuntu/img/logo_57px.png b/resources/ubuntu/img/logo_57px.png deleted file mode 100644 index 4adb392cbe5cf91b106c79dd1fd341fa2d0aeee7..0000000000000000000000000000000000000000 Binary files a/resources/ubuntu/img/logo_57px.png and /dev/null differ diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000000000000000000000000000000000..a90ebd8ae0b03af7f06e302c2eeda05840928f47 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,188 @@ +#!/bin/bash + +# Get to the root project +if [[ "_" == "_${PROJECT_DIR}" ]]; then + SCRIPT_DIR=$(dirname $0) + PROJECT_DIR=$(cd ${SCRIPT_DIR}/.. && pwd) + export PROJECT_DIR +fi; + +cd ${PROJECT_DIR} + + +### Control that the script is run on `dev` branch +branch=$(git rev-parse --abbrev-ref HEAD) +if [[ ! "$branch" == "master" ]]; +then + echo ">> This script must be run under \`master\` branch" + exit 1 +fi + +### Get current version (package.json) +current=$(grep -oP "version\": \"\d+.\d+.\d+((a|b)[0-9]+)?" package.json | grep -m 1 -oP "\d+.\d+.\d+((a|b)[0-9]+)?") +if [[ "_$current" == "_" ]]; then + echo "Unable to read the current version in 'package.json'. Please check version format is: x.y.z (x and y should be an integer)." + exit 1; +fi +echo "Current version: $current" + +### Get current version for Android +currentAndroid=$(grep -oP "android-versionCode=\"[0-9]+\"" config.xml | grep -oP "\d+") +if [[ "_$currentAndroid" == "_" ]]; then + echo "Unable to read the current Android version in 'config.xml'. Please check version format is an integer." + exit 1; +fi +echo "Current Android version: $currentAndroid" + +# Check version format +if [[ ! $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ || ! $3 =~ ^[0-9]+$ ]]; then + echo "Wrong version format" + echo "Usage:" + echo " > ./release.sh [pre|rel] <version> <android-version> <release_description>" + echo "with:" + echo " - pre: use for pre-release" + echo " - rel: for full release" + echo " - version: x.y.z" + echo " - android-version: nnn" + echo " - release_description: a comment on release" + exit 1 +fi + +echo "new build version: $2" +echo "new build android version: $3" +case "$1" in + rel|pre) + # Change the version in files: 'package.json' and 'config.xml' + sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json + currentConfigXmlVersion=$(grep -oP "version=\"\d+.\d+.\d+((a|b)[0-9]+)?\"" config.xml | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?") + sed -i "s/ version=\"$currentConfigXmlVersion\"/ version=\"$2\"/g" config.xml + sed -i "s/ android-versionCode=\"$currentAndroid\"/ android-versionCode=\"$3\"/g" config.xml + + # Change version in file: 'www/manifest.json' + currentManifestJsonVersion=$(grep -oP "version\": \"\d+.\d+.\d+((a|b)[0-9]+)?\"" www/manifest.json | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?") + sed -i "s/version\": \"$currentManifestJsonVersion\"/version\": \"$2\"/g" www/manifest.json + + # Bump the install.sh + sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh + ;; + *) + echo "No task given" + exit 1 + ;; +esac + + +# Preparing Android environment +. ${PROJECT_DIR}/scripts/env-global.sh +if [[ $? -ne 0 ]]; then + exit 1 +fi + + +echo "----------------------------------" +echo "- Compiling sources..." +echo "----------------------------------" +# Update config file +gulp config --env default_fr +# Compile +gulp build + +echo "----------------------------------" +echo "- Building Android artifact..." +echo "----------------------------------" + + +. scripts/build-android.sh --release +if [[ $? -ne 0 ]]; then + exit 1 +fi + + +echo "----------------------------------" +echo "- Building web artifact..." +echo "----------------------------------" + +# Update config file +gulp config --env default +gulp webBuild --release +if [[ $? -ne 0 ]]; then + exit 1 +fi + +echo "----------------------------------" +echo "- Executing git push, with tag: v$2" +echo "----------------------------------" + +# Commit +cd ${PROJECT_DIR} +git reset HEAD +git add package.json config.xml install.sh www/js/config.js www/manifest.json +if [[ $? -ne 0 ]]; then + exit 1 +fi +git commit -m "v$2" && git tag "v$2" && git push +if [[ $? -ne 0 ]]; then + exit 1 +fi + +# Commit android project +cd ${PROJECT_DIR}/platforms/android +git reset HEAD +git add -A +git commit -m "v$2" && git tag "v$2" && git push +if [[ $? -ne 0 ]]; then + exit 1 +fi + +# Pause (wait propagation to from git.duniter.org to github) +echo " Waiting 40s, for propagation to github..." +sleep 40s + +description="$4" +if [[ "_$description" == "_" ]]; then + description="Release v$2" +fi + +echo "**********************************" +echo "* Uploading artifacts to Github..." +echo "**********************************" + +./github.sh $1 ''"$description"'' +if [[ $? -ne 0 ]]; then + exit 1 +fi + +echo "----------------------------------" +echo "- Building desktop artifacts..." +echo "----------------------------------" + +git submodule init && git submodule sync && git submodule update --remote --merge +if [[ $? -ne 0 ]]; then + echo "Unable to sync git submodule. Could not build desktop version" + exit 1 +fi + +if [[ -d "${PROJECT_DIR}/dist/desktop" ]]; then + cd "${PROJECT_DIR}/dist/desktop" + + # Fetch last updates + git fetch origin && git merge origin/master || exit 1 + + # Build desktop assets + ./release.sh $2 + if [[ $? -ne 0 ]]; then + exit 1 + fi +else + echo "ERROR: dist/desktop not found -> Make sure git submodule has been init!" + exit 1 +fi; + +# back to nodejs version 6 +cd ${PROJECT_DIR} +nvm use ${NODEJS_VERSION} + +echo "**********************************" +echo "* Build release succeed !" +echo "**********************************" + diff --git a/www/img/loader.gif b/www/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3ef195d52dad8449e21eb58817dcb3ae8a9ba73 Binary files /dev/null and b/www/img/loader.gif differ diff --git a/www/img/search-icon-mobile.png b/www/img/search-icon-mobile.png new file mode 100644 index 0000000000000000000000000000000000000000..920fa27585cee993fe284a272c38f1a5a724cc09 Binary files /dev/null and b/www/img/search-icon-mobile.png differ