From 36865464fb0329e11cabcf88d075ed6c09a746e5 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Tue, 24 Jan 2017 17:13:22 -0300 Subject: [PATCH 1/3] update available for desktop --- src/sass/views/tab-home.scss | 30 ++++++++++++++++++------------ www/img/icon-update.svg | 14 ++++++++++++++ www/views/tab-home.html | 13 +++++++++++-- 3 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 www/img/icon-update.svg diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 6fd937188..6ebeddedd 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -121,18 +121,24 @@ } } .release { - cursor: pointer; - cursor: hand; - background-color: #E9E9EC; - padding-top: 30px; - padding-bottom: 20px; - text-align: center; - color: #444; - i { - margin-top: 1px; - font-size: 20px; - margin-left: 10px; - position: absolute; + text-align: center; + .item { + width: 100%; + } + .title { + font-weight: 700; + color: #444; + } + .button { + width: 100%; + border: none; + } + .big-icon-svg { + > .bg { + box-shadow: none; + } + padding-top: 2rem; + padding-bottom: 0; } } diff --git a/www/img/icon-update.svg b/www/img/icon-update.svg new file mode 100644 index 000000000..feabc1572 --- /dev/null +++ b/www/img/icon-update.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 909c332d4..16bbfedee 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -10,9 +10,18 @@ spinner="ios-small" on-refresh="onRefresh()"> -
- An update to this app is available +
+ + + + +
Update available
+ +
+ Download +
+
From e871c124085fc8ac9c3952a6274c45124b604326 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Wed, 25 Jan 2017 09:40:31 -0300 Subject: [PATCH 2/3] update app name --- src/js/controllers/tab-home.js | 8 +++++--- www/views/tab-home.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index dcd495d89..1321878ea 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -32,8 +32,10 @@ angular.module('copayApp.controllers').controller('tabHomeController', $log.warn(err); return; } - - if (newRelease) $scope.newRelease = true; + if (newRelease) { + $scope.newRelease = true; + $scope.updateText = gettextCatalog.getString('There is a new version of ') + $scope.name + gettextCatalog.getString(' available'); + } }); } @@ -213,7 +215,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', walletService.getStatus(wallet, {}, function(err, status) { if (err) { - wallet.error = (err === 'WALLET_NOT_REGISTERED') ? gettextCatalog.getString('Wallet not registered') : bwcError.msg(err); + wallet.error = (err === 'WALLET_NOT_REGISTERED') ? gettextCatalog.getString('Wallet not registered') : bwcError.msg(err); $log.error(err); } else { diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 16bbfedee..6e17a483f 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -15,7 +15,7 @@ -
Update available
+
{{updateText}}
Download From 30f8d602b258118c9de3d542f1c8c954bd924b3c Mon Sep 17 00:00:00 2001 From: JDonadio Date: Thu, 26 Jan 2017 09:26:14 -0300 Subject: [PATCH 3/3] use interpolation --- src/js/controllers/tab-home.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 1321878ea..365b2141d 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -34,7 +34,9 @@ angular.module('copayApp.controllers').controller('tabHomeController', } if (newRelease) { $scope.newRelease = true; - $scope.updateText = gettextCatalog.getString('There is a new version of ') + $scope.name + gettextCatalog.getString(' available'); + $scope.updateText = gettextCatalog.getString('There is a new version of {{appName}} available', { + appName: $scope.name + }); } }); }