move wallet preferences to global settings and show tabs on activity view

This commit is contained in:
Gabriel Bazán 2016-08-31 16:41:53 -03:00
commit 3b419c616a
19 changed files with 256 additions and 238 deletions

View file

@ -10,17 +10,17 @@
<ion-content> <ion-content>
<ion-list> <ion-list>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.create.personal"> <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal">
<h2 translate>Create new wallet</h2> <h2 translate>Create new wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i> <i class="icon ion-chevron-right icon-accessory"></i>
</ion-item> </ion-item>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.join"> <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
<h2 translate>Join shared wallet</h2> <h2 translate>Join shared wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i> <i class="icon ion-chevron-right icon-accessory"></i>
</ion-item> </ion-item>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.import.phrase"> <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
<h2 translate>Import wallet</h2> <h2 translate>Import wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i> <i class="icon ion-chevron-right icon-accessory"></i>
</ion-item> </ion-item>

View file

@ -1,11 +1,11 @@
<ion-view > <ion-view >
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top"> <ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
<ion-tab title="Personal Wallet" ui-sref="add.create.personal"> <ion-tab title="Personal Wallet" ui-sref="tabs.create.personal">
<ion-nav-view name="tab-create-personal"></ion-nav-view> <ion-nav-view name="tab-create-personal"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Shared Wallet" ui-sref="add.create.shared"> <ion-tab title="Shared Wallet" ui-sref="tabs.create.shared">
<ion-nav-view name="tab-create-shared"></ion-nav-view> <ion-nav-view name="tab-create-shared"></ion-nav-view>
</ion-tab> </ion-tab>

View file

@ -1,11 +1,11 @@
<ion-view > <ion-view >
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top"> <ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
<ion-tab title="File/Text" ui-sref="wallet.export.file"> <ion-tab title="File/Text" ui-sref="tabs.preferences.export.file">
<ion-nav-view name="tab-export-file"></ion-nav-view> <ion-nav-view name="tab-export-file"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="QR Code" ui-sref="wallet.export.qrCode"> <ion-tab title="QR Code" ui-sref="tabs.preferences.export.qrCode">
<ion-nav-view name="tab-export-qrCode"></ion-nav-view> <ion-nav-view name="tab-export-qrCode"></ion-nav-view>
</ion-tab> </ion-tab>

View file

@ -1,15 +1,15 @@
<ion-view > <ion-view >
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top"> <ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
<ion-tab title="Recovery Phrare" ui-sref="add.import.phrase"> <ion-tab title="Recovery Phrare" ui-sref="tabs.import.phrase">
<ion-nav-view name="tab-import-phrase"></ion-nav-view> <ion-nav-view name="tab-import-phrase"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="File/Text" ui-sref="add.import.file"> <ion-tab title="File/Text" ui-sref="tabs.import.file">
<ion-nav-view name="tab-import-file"></ion-nav-view> <ion-nav-view name="tab-import-file"></ion-nav-view>
</ion-tab> </ion-tab>
<ion-tab title="Hardware Wallet" ui-sref="add.import.hardware"> <ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
<ion-nav-view name="tab-import-hardware"></ion-nav-view> <ion-nav-view name="tab-import-hardware"></ion-nav-view>
</ion-tab> </ion-tab>

View file

@ -1,7 +1,7 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="add.main"> <button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
@ -133,4 +133,3 @@
</form> </form>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -9,7 +9,7 @@
<div class="item item-divider"> <div class="item item-divider">
Preferences Preferences
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesAlias"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAlias">
<span translate>Wallet Name</span> <span translate>Wallet Name</span>
<span class="item-note"> <span class="item-note">
{{alias||wallet.walletName}} {{alias||wallet.walletName}}
@ -28,7 +28,7 @@
{{wallet.externalSource}} {{wallet.externalSource}}
</span> </span>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesColor"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesColor">
<span ng-style="{'color': wallet.color}">&block;</span> <span ng-style="{'color': wallet.color}">&block;</span>
<span translate>Wallet Color</span> <span translate>Wallet Color</span>
<span class="item-note"> <span class="item-note">
@ -36,7 +36,7 @@
</span> </span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesEmail"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesEmail">
<span translate>Email Notifications</span> <span translate>Email Notifications</span>
<span class="item-note"> <span class="item-note">
<span ng-if="!wallet.email" translate>Disabled</span> <span ng-if="!wallet.email" translate>Disabled</span>
@ -47,7 +47,7 @@
<div class="item item-divider"> <div class="item item-divider">
Security Security
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.backup" ng-hide="wallet.isPrivKeyExternal()"> <div class="item item-icon-right" href ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
<span translate>Backup</span> <span translate>Backup</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
@ -61,14 +61,14 @@
<span class="toggle-label" translate>Request Fingerprint</span> <span class="toggle-label" translate>Request Fingerprint</span>
</ion-toggle> </ion-toggle>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.deleteWords" ng-show ="!deleted"> <div class="item item-icon-right" href ui-sref="tabs.preferences.deleteWords" ng-show ="!deleted">
<span translate>Delete recovery phrase</span> <span translate>Delete recovery phrase</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-divider"> <div class="item item-divider">
Advanced Advanced
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesAdvanced"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAdvanced">
<span translate>Advanced</span> <span translate>Advanced</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>

View file

@ -26,15 +26,15 @@
</div> </div>
<div class="item item-divider"> <div class="item item-divider">
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.termsOfUse"> <div class="item item-icon-left" href ui-sref="tabs.termsOfUse">
<i class="icon ion-ios-bell-outline"></i> <i class="icon ion-ios-bell-outline"></i>
<span translate>Terms of Use</span> <span translate>Terms of Use</span>
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.translators"> <div class="item item-icon-left" href ui-sref="tabs.translators">
<i class="icon ion-ios-bell-outline"></i> <i class="icon ion-ios-bell-outline"></i>
<span translate>Translators</span> <span translate>Translators</span>
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.logs"> <div class="item item-icon-left" href ui-sref="tabs.logs">
<i class="icon ion-ios-bell-outline"></i> <i class="icon ion-ios-bell-outline"></i>
<span translate>Session log</span> <span translate>Session log</span>
</div> </div>

View file

@ -9,27 +9,27 @@
<div class="list"> <div class="list">
<div class="item item-divider"> <div class="item item-divider">
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.information"> <div class="item item-icon-right" href ui-sref="tabs.preferences.information">
<span translate>Wallet Information</span> <span translate>Wallet Information</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="wallet.paperWallet"> <div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="tabs.preferences.paperWallet">
<span translate>Sweep paper wallet</span> <span translate>Sweep paper wallet</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.export.file"> <div class="item item-icon-right" href ui-sref="tabs.preferences.export.file">
<span translate>Export Wallet</span> <span translate>Export Wallet</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesBwsUrl"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesBwsUrl">
<span translate>Wallet Service URL</span> <span translate>Wallet Service URL</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.preferencesHistory"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesHistory">
<span translate>Transaction History</span> <span translate>Transaction History</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-right" href ui-sref="wallet.delete"> <div class="item item-icon-right" href ui-sref="tabs.preferences.delete">
<span translate>Delete Wallet</span> <span translate>Delete Wallet</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>

View file

@ -1,7 +1,7 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="add.main"> <button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

View file

@ -1,6 +1,6 @@
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="add.main"> <button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

View file

@ -1,7 +1,7 @@
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="wallet.preferencesAdvanced"> <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

View file

@ -1,7 +1,7 @@
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title> <ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="wallet.preferencesAdvanced"> <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> Back <i class="icon ion-chevron-left"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

View file

@ -29,11 +29,11 @@
<div class="list card" ng-hide="!wallets[0]"> <div class="list card" ng-hide="!wallets[0]">
<div class="item item-icon-right item-heading"> <div class="item item-icon-right item-heading">
Wallets Wallets
<a ui-sref="add.main"><i class="icon ion-ios-plus-empty list-add-button"></i></a> <a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div> </div>
<a ng-repeat="wallet in wallets track by $index" <a ng-repeat="wallet in wallets track by $index"
class="item item-icon-left item-big-icon-left item-icon-right" class="item item-icon-left item-big-icon-left item-icon-right"
ui-sref="wallet.details({'walletId': wallet.id})"> ui-sref="tabs.details({'walletId': wallet.id})">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}"/> <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}"/>
</i> </i>

View file

@ -14,7 +14,7 @@
<div class="item item-divider">Preferences</div> <div class="item item-divider">Preferences</div>
<div class="item item-icon-left" href ui-sref="settings.language"> <div class="item item-icon-left" href ui-sref="tabs.language">
<i class="icon ion-ios-chatbubble-outline"></i> <i class="icon ion-ios-chatbubble-outline"></i>
<span translate>Language</span> <span translate>Language</span>
<span class="item-note"> <span class="item-note">
@ -22,7 +22,7 @@
</span> </span>
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.unit"> <div class="item item-icon-left" href ui-sref="tabs.unit">
<i class="icon ion-ios-calculator-outline"></i> <i class="icon ion-ios-calculator-outline"></i>
<span translate>Unit</span> <span translate>Unit</span>
<span class="item-note"> <span class="item-note">
@ -30,7 +30,7 @@
</span> </span>
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.altCurrency"> <div class="item item-icon-left" href ui-sref="tabs.altCurrency">
<i class="icon ion-social-usd-outline"></i> <i class="icon ion-social-usd-outline"></i>
<span translate>Alternative Currency</span> <span translate>Alternative Currency</span>
<span class="item-note"> <span class="item-note">
@ -38,7 +38,7 @@
</span> </span>
</div> </div>
<div class="item item-icon-left" href ui-sref="settings.fee"> <div class="item item-icon-left" href ui-sref="tabs.fee">
<i class="icon ion-ios-film-outline"></i> <i class="icon ion-ios-film-outline"></i>
<span translate>Bitcoin Network Fee Policy</span> <span translate>Bitcoin Network Fee Policy</span>
<span class="item-note"> <span class="item-note">
@ -77,9 +77,26 @@
<span class="toggle-label" translate>Use Unconfirmed Funds</span> <span class="toggle-label" translate>Use Unconfirmed Funds</span>
</ion-toggle> </ion-toggle>
<div class="item item-icon-left" href ui-sref="settings.about"> <div class="list">
<div class="item item-divider">Wallets Settings</div>
<div ng-repeat="item in wallets track by $index">
<div class="item item-icon-left" href ui-sref="tabs.preferences.main({'walletId': item.id})">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}}
<span ng-show="item.n > 1" class="text-light">
{{item.m}}-of-{{item.n}}
</span>
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
Incomplete
</span>
</div>
</div>
</div>
<div class="item item-divider"></div>
<div class="item item-icon-left" href ui-sref="tabs.about">
<i class="icon ion-ios-film-outline"></i> <i class="icon ion-ios-film-outline"></i>
<span translate>About Copay</span> <span translate>About Bitpay Wallet</span>
</div> </div>
</div> </div>
</ion-content> </ion-content>

View file

@ -3,14 +3,9 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title>{{wallet.name}}</ion-nav-title> <ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-back-button>
<button class="button no-border" ui-sref="tabs.home"> {{'Back' | translate}}
Close </ion-nav-back-button>
</button>
</ion-nav-buttons>
<ion-nav-buttons side="secondary">
<button class="button button-icon icon ion-ios-settings" ui-sref="wallet.preferences"></button>
</ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="walletDetailsController" ng-init="init()" delegate-handle="my-handle"> <ion-content ng-controller="walletDetailsController" ng-init="init()" delegate-handle="my-handle">

View file

@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('backController', function($sc
$scope.importGoBack = function() { $scope.importGoBack = function() {
if ($stateParams.fromOnboarding) $state.go('onboarding.welcome'); if ($stateParams.fromOnboarding) $state.go('onboarding.welcome');
else $state.go('add.main'); else $state.go('tabs.add');
}; };
$scope.onboardingMailSkip = function() { $scope.onboardingMailSkip = function() {

View file

@ -3,7 +3,7 @@
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) { angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
$scope.goImport = function() { $scope.goImport = function() {
$state.go('add.import.phrase', { $state.go('tabs.import.phrase', {
fromOnboarding: true fromOnboarding: true
}); });
}; };

View file

@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) { $scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
return w.id != self.walletId; return w.id != self.walletId;
}); });
$scope.wallets = profileService.getWallets();
}; };
$scope.openAddressbookModal = function() { $scope.openAddressbookModal = function() {

View file

@ -155,156 +155,18 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
* *
*/ */
.state('wallet', { .state('tabs.details', {
url: '/wallet/{walletId}/{fromOnboarding}', url: '/details/{walletId}/{fromOnboarding}',
abstract: true, views: {
template: '<ion-nav-view name="wallet"></ion-nav-view>' 'tab-home': {
}) templateUrl: 'views/walletDetails.html'
.state('wallet.details', {
url: '/details',
views: {
'wallet': {
templateUrl: 'views/walletDetails.html'
}
},
params: {
txid: null,
txpId: null,
},
})
.state('wallet.preferences', {
url: '/preferences',
views: {
'wallet': {
templateUrl: 'views/preferences.html'
}
} }
}) },
.state('wallet.preferencesAlias', { params: {
url: '/preferencesAlias', txid: null,
views: { txpId: null,
'wallet': { },
templateUrl: 'views/preferencesAlias.html' })
}
}
})
.state('wallet.preferencesColor', {
url: '/preferencesColor',
views: {
'wallet': {
templateUrl: 'views/preferencesColor.html'
}
}
})
.state('wallet.preferencesEmail', {
url: '/preferencesEmail',
views: {
'wallet': {
templateUrl: 'views/preferencesEmail.html'
}
}
})
.state('wallet.backup', {
url: '/backup',
views: {
'wallet': {
templateUrl: 'views/backup.html'
}
}
})
.state('wallet.preferencesAdvanced', {
url: '/preferencesAdvanced',
views: {
'wallet': {
templateUrl: 'views/preferencesAdvanced.html'
}
}
})
.state('wallet.information', {
url: '/information',
views: {
'wallet': {
templateUrl: 'views/preferencesInformation.html'
}
}
})
.state('wallet.export', {
abstract: true,
url: '/export',
views: {
'wallet': {
templateUrl: 'views/export.html'
}
}
})
.state('wallet.export.file', {
url: '/tab-export-file',
needProfile: true,
views: {
'tab-export-file': {
templateUrl: 'views/tab-export-file.html',
},
}
})
.state('wallet.export.qrCode', {
url: '/tab-export-qrCode',
needProfile: true,
views: {
'tab-export-qrCode': {
templateUrl: 'views/tab-export-qrCode.html',
},
}
})
.state('wallet.preferencesBwsUrl', {
url: '/preferencesBwsUrl',
views: {
'wallet': {
templateUrl: 'views/preferencesBwsUrl.html'
}
}
})
.state('wallet.preferencesHistory', {
url: '/preferencesHistory',
views: {
'wallet': {
templateUrl: 'views/preferencesHistory.html'
}
}
})
.state('wallet.deleteWords', {
url: '/deleteWords',
views: {
'wallet': {
templateUrl: 'views/preferencesDeleteWords.html'
}
}
})
.state('wallet.delete', {
url: '/delete',
views: {
'wallet': {
templateUrl: 'views/preferencesDeleteWallet.html'
}
}
})
.state('wallet.copayers', {
url: '/copayers',
views: {
'wallet': {
templateUrl: 'views/copayers.html'
}
}
})
.state('wallet.paperWallet', {
url: '/paperWallet',
views: {
'wallet': {
templateUrl: 'views/paperWallet.html'
}
}
})
/* /*
* *
@ -385,15 +247,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
* *
*/ */
.state('add', { .state('tabs.add', {
url: '/add', url: '/add',
abstract: true,
template: '<ion-nav-view name="add"></ion-nav-view>'
})
.state('add.main', {
url: '/main',
views: { views: {
'add': { 'tab-home': {
templateUrl: 'views/add.html', templateUrl: 'views/add.html',
controller: function(platformInfo) { controller: function(platformInfo) {
if (platformInfo.isCordova && StatusBar.isVisible) { if (platformInfo.isCordova && StatusBar.isVisible) {
@ -403,24 +260,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
} }
}) })
.state('add.join', { .state('tabs.join', {
url: '/join/:url', url: '/join/:url',
views: { views: {
'add': { 'tab-home': {
templateUrl: 'views/join.html' templateUrl: 'views/join.html'
}, },
} }
}) })
.state('add.import', { .state('tabs.import', {
url: '/import/:fromOnboarding', url: '/import/:fromOnboarding',
abstract: true, abstract: true,
views: { views: {
'add': { 'tab-home': {
templateUrl: 'views/import.html' templateUrl: 'views/import.html'
}, },
} }
}) })
.state('add.import.phrase', { .state('tabs.import.phrase', {
url: '/tab-import-phrase', url: '/tab-import-phrase',
views: { views: {
'tab-import-phrase': { 'tab-import-phrase': {
@ -428,7 +285,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
} }
}) })
.state('add.import.file', { .state('tabs.import.file', {
url: '/tab-import-file', url: '/tab-import-file',
views: { views: {
'tab-import-file': { 'tab-import-file': {
@ -436,7 +293,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
} }
}) })
.state('add.import.hardware', { .state('tabs.import.hardware', {
url: '/tab-import-hardware', url: '/tab-import-hardware',
views: { views: {
'tab-import-hardware': { 'tab-import-hardware': {
@ -444,17 +301,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
} }
}) })
.state('add.create', { .state('tabs.create', {
url: '/create', url: '/create',
abstract: true, abstract: true,
templateUrl: 'views/create.html', templateUrl: 'views/create.html',
views: { views: {
'add': { 'tab-home': {
templateUrl: 'views/create.html' templateUrl: 'views/create.html'
}, },
} }
}) })
.state('add.create.personal', { .state('tabs.create.personal', {
url: '/tab-create-personal', url: '/tab-create-personal',
views: { views: {
'tab-create-personal': { 'tab-create-personal': {
@ -462,7 +319,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
} }
}) })
.state('add.create.shared', { .state('tabs.create.shared', {
url: '/tab-create-shared', url: '/tab-create-shared',
views: { views: {
'tab-create-shared': { 'tab-create-shared': {
@ -477,76 +334,225 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
* *
*/ */
.state('settings', { .state('tabs.language', {
url: '/settings',
abstract: true,
template: '<ion-nav-view name="settings"></ion-nav-view>'
})
.state('settings.language', {
url: '/language', url: '/language',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesLanguage.html' templateUrl: 'views/preferencesLanguage.html'
} }
} }
}) })
.state('settings.unit', { .state('tabs.unit', {
url: '/unit', url: '/unit',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesUnit.html' templateUrl: 'views/preferencesUnit.html'
} }
} }
}) })
.state('settings.fee', { .state('tabs.fee', {
url: '/fee', url: '/fee',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesFee.html' templateUrl: 'views/preferencesFee.html'
} }
} }
}) })
.state('settings.altCurrency', { .state('tabs.altCurrency', {
url: '/altCurrency', url: '/altCurrency',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesAltCurrency.html' templateUrl: 'views/preferencesAltCurrency.html'
} }
} }
}) })
.state('settings.about', { .state('tabs.about', {
url: '/about', url: '/about',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesAbout.html' templateUrl: 'views/preferencesAbout.html'
} }
} }
}) })
.state('settings.logs', { .state('tabs.logs', {
url: '/logs', url: '/logs',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/preferencesLogs.html' templateUrl: 'views/preferencesLogs.html'
} }
} }
}) })
.state('settings.termsOfUse', { .state('tabs.termsOfUse', {
url: '/termsOfUse', url: '/termsOfUse',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/termsOfUse.html', templateUrl: 'views/termsOfUse.html',
} }
} }
}) })
.state('settings.translators', { .state('tabs.translators', {
url: '/translators', url: '/translators',
views: { views: {
'settings': { 'tab-settings': {
templateUrl: 'views/translators.html' templateUrl: 'views/translators.html'
} }
} }
}) })
/*
*
* Wallet preferences
*
*/
.state('tabs.preferences', {
url: '/preferences/:walletId',
abstract: true,
views: {
'tab-settings': {
template: '<ion-nav-view name="preferences"></ion-nav-view>'
},
}
})
.state('tabs.preferences.main', {
url: '/main',
views: {
'preferences': {
templateUrl: 'views/preferences.html'
}
}
})
.state('tabs.preferences.preferencesAlias', {
url: '/preferencesAlias',
views: {
'preferences': {
templateUrl: 'views/preferencesAlias.html'
}
}
})
.state('tabs.preferences.preferencesColor', {
url: '/preferencesColor',
views: {
'preferences': {
templateUrl: 'views/preferencesColor.html'
}
}
})
.state('tabs.preferences.preferencesEmail', {
url: '/preferencesEmail',
views: {
'preferences': {
templateUrl: 'views/preferencesEmail.html'
}
}
})
.state('tabs.preferences.backup', {
url: '/backup',
views: {
'preferences': {
templateUrl: 'views/backup.html'
}
}
})
.state('tabs.preferences.preferencesAdvanced', {
url: '/preferencesAdvanced',
views: {
'preferences': {
templateUrl: 'views/preferencesAdvanced.html'
}
}
})
.state('tabs.preferences.information', {
url: '/information',
views: {
'preferences': {
templateUrl: 'views/preferencesInformation.html'
}
}
})
.state('tabs.preferences.export', {
abstract: true,
url: '/export',
views: {
'preferences': {
templateUrl: 'views/export.html'
}
}
})
.state('tabs.preferences.export.file', {
url: '/tab-export-file',
needProfile: true,
views: {
'tab-export-file': {
templateUrl: 'views/tab-export-file.html',
},
}
})
.state('tabs.preferences.export.qrCode', {
url: '/tab-export-qrCode',
needProfile: true,
views: {
'tab-export-qrCode': {
templateUrl: 'views/tab-export-qrCode.html',
},
}
})
.state('tabs.preferences.preferencesBwsUrl', {
url: '/preferencesBwsUrl',
views: {
'preferences': {
templateUrl: 'views/preferencesBwsUrl.html'
}
}
})
.state('tabs.preferences.preferencesHistory', {
url: '/preferencesHistory',
views: {
'preferences': {
templateUrl: 'views/preferencesHistory.html'
}
}
})
.state('tabs.preferences.deleteWords', {
url: '/deleteWords',
views: {
'preferences': {
templateUrl: 'views/preferencesDeleteWords.html'
}
}
})
.state('tabs.preferences.delete', {
url: '/delete',
views: {
'preferences': {
templateUrl: 'views/preferencesDeleteWallet.html'
}
}
})
.state('tabs.preferences.paperWallet', {
url: '/paperWallet',
views: {
'preferences': {
templateUrl: 'views/paperWallet.html'
}
}
})
/*
*
*TO DO
*
*/
.state('tabs.copayers', {
url: '/copayers',
views: {
'wallet': {
templateUrl: 'views/copayers.html'
}
}
})
/* /*
* *
* Onboarding * Onboarding