From e7d929a224705e1098a4879fc615bb067c363e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 21 Oct 2015 14:47:01 -0300 Subject: [PATCH 1/2] fix animation in preference Bws Url --- src/js/services/animationService.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/js/services/animationService.js b/src/js/services/animationService.js index 7bad8546a..6ce701cbe 100644 --- a/src/js/services/animationService.js +++ b/src/js/services/animationService.js @@ -7,10 +7,10 @@ angular.module('copayApp.services').factory('animationService', function(isCordo // DISABLE ANIMATION ON DESKTOP root.modalAnimated = { - slideUp : isCordova ? 'full animated slideInUp' : 'full', - slideRight : isCordova ? 'full animated slideInRight' : 'full', - slideOutDown : isCordova ? 'slideOutDown' : 'hideModal', - slideOutRight : isCordova ? 'slideOutRight' : 'hideModal', + slideUp: isCordova ? 'full animated slideInUp' : 'full', + slideRight: isCordova ? 'full animated slideInRight' : 'full', + slideOutDown: isCordova ? 'slideOutDown' : 'hideModal', + slideOutRight: isCordova ? 'slideOutRight' : 'hideModal', }; var pageWeight = { @@ -34,7 +34,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo preferencesUnit: 12, preferencesFee: 12, preferencesAltCurrency: 12, - preferencesBwsUrl: 12, + preferencesBwsUrl: 13, preferencesAlias: 12, preferencesEmail: 12, export: 13, @@ -51,7 +51,8 @@ angular.module('copayApp.services').factory('animationService', function(isCordo }; function cleanUpLater(e, e2) { - var cleanedUp = false, timeoutID; + var cleanedUp = false, + timeoutID; var cleanUp = function() { if (cleanedUp) return; cleanedUp = true; @@ -72,7 +73,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo timeoutID = setTimeout(cleanUp, 500); }; - root.transitionAnimated = function (fromState, toState, event) { + root.transitionAnimated = function(fromState, toState, event) { if (isaosp) return true; @@ -94,7 +95,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo var entering = null, - leaving = null; + leaving = null; // Horizontal Slide Animation? if (isCordova && fromWeight && toWeight) { @@ -108,7 +109,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo } else if (isCordova && fromName && fromWeight >= 0 && toWeight >= 0) { if (toWeight) { entering = 'CslideInUp'; - + } else { leaving = 'CslideOutDown'; } @@ -150,4 +151,4 @@ angular.module('copayApp.services').factory('animationService', function(isCordo } return root; -}); +}); \ No newline at end of file From e8f53349011358035d975d8ac8560a7c5864dde0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 26 Oct 2015 12:22:53 -0300 Subject: [PATCH 2/2] fix makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index c79ed65cd..7ce7538b6 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ android-prod: cordova/build.sh ANDROID --clear cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova build android --release + jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play + android-debug: cordova/build.sh ANDROID --dbgjs --clear