diff --git a/public/img/icon-advanced.svg b/public/img/icon-advanced.svg new file mode 100644 index 000000000..61e9403cb --- /dev/null +++ b/public/img/icon-advanced.svg @@ -0,0 +1,16 @@ + + + + 59625EA8-8AF4-43EC-AEF5-596F03BE3707 + Created with sketchtool. + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-heart.svg b/public/img/icon-heart.svg new file mode 100644 index 000000000..ced8b8ff7 --- /dev/null +++ b/public/img/icon-heart.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-help-support.svg b/public/img/icon-help-support.svg new file mode 100644 index 000000000..6bcd372eb --- /dev/null +++ b/public/img/icon-help-support.svg @@ -0,0 +1,18 @@ + + + + 8BB4F43E-0712-4B4C-892E-C26DCD0E1646 + Created with sketchtool. + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-link.svg b/public/img/icon-link.svg new file mode 100644 index 000000000..38d3e8cb0 --- /dev/null +++ b/public/img/icon-link.svg @@ -0,0 +1,18 @@ + + + + 6ACA215E-2C9D-419C-9E24-5CC78D09C2EA + Created with sketchtool. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 52dd02e5a..2981745ca 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, uxLanguage, platformInfo, profileService, feeService, configService) { +angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService) { var updateConfig = function() { @@ -24,6 +24,10 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.wallets = profileService.getWallets(); }; + $scope.openExternalLink = function(url, target) { + externalLinkService.open(url, target); + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { updateConfig(); }); diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 64085a563..9443e05b0 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -19,6 +19,15 @@ border-radius: 0; box-shadow: none; } + &.circle{ + left:8px; + .bg { + border-radius: 50%; + width:30px; + height:30px; + padding:.1rem; + } + } } &:before { display: block; diff --git a/www/img/icon-send-feedback.svg b/www/img/icon-send-feedback.svg index 3223c60bb..1fc621c07 100644 --- a/www/img/icon-send-feedback.svg +++ b/www/img/icon-send-feedback.svg @@ -1,14 +1,21 @@ - + - C327FD1B-B044-4367-BB49-9491E30599E8 + 8A36B580-8A7A-4989-BE8C-FD9BAD98D91C Created with sketchtool. - - + + - + + + + + + + + diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 351e17844..f8928315e 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -6,6 +6,13 @@
+ + + + + Bitcoin Exchanges + + @@ -13,6 +20,13 @@ Address Book + + + + + Send Feedback + +
Preferences
@@ -67,12 +81,21 @@ + + + + + Advanced + + -
Wallets Preferences
+
Wallets & Integrations
- + + + {{item.name || item.id}} {{item.m}}-of-{{item.n}} @@ -83,12 +106,6 @@ -
- - Advanced - - -
@@ -97,6 +114,25 @@ About {{appName}} + + + + + Tell a friend + + + +
+ + + + + Help & Support + + + + +