All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at
diff --git a/src/css/main.css b/src/css/main.css
index 00bc52152..ba8a7564a 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1085,20 +1085,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
}
.splash {
- width: 100%;
- height: 100%;
+ top: 0;
background: #2C3E50;
- position: absolute;
background-image: -webkit-linear-gradient(#3D5672 0%, #223243 100%);
background-image: -o-linear-gradient(#3D5672 0%, #223243 100%);
background-image: linear-gradient(#3D5672 0%, #223243 100%);
}
-.splash .start-button {
- position: absolute;
- bottom: 0;
-}
-
.splash .start-button button.black {
background-color: #4B6178;
}
@@ -1107,7 +1100,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
font-size: 0.58rem;
}
-.gif-splash {
+.splash .container-image {
padding: 2rem 0;
}
diff --git a/src/js/routes.js b/src/js/routes.js
index 2c56b361c..1bc276d58 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -89,25 +89,27 @@ angular
$scope.create = function(noWallet) {
$scope.creatingProfile = true;
- profileService.create({
- noWallet: noWallet
- }, function(err) {
- if (err) {
- $scope.creatingProfile = false;
- $log.warn(err);
- $scope.error = err;
- $scope.$apply();
- $timeout(function() {
- $scope.create(noWallet);
- }, 3000);
- }
- });
+ $timeout(function() {
+ profileService.create({
+ noWallet: noWallet
+ }, function(err) {
+ if (err) {
+ $scope.creatingProfile = false;
+ $log.warn(err);
+ $scope.error = err;
+ $scope.$apply();
+ $timeout(function() {
+ $scope.create(noWallet);
+ }, 3000);
+ }
+ });
+ }, 100);
};
}
}
}
});
-
+
$stateProvider
.state('translators', {
url: '/translators',
@@ -125,7 +127,7 @@ angular
views: {
'main': {
templateUrl: 'views/disclaimer.html',
- controller: function($scope, $timeout, storageService, applicationService, go) {
+ controller: function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) {
storageService.getCopayDisclaimerFlag(function(err, val) {
$scope.agreed = val;
$timeout(function() {
@@ -134,11 +136,20 @@ angular
});
$scope.agree = function() {
- storageService.setCopayDisclaimerFlag(function(err) {
- $timeout(function() {
- applicationService.restart();
- }, 1000);
- });
+ if (isCordova) {
+ window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true);
+ }
+ $scope.loading = true;
+ $timeout(function() {
+ storageService.setCopayDisclaimerFlag(function(err) {
+ $timeout(function() {
+ if (isCordova) {
+ window.plugins.spinnerDialog.hide();
+ }
+ applicationService.restart();
+ }, 1000);
+ });
+ }, 100);
};
}
}
@@ -531,7 +542,7 @@ angular
event.preventDefault();
}
- /*
+ /*
* --------------------
*/
@@ -630,7 +641,6 @@ angular
cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc;
cachedTransitionState = desiredTransitionState;
- //console.log('CACHing animation', cachedTransitionState);
return false;
}
}
+