From 40111e699372d8136b0b6b2a0be5e78a8b165d66 Mon Sep 17 00:00:00 2001 From: arnaucode Date: Sun, 18 Feb 2018 16:26:08 +0100 Subject: [PATCH] open telegram link to user, resizing faircoin qr address to 300x300pixels, changed travel icon, copy faircoin address string --- config.xml | 1 + package-lock.json | 5 +++++ package.json | 4 +++- version.md | 12 ++++++++++++ www/js/editUser.js | 4 ++-- www/js/user.js | 5 +++++ www/templates/editUser.html | 9 +++++---- www/templates/main.html | 2 +- www/templates/menu.html | 2 +- www/templates/travelListTemplate.html | 1 + www/templates/user.html | 9 +++++---- 11 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 version.md diff --git a/config.xml b/config.xml index ee9ef37..b1935f2 100755 --- a/config.xml +++ b/config.xml @@ -48,5 +48,6 @@ + diff --git a/package-lock.json b/package-lock.json index 711a9d1..8139587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -750,6 +750,11 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.7.tgz", "integrity": "sha1-/JQRG+aTJijGaGiTjd89yCyfv+Y=" }, + "cordova-plugin-inappbrowser": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-2.0.2.tgz", + "integrity": "sha1-pEj8vpdMprQpiL00VRCdkj1sl2k=" + }, "cordova-plugin-splashscreen": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-4.0.3.tgz", diff --git a/package.json b/package.json index ca72d52..84e13e6 100755 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "cordova-plugin-camera": "^4.0.2", "cordova-plugin-console": "^1.0.7", "cordova-plugin-device": "^1.1.7", + "cordova-plugin-inappbrowser": "^2.0.2", "cordova-plugin-splashscreen": "^4.0.3", "cordova-plugin-whitelist": "^1.3.3", "gulp": "^3.5.6", @@ -37,7 +38,8 @@ "cordova-plugin-splashscreen": {}, "cordova-plugin-console": {}, "ionic-plugin-keyboard": {}, - "cordova-plugin-camera": {} + "cordova-plugin-camera": {}, + "cordova-plugin-inappbrowser": {} }, "platforms": [ "android" diff --git a/version.md b/version.md new file mode 100644 index 0000000..992de65 --- /dev/null +++ b/version.md @@ -0,0 +1,12 @@ + +### commonroutes-prealpha02 +18 Feb 2018 update +- resizing faircoin qr address to 300x300 pixels +- open telegram link to user +- changed travel icon +- made more easy to copy the faircoin address + + +### commonroutes-prealpha01 +14 Feb 2018 +- first prealpha version diff --git a/www/js/editUser.js b/www/js/editUser.js index 6ee6947..8bc5d84 100755 --- a/www/js/editUser.js +++ b/www/js/editUser.js @@ -41,8 +41,8 @@ angular.module('app.editUser', ['pascalprecht.translate']) sourceType: Camera.PictureSourceType.PHOTOLIBRARY, allowEdit: true, encodingType: Camera.EncodingType.JPEG, - targetWidth: 100, - targetHeight: 100, + targetWidth: 300, + targetHeight: 300, popoverOptions: CameraPopoverOptions, saveToPhotoAlbum: false, correctOrientation:true diff --git a/www/js/user.js b/www/js/user.js index 083033d..06c309d 100755 --- a/www/js/user.js +++ b/www/js/user.js @@ -187,4 +187,9 @@ angular.module('app.user', ['pascalprecht.translate']) console.log("show image"); $scope.openModal(); }; + + $scope.openTelegram = function(telegramuser) { + window.open('http://telegram.me/' + telegramuser, '_system', 'location=yes'); + return false; + }; }); diff --git a/www/templates/editUser.html b/www/templates/editUser.html index 3544198..b710ca4 100755 --- a/www/templates/editUser.html +++ b/www/templates/editUser.html @@ -28,10 +28,11 @@

-

- -

+ FairCoin Address: +

+ +

diff --git a/www/templates/main.html b/www/templates/main.html index 52b3d6f..0589222 100755 --- a/www/templates/main.html +++ b/www/templates/main.html @@ -18,7 +18,7 @@ {{'Search' | translate }} - + {{'Travels_feed' | translate }} diff --git a/www/templates/menu.html b/www/templates/menu.html index 3f94014..a0c6411 100755 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -55,7 +55,7 @@ {{'Search' | translate }} - {{'Travels_feed' | translate }} + {{'Travels_feed' | translate }} {{'Users' | translate }} diff --git a/www/templates/travelListTemplate.html b/www/templates/travelListTemplate.html index 61e34c8..8986038 100755 --- a/www/templates/travelListTemplate.html +++ b/www/templates/travelListTemplate.html @@ -9,6 +9,7 @@
{{travel.date | date:"dd/MM"}}
{{travel.date | date:"HH:mm"}}h
+
{{travel.joins.length}}/{{travel.seats}} seats

{{travel.from.name}} diff --git a/www/templates/user.html b/www/templates/user.html index 4bc1ecc..5fd65a0 100755 --- a/www/templates/user.html +++ b/www/templates/user.html @@ -27,7 +27,7 @@

-

- {{user.faircoinString}} -

+ FairCoin Address: +