diff --git a/package.json b/package.json index d973052c8..45909639d 100644 --- a/package.json +++ b/package.json @@ -22,20 +22,20 @@ "@angular/platform-browser": "4.0.0-rc.5", "@angular/platform-browser-dynamic": "4.0.0-rc.5", "@angular/platform-server": "4.0.0-rc.5", - "@ionic-native/inappbrowser": "^3.0.0-alpha.1", - "@ionic-native/splashscreen": "^3.0.0-alpha.1", + "@ionic-native/core": "3.2.1", + "@ionic-native/in-app-browser": "3.2.1", + "@ionic-native/splash-screen": "3.2.1", "@ionic/storage": "2.0.1", - "ionic-angular": "2.1.0-201703201543", + "ionic-angular": "2.1.0-201703201940", "ionicons": "3.0.0", - "rxjs": "5.0.1", + "rxjs": "5.1.1", "sw-toolbox": "3.4.0", - "zone.js": "0.7.2" + "zone.js": "^0.8.4" }, "devDependencies": { "@ionic/app-scripts": "nightly", "@ionic/cli-plugin-cordova": "0.0.9", "typescript": "~2.2.1" }, - "config": { - } + "config": {} } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d0dcc4d9f..3cc19ffbf 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,7 +1,7 @@ import { Component, ViewChild } from '@angular/core'; import { Events, MenuController, Nav, Platform } from 'ionic-angular'; -import { Splashscreen } from '@ionic-native/splashscreen'; +import { SplashScreen } from '@ionic-native/splash-screen'; import { ConferenceData } from '../providers/conference-data'; import { UserData } from '../providers/user-data'; @@ -49,7 +49,8 @@ export class ConferenceApp { public userData: UserData, public menu: MenuController, public platform: Platform, - public confData: ConferenceData/*, + public confData: ConferenceData, + public splashScreen: SplashScreen/*, public storage: Storage*/ ) { @@ -125,7 +126,7 @@ export class ConferenceApp { platformReady() { // Call any initial plugins when ready this.platform.ready().then(() => { - Splashscreen.hide(); + this.splashScreen.hide(); }); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 75b8b93d3..6ba769999 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,6 +10,9 @@ import { ConferenceApp } from './app.component'; import { ConferenceData } from '../providers/conference-data'; import { UserData } from '../providers/user-data'; +import { InAppBrowser } from '@ionic-native/in-app-browser'; +import { SplashScreen } from '@ionic-native/splash-screen'; + @NgModule({ declarations: [ @@ -17,16 +20,21 @@ import { UserData } from '../providers/user-data'; ], imports: [ BrowserModule, + HttpModule, IonicModule.forRoot(ConferenceApp, { preloadModules: true }), - HttpModule, - IonicStorageModule.forRoot() + IonicStorageModule.forRoot() ], bootstrap: [IonicApp], entryComponents: [ ConferenceApp ], - providers: [ConferenceData, UserData] + providers: [ + ConferenceData, + UserData, + InAppBrowser, + SplashScreen + ] }) export class AppModule { } diff --git a/src/pages/speaker-list/speaker-list.ts b/src/pages/speaker-list/speaker-list.ts index 67be7afd4..5d8301a7b 100644 --- a/src/pages/speaker-list/speaker-list.ts +++ b/src/pages/speaker-list/speaker-list.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ActionSheet, ActionSheetController, Config, IonicPage, NavController } from 'ionic-angular'; -import { InAppBrowser } from '@ionic-native/inappbrowser'; +import { InAppBrowser } from '@ionic-native/in-app-browser'; import { ConferenceData } from '../../providers/conference-data'; @@ -19,7 +19,8 @@ export class SpeakerListPage { public actionSheetCtrl: ActionSheetController, public navCtrl: NavController, public confData: ConferenceData, - public config: Config + public config: Config, + public inAppBrowser: InAppBrowser ) { } ionViewDidLoad() { @@ -37,7 +38,7 @@ export class SpeakerListPage { } goToSpeakerTwitter(speaker: any) { - new InAppBrowser(`https://twitter.com/${speaker.twitter}`, '_blank'); + this.inAppBrowser.create(`https://twitter.com/${speaker.twitter}`, '_blank'); } openSpeakerShare(speaker: any) {