Changes on theme and menu

config.xml

@@ -91,4 +91,5 @@
     <plugin name="cordova-sqlite-storage" spec="^2.2.1" />
     <allow-navigation href="http://192.168.43.167:8100" />
     <plugin name="cordova-plugin-x-socialsharing" spec="^5.3.2" />
+    <plugin name="uk.co.workingedge.phonegap.plugin.launchnavigator" spec="^4.2.0" />
 </widget>

package-lock.json

@@ -101,6 +101,11 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-4.5.3.tgz",
       "integrity": "sha512-7CYuU3fy2WbOGMg3AI0/PH+0eg5lFShv9+3NT4/HiihHmMR6mGCdVvpZZaKHeAFkBXcFwHcjZjGId4SAASHoBg=="
     },
+    "@ionic-native/launch-navigator": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/launch-navigator/-/launch-navigator-4.6.0.tgz",
+      "integrity": "sha512-4BO2r/E1rnar+H/KIPbzBDwfsgUOVduFDfcU9Jx/bkB31FRbZKeW268jBFzZlPxOrg+hazmjs0w11ibgItDP9w=="
+    },
     "@ionic-native/social-sharing": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/social-sharing/-/social-sharing-4.6.0.tgz",
@@ -1319,11 +1324,21 @@
         }
       }
     },
+    "cordova-plugin-actionsheet": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-actionsheet/-/cordova-plugin-actionsheet-2.3.3.tgz",
+      "integrity": "sha1-6SYbLQBKjaQHOI1g31NMFWxS/xE="
+    },
     "cordova-plugin-device": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.1.tgz",
       "integrity": "sha1-m54jE+aCEZ/4QC9oCWo4vMUBNZM="
     },
+    "cordova-plugin-dialogs": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-dialogs/-/cordova-plugin-dialogs-2.0.1.tgz",
+      "integrity": "sha1-N/7xUSWWyNXflUP7eHJFkPdn3PM="
+    },
     "cordova-plugin-googlemaps": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/cordova-plugin-googlemaps/-/cordova-plugin-googlemaps-2.2.5.tgz",
@@ -6249,6 +6264,11 @@
         }
       }
     },
+    "uk.co.workingedge.phonegap.plugin.launchnavigator": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/uk.co.workingedge.phonegap.plugin.launchnavigator/-/uk.co.workingedge.phonegap.plugin.launchnavigator-4.2.0.tgz",
+      "integrity": "sha1-B7NHCzOpwUAVivRigpauIkw0YaU="
+    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",

package.json

@@ -22,12 +22,15 @@
     "@angular/platform-browser-dynamic": "5.0.3",
     "@ionic-native/core": "4.4.0",
     "@ionic-native/google-maps": "^4.5.3",
+    "@ionic-native/launch-navigator": "^4.6.0",
     "@ionic-native/social-sharing": "^4.6.0",
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/status-bar": "4.4.0",
     "@ionic/storage": "^2.1.3",
     "cordova-android": "7.0.0",
+    "cordova-plugin-actionsheet": "^2.3.3",
     "cordova-plugin-device": "^2.0.1",
+    "cordova-plugin-dialogs": "^2.0.1",
     "cordova-plugin-googlemaps": "^2.2.5",
     "cordova-plugin-ionic-keyboard": "^2.0.5",
     "cordova-plugin-ionic-webview": "^1.1.16",
@@ -40,6 +43,7 @@
     "ionicons": "3.0.0",
     "rxjs": "5.5.2",
     "sw-toolbox": "3.6.0",
+    "uk.co.workingedge.phonegap.plugin.launchnavigator": "^4.2.0",
     "zone.js": "0.8.18"
   },
   "devDependencies": {
@@ -60,7 +64,8 @@
         "ANDROID_SUPPORT_V4_VERSION": "24.1.0"
       },
       "cordova-sqlite-storage": {},
-      "cordova-plugin-x-socialsharing": {}
+      "cordova-plugin-x-socialsharing": {},
+      "uk.co.workingedge.phonegap.plugin.launchnavigator": {}
     },
     "platforms": [
       "android"

src/app/app.component.ts

@@ -1,16 +1,23 @@
-import { Component } from '@angular/core';
-import { Platform } from 'ionic-angular';
+import { Component, ViewChild } from '@angular/core';
+import { Platform, Nav, AlertController } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
+import { Storage } from '@ionic/storage';
 
 import { HomePage } from '../pages/home/home';
+import { DevicesPage } from '../pages/devices/devices';
+import { ConfigurationPage } from '../pages/configuration/configuration';
+
 @Component({
   templateUrl: 'app.html'
 })
 export class MyApp {
+  @ViewChild(Nav) nav: Nav;
   rootPage:any = HomePage;
 
-  constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {
+  constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen,
+    private alertCtrl: AlertController,
+  private storage: Storage) {
     /*platform.ready().then(() => {
       // Okay, so the platform is ready and our plugins are available.
       // Here you can do any higher level native things you might need.
@@ -18,4 +25,38 @@ export class MyApp {
       splashScreen.hide();
     });*/
   }
+
+  openDevicesPage() {
+    this.nav.push(DevicesPage);
+  }
+
+  openConfigurationPage() {
+    this.nav.push(ConfigurationPage);
+  }
+
+  closeSession() {
+    let alert = this.alertCtrl.create({
+      title: 'Confirmación',
+      message: 'Realmente desea cerrar Sesión?',
+      buttons: [{
+        text: 'Si',
+        handler: () => {
+          this.storage.set('authentication', '');
+          this.storage.set('remember', false);
+          this.storage.set('rootDevice', null);
+          this.storage.set('startAlarm', false);
+          this.storage.set('time', 30);
+      	  this.nav.setRoot(HomePage);
+        }
+      },{
+        text: 'No',
+        handler: () => {
+          alert.dismiss();
+          return false;
+        }
+      }]
+    });
+    alert.present();
+  }
+
 }

src/app/app.html

@@ -1 +1,26 @@
-<ion-nav [root]="rootPage"></ion-nav>
+<ion-menu [content]="content" >
+  <ion-header>
+    <ion-toolbar  color="primary">
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+      <ion-list>
+           <button ion-item menuClose (click)="openDevicesPage()">
+             <ion-icon name="car"></ion-icon>
+               Dispositivos
+          </button>
+          <button ion-item menuClose (click)="openConfigurationPage()">
+            <ion-icon name="keypad"></ion-icon>
+              Configuración
+          </button>
+          <button ion-item menuClose (click)="closeSession()">
+            <ion-icon name="close"></ion-icon>
+              Cerrar Sesión
+          </button>
+      </ion-list>
+  </ion-content>
+
+</ion-menu>
+
+<ion-nav [root]="rootPage" #content swipeBackEnabled="false"></ion-nav>

src/app/app.module.ts

@@ -6,6 +6,8 @@ import { StatusBar } from '@ionic-native/status-bar';
 import { HttpClientModule } from '@angular/common/http';
 import { GoogleMaps } from '@ionic-native/google-maps';
 import { IonicStorageModule } from '@ionic/storage';
+import { LaunchNavigator, LaunchNavigatorOptions } from '@ionic-native/launch-navigator';
+import { SocialSharing } from '@ionic-native/social-sharing';
 
 import { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
@@ -43,7 +45,9 @@ import { ShareService } from '../services/share/share';
     GoogleMaps,
     {provide: ErrorHandler, useClass: IonicErrorHandler},
     VespotServiceProvider,
-    ShareService
+    ShareService,
+    LaunchNavigator,
+    SocialSharing
   ]
 })
 export class AppModule {}

src/pages/main/main.html

@@ -1,41 +1,13 @@
-<ion-menu [content]="vespotMenu" >
-  <ion-header>
-    <ion-toolbar  color="primary">
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-    <ion-content>
-        <ion-list>
-             <button ion-item menuClose (click)="openDevicesPage()">
-               <ion-icon name="car"></ion-icon>
-		             Dispositivos
-            </button>
-            <button ion-item menuClose (click)="openConfigurationPage()">
-              <ion-icon name="keypad"></ion-icon>
-                Configuración
-            </button>
-            <button ion-item menuClose (click)="closeSession()">
-              <ion-icon name="close"></ion-icon>
-                Cerrar Sesión
-            </button>
-        </ion-list>
-    </ion-content>
-</ion-menu>
-
 <ion-header>
   <ion-navbar color="primary">
-    <ion-buttons>
-      <button ion-button menuToggle="left">
-      <ion-icon name="menu"></ion-icon>
-      <ion-title>SMART ALARM</ion-title>
-    </button>
-    </ion-buttons>
-
-    <ion-nav #vespotMenu ></ion-nav>
+      <button ion-button menuToggle>
+        <ion-icon name="menu"></ion-icon>
+      </button>
+    <ion-title>SMART ALARM</ion-title>
   </ion-navbar>
 </ion-header>
 
-<ion-content>
+<ion-content padding>
   <div id="map_canvas">
     <ion-fab right bottom>
       <button ion-fab color="primary"><ion-icon name="car"></ion-icon></button>
@@ -43,6 +15,6 @@
         <button ion-fab><ion-icon name="map" (click)="shareViaMaps()"></ion-icon></button>
         <button ion-fab><ion-icon name="logo-whatsapp" (click)="shareViaWhatsapp()"></ion-icon></button>
       </ion-fab-list>
-    </ion-fab>
+    </ion-fab>-
   </div>
 </ion-content>

src/pages/main/main.ts

@@ -3,8 +3,9 @@ import { NavController } from 'ionic-angular';
 import { AlertController } from 'ionic-angular';
 import { interval } from 'rxjs/observable/interval';
 import { Storage } from '@ionic/storage';
+import { LaunchNavigator, LaunchNavigatorOptions } from '@ionic-native/launch-navigator';
+import { SocialSharing } from '@ionic-native/social-sharing';
 
-import { HomePage } from '../home/home'
 import { DevicesPage } from '../devices/devices'
 import { ConfigurationPage } from '../configuration/configuration'
 import { ShareService } from '../../services/share/share';
@@ -39,7 +40,9 @@ export class Main {
   private googleMaps: GoogleMaps,
   private vespotService: VespotServiceProvider,
   public alertCtrl: AlertController,
-  private storage: Storage) {
+  private storage: Storage,
+  private launchNavigator: LaunchNavigator,
+  private socialSharing: SocialSharing) {
       this.devicesPage = DevicesPage;
       this.configurationPage = ConfigurationPage;
       this.devices = this.shareService.getDevices();
@@ -48,6 +51,8 @@ export class Main {
 
   }
 
+
+
   ionViewWillEnter() {
     if(typeof this.shareService.getRootDevice() == "undefined") {
       console.log('ionViewWillEnter: Entro al undefined');
@@ -102,40 +107,6 @@ export class Main {
       );
   }
 
-
-  openDevicesPage() {
-    this.navCtrl.push(DevicesPage);
-  }
-
-  openConfigurationPage() {
-    this.navCtrl.push(ConfigurationPage);
-  }
-
-  closeSession() {
-    let alert = this.alertCtrl.create({
-      title: 'Confirmación',
-      message: 'Realmente desea cerrar Sesión?',
-      buttons: [{
-        text: 'Si',
-        handler: () => {
-          this.storage.set('authentication', '');
-          this.storage.set('remember', false);
-          this.storage.set('rootDevice', null);
-          this.storage.set('startAlarm', false);
-          this.storage.set('time', 30);
-      	  this.navCtrl.setRoot(HomePage);
-        }
-      },{
-        text: 'No',
-        handler: () => {
-          alert.dismiss();
-          return false;
-        }
-      }]
-    });
-    alert.present();
-  }
-
   /**
   GOOGLE MAPS
   **/
@@ -181,6 +152,7 @@ export class Main {
       }
     });
     this.deviceMarker.showInfoWindow();
+    this.deviceMarker.setDisableAutoPan(true);
   }
 
   updateMarker() {
@@ -204,11 +176,20 @@ export class Main {
   }
 
   shareViaMaps() {
+    let options: LaunchNavigatorOptions = {
+      start: 'Bogota, ON'
+    };
 
+    this.launchNavigator.navigate([this.rootPosition.latitude, this.rootPosition.longitude], options)
+    .then(
+      success => console.log('Launched navigator'),
+      error => console.log('Error launching navigator', error)
+    );
   }
 
-  shareViaWhatsapp() {
-    
+  shareViaWhatsarpp() {
+    //http://maps.google.com/maps?&z={INSERT_MAP_ZOOM}&mrt={INSERT_TYPE_OF_SEARCH}&t={INSERT_MAP_TYPE}&q={INSERT_MAP_LAT_COORDINATES}+{INSERT_MAP_LONG_COORDINATES}
+    this.socialSharing.share('Posición de mi dispositivo', '', null, 'http://maps.google.com/maps?&z=15&mrt=yp&t=k&q=27.9879012+86.9253141')
   }
 
 }