chore(version): bump

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="Toolwatch.Toolwatch" version="1.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="Toolwatch.Toolwatch" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Toolwatch - Watch accuracy app</name>
     <description>Measure and track the accuracy of your mechanical watches. Toolwatch is a free watch accuracy app trusted by the watchmaking industry's leaders and 15 000+ monthly users. Is your watch accurate? Should it be serviced? How does it compare versus other watches? Find out now by measuring the accuracy of your watch!</description>
     <author email="[email protected]" href="https://toolwatch.io/">Mathieu Nayrolles</author>

package.json

@@ -22,15 +22,16 @@
     "@angular/platform-browser-dynamic": "2.4.8",
     "@angular/platform-server": "2.4.8",
     "@ionic/storage": "^2.0.0",
-    "ng2-translate": "5.0.0",
     "@types/node": "^6.0.45",
     "gsap": "^1.19.0",
     "ionic-angular": "2.2.0",
     "ionic-native": "2.4.1",
     "ionicons": "3.0.0",
     "moment": "2.15.1",
+    "ng2-translate": "5.0.0",
     "rxjs": "5.0.1",
     "sw-toolbox": "3.4.0",
+    "tw-core": "git+https://github.com/Toolwatchapp/tw-core.git",
     "tw-i18n": "github:toolwatchapp/tw-i18n",
     "tw-watches": "github:toolwatchapp/tw-watches",
     "zone.js": "0.7.2"
@@ -49,7 +50,7 @@
     "cordova-plugin-statusbar",
     "ionic-plugin-keyboard"
   ],
-  "version": "1.1.0",
+  "version": "1.2.0",
   "cordovaPlatforms": [],
   "config": {
     "commitizen": {

src/pages/login/login.ts

@@ -23,7 +23,8 @@ import {TranslateService} from 'ng2-translate/ng2-translate';
 export class LogInPage extends LoginComponent{
 
 	laoding:Loading; 
-	loadindSentence:string; 
+	loadindSentence:string;
+	laodingDashboard:Loading; 
 
 	constructor(	
 		//Own injections
@@ -213,25 +214,30 @@ export class LogInPage extends LoginComponent{
    * user from the API
    */
   private initOnResume(){
-	  console.log("resime");
+
     document.addEventListener('resume', () => {
 
 	if(this.nav.getActive().name != "SignupPage" || this.nav.getActive().name != "LoginPage"){
 
 		this.translate.get('loading-dashboard').subscribe(
 			sentenceLoading => {
 
-				let laodingDashboard = this.loadingController.create({content: sentenceLoading})
-				laodingDashboard.present();
+				this.laodingDashboard = this.loadingController.create({content: sentenceLoading})
+				this.laodingDashboard.present();
 
 				this.fetchUser().then(
 					user => {
 						this.onSuccessLogging(user)
-						laodingDashboard.dismiss();
+
+						setTimeout(()=>{
+							this.laodingDashboard.dismiss();
+						}, 500);
 					},
 					error => {
 						this.nav.setRoot(LogInPage);
-						laodingDashboard.dismiss();        
+						setTimeout(()=>{
+							this.laodingDashboard.dismiss();
+						}, 500);       
 					}
 				);
 			}