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

Merge pull request #146 from cmgustavo/ref/design-38

Browse source 
Ref/design 38
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 12:10:34 -03:00 • committed by GitHub
commit 5527cccc38
50 changed files with 62 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/buyAmazon.js
View file

@ -28,9 +28,9 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
};
this.confirm = function() {
var title = gettextCatalog.getString('Confirm Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
var ok = gettextCatalog.getString('Buy');
popupService.showConfirm(title, null, ok, null, function(res) {
popupService.showConfirm(null, message, ok, null, function(res) {
if (res) self.createTx();
});
};

8
src/js/routes.js
View file

@ -30,7 +30,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$ionicConfigProvider.navBar.positionSecondaryButtons('right');
// NAV BACK-BUTTON TEXT/ICON
$ionicConfigProvider.backButton.icon('ion-arrow-left-c').text('');
$ionicConfigProvider.backButton.icon('icon ion-ios-arrow-thin-left').text('');
$ionicConfigProvider.backButton.previousTitleText(false);
$logProvider.debugEnabled(true);
@ -106,7 +106,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('starting', {
url: '/starting',
templateUrl: 'views/starting.html'
template: '<ion-view id="starting"><ion-content>{{starting}}</ion-content></ion-view>',
controller: function($scope, $log, gettextCatalog) {
$log.info('Starting...');
$scope.starting = gettextCatalog.getString('Starting...');
}
})
/*

4
src/js/services/logHeader.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.services')
.factory('logHeader', function($log, platformInfo) {
$log.info('Starting Copay v' + window.version + ' #' + window.commitHash);
.factory('logHeader', function($window, $log, platformInfo) {
$log.info($window.appConfig.nameCase + ' v' + window.version + ' #' + window.commitHash);
$log.info('Client: '+ JSON.stringify(platformInfo) );
return {};
});

20
src/js/services/popupService.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo) {
angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo, gettextCatalog) {
var isCordova = platformInfo.isCordova;
@ -10,7 +10,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
if (!cb) cb = function() {};
$ionicPopup.alert({
title: title,
template: message,
subTitle: message,
okType: 'button-clear button-positive'
}).then(cb);
};
@ -18,7 +18,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
var _ionicConfirm = function(title, message, okText, cancelText, cb) {
$ionicPopup.confirm({
title: title,
template: message,
subTitle: message,
cancelText: cancelText,
cancelType: 'button-clear button-positive',
okText: okText,
@ -53,6 +53,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
if (buttonIndex == 1) return cb(true);
else return cb(false);
}
okText = okText || gettextCatalog.getString('OK');
cancelText = cancelText || gettextCatalog.getString('Cancel');
navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
};
@ -67,8 +69,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple alert popup
*
* @param {String} Title
* @param {String} Message (optional)
* @param {String} Title (optional)
* @param {String} Message
* @param {Callback} Function (optional)
*/
@ -85,10 +87,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple confirm popup
*
* @param {String} Title
* @param {String} Title (optional)
* @param {String} Message
* @param {String} okText
* @param {String} cancelText
* @param {String} okText (optional)
* @param {String} cancelText (optional)
* @param {Callback} Function
* @returns {Callback} OK: true, Cancel: false
*/
@ -105,7 +107,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple prompt popup
*
* @param {String} Title
* @param {String} Title (optional)
* @param {String} Message
* @param {Object} Object{ inputType, inputPlaceholder, defaultText } (optional)
* @param {Callback} Function