anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Remove wallet preferences from App Settings and change the route to be able to use inside wallet Details (within tab-home)

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-10-02 14:55:31 +02:00
commit fc5f6cfa65
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
5 changed files with 31 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/js/controllers/preferences.js
View file

@ -4,7 +4,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, $ionicPlatform, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) { function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, $ionicPlatform, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
var wallet; var wallet;
var walletId; var walletId;
var backToDetails = false;
$scope.hiddenBalanceChange = function() { $scope.hiddenBalanceChange = function() {
var opts = { var opts = {
@ -84,7 +83,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
backToDetails = data.stateParams.backToDetails;
wallet = profileService.getWallet(data.stateParams.walletId); wallet = profileService.getWallet(data.stateParams.walletId);
walletId = wallet.credentials.walletId; walletId = wallet.credentials.walletId;
$scope.wallet = wallet; $scope.wallet = wallet;
@ -120,19 +118,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
}); });
$scope.goBack = function() { $scope.goBack = function() {
if (backToDetails) { $ionicHistory.goBack();
$ionicHistory.nextViewOptions({disableAnimate: true});
$state.go('tabs.home').then(function () {
$ionicHistory.clearHistory();
$state.go('tabs.wallet', {'walletId': wallet.id});
});
} else {
$ionicHistory.goBack();
}
}; };
});
$ionicPlatform.registerBackButtonAction(function (event) {
event.preventDefault();
$scope.goBack()
}, 1000);
});

13
src/js/controllers/wallet-details.controller.js
View file

@ -115,17 +115,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}); });
}; };
$scope.openSettings = function() { $scope.openWalletSettings = function() {
$ionicHistory.nextViewOptions({ $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
disableAnimate: true,
});
$state.go('tabs.settings').then(function () {
$ionicHistory.clearHistory();
$ionicHistory.nextViewOptions({
disableAnimate: true,
});
$state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
});
}; };
$scope.openSearchModal = function() { $scope.openSearchModal = function() {

29
src/js/routes.js
View file

@ -526,9 +526,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/ */
.state('tabs.preferences', { .state('tabs.preferences', {
url: '/preferences/:walletId/:backToDetails', url: '/preferences/:walletId',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesController', controller: 'preferencesController',
templateUrl: 'views/preferences.html' templateUrl: 'views/preferences.html'
} }
@ -537,7 +537,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesAlias', { .state('tabs.preferences.preferencesAlias', {
url: '/preferencesAlias', url: '/preferencesAlias',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesAliasController', controller: 'preferencesAliasController',
templateUrl: 'views/preferencesAlias.html' templateUrl: 'views/preferencesAlias.html'
} }
@ -546,7 +546,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesColor', { .state('tabs.preferences.preferencesColor', {
url: '/preferencesColor', url: '/preferencesColor',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesColorController', controller: 'preferencesColorController',
templateUrl: 'views/preferencesColor.html' templateUrl: 'views/preferencesColor.html'
} }
@ -555,7 +555,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.backupWarning', { .state('tabs.preferences.backupWarning', {
url: '/backupWarning/:from', url: '/backupWarning/:from',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'backupWarningController', controller: 'backupWarningController',
templateUrl: 'views/backupWarning.html' templateUrl: 'views/backupWarning.html'
} }
@ -564,7 +564,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.backup', { .state('tabs.preferences.backup', {
url: '/backup', url: '/backup',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'backupController', controller: 'backupController',
templateUrl: 'views/backup.html' templateUrl: 'views/backup.html'
} }
@ -573,7 +573,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesAdvanced', { .state('tabs.preferences.preferencesAdvanced', {
url: '/preferencesAdvanced', url: '/preferencesAdvanced',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesAdvancedController', controller: 'preferencesAdvancedController',
templateUrl: 'views/preferencesAdvanced.html' templateUrl: 'views/preferencesAdvanced.html'
} }
@ -582,7 +582,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.information', { .state('tabs.preferences.information', {
url: '/information', url: '/information',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesInformation', controller: 'preferencesInformation',
templateUrl: 'views/preferencesInformation.html' templateUrl: 'views/preferencesInformation.html'
} }
@ -591,7 +591,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.export', { .state('tabs.preferences.export', {
url: '/export', url: '/export',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'exportController', controller: 'exportController',
templateUrl: 'views/export.html' templateUrl: 'views/export.html'
} }
@ -600,7 +600,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesBwsUrl', { .state('tabs.preferences.preferencesBwsUrl', {
url: '/preferencesBwsUrl', url: '/preferencesBwsUrl',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesBwsUrlController', controller: 'preferencesBwsUrlController',
templateUrl: 'views/preferencesBwsUrl.html' templateUrl: 'views/preferencesBwsUrl.html'
} }
@ -609,7 +609,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesHistory', { .state('tabs.preferences.preferencesHistory', {
url: '/preferencesHistory', url: '/preferencesHistory',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesHistory', controller: 'preferencesHistory',
templateUrl: 'views/preferencesHistory.html' templateUrl: 'views/preferencesHistory.html'
} }
@ -618,7 +618,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.preferencesExternal', { .state('tabs.preferences.preferencesExternal', {
url: '/preferencesExternal', url: '/preferencesExternal',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesExternalController', controller: 'preferencesExternalController',
templateUrl: 'views/preferencesExternal.html' templateUrl: 'views/preferencesExternal.html'
} }
@ -627,17 +627,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.preferences.delete', { .state('tabs.preferences.delete', {
url: '/delete', url: '/delete',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'preferencesDeleteWalletController', controller: 'preferencesDeleteWalletController',
templateUrl: 'views/preferencesDeleteWallet.html' templateUrl: 'views/preferencesDeleteWallet.html'
} }
} }
}) })
.state('tabs.preferencesCash.scan', { .state('tabs.preferencesCash.scan', {
url: '/cashScan', url: '/cashScan',
views: { views: {
'tab-settings@tabs': { 'tab-home@tabs': {
controller: 'cashScanController', controller: 'cashScanController',
templateUrl: 'views/cashScan.html' templateUrl: 'views/cashScan.html'
} }

24
www/views/tab-settings.html
View file

@ -100,21 +100,21 @@
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div> <!--<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div>-->
<a class="item item-icon-left item-icon-right" href <!--<a class="item item-icon-left item-icon-right" href-->
ui-sref="tabs.preferences({'walletId': wallet.id})" <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
ng-repeat="wallet in walletsBch track by $index"> <!--ng-repeat="wallet in walletsBch track by $index">-->
<span ng-include="'views/includes/walletListSettings.html'"></span> <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
</a> <!--</a>-->
<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core (BTC)' | translate}}</div> <!--<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core (BTC)' | translate}}</div>-->
<a class="item item-icon-left item-icon-right" href <!--<a class="item item-icon-left item-icon-right" href-->
ui-sref="tabs.preferences({'walletId': wallet.id})" <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
ng-repeat="wallet in walletsBtc track by $index"> <!--ng-repeat="wallet in walletsBtc track by $index">-->
<span ng-include="'views/includes/walletListSettings.html'"></span> <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
</a> <!--</a>-->
<div class="item item-divider" ng-show="bitpayAccounts || buyAndSellServices[0]">{{'Integrations' | translate}}</div> <div class="item item-divider" ng-show="bitpayAccounts || buyAndSellServices[0]">{{'Integrations' | translate}}</div>

2
www/views/walletDetails.html
View file

@ -8,7 +8,7 @@
<button class="button back-button" ng-click="startSearch(); openSearchModal()" ng-if="txHistory.length > 4"> <button class="button back-button" ng-click="startSearch(); openSearchModal()" ng-if="txHistory.length > 4">
<i class="icon ion-ios-search-strong tx-search"></i> <i class="icon ion-ios-search-strong tx-search"></i>
</button> </button>
<button class="button" ng-click="openSettings();"> <button class="button" ng-click="openWalletSettings();">
<i class="icon ion-android-settings"></i> <i class="icon ion-android-settings"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>