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

Merge pull request #3561 from cmgustavo/feat/top-bar-colored

Browse source 
Change top-bar color & camera position
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 17:42:29 -03:00
commit 9409b183fd
17 changed files with 60 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/buyGlidera.js
View file

@ -42,6 +42,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.type = 'BUY';
$scope.wallets = wallets;
$scope.noColor = true;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};

1
src/js/controllers/glidera.js
View file

@ -42,6 +42,7 @@ angular.module('copayApp.controllers').controller('glideraController',
$scope.tx = tx;
$scope.settings = config;
$scope.color = fc.backgroundColor;
$scope.noColor = true;
glideraService.getTransaction(token, tx.transactionUuid, function(error, tx) {
$scope.tx = tx;

3
src/js/controllers/index.js
View file

@ -562,6 +562,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
if (isCordova && StatusBar.isVisible) {
StatusBar.backgroundColorByHexString(fc.backgroundColor);
}
};
self.setBalance = function(balance) {

1
src/js/controllers/sellGlidera.js
View file

@ -48,6 +48,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.type = 'SELL';
$scope.wallets = wallets;
$scope.noColor = true;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};

14
src/js/controllers/topbar.js
View file

@ -1,17 +1,13 @@
'use strict';
angular.module('copayApp.controllers').controller('topbarController', function($scope, $rootScope, go) {
this.onQrCodeScanned = function(data) {
$rootScope.$emit('dataScanned', data);
};
this.openSendScreen = function() {
go.send();
};
angular.module('copayApp.controllers').controller('topbarController', function(go) {
this.goHome = function() {
go.walletHome();
};
this.goPreferences = function() {
go.preferences();
};
});

11
src/js/controllers/walletHome.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService, animationService, addressbookService) {
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go) {
var self = this;
$rootScope.hideMenuBar = false;
@ -98,6 +98,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}
};
this.onQrCodeScanned = function(data) {
$rootScope.$emit('dataScanned', data);
};
this.openSendScreen = function() {
go.send();
};
rateService.whenAvailable(function() {
self.isRateAvailable = true;
$rootScope.$digest();
@ -123,7 +131,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
'address': ($scope.newAddress || ''),
'label': ''
};
$scope.color = fc.backgroundColor;
$scope.beforeQrCodeScann = function() {
$scope.error = null;