From bf9494f1ee9f3445d1bd8af439a8e7ada390dcc5 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 11 Jan 2018 08:27:11 +0100 Subject: [PATCH] MOBILE-2302 core: Move all ionic native declarations to emulator --- src/app/app.module.ts | 8 -------- src/core/emulator/emulator.module.ts | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5924e2f89..979d5f135 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -18,10 +18,6 @@ import { IonicApp, IonicModule, Platform } from 'ionic-angular'; import { HttpModule } from '@angular/http'; import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; -import { SplashScreen } from '@ionic-native/splash-screen'; -import { StatusBar } from '@ionic-native/status-bar'; -import { SQLite } from '@ionic-native/sqlite'; -import { Keyboard } from '@ionic-native/keyboard'; import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; @@ -98,10 +94,6 @@ export function createTranslateLoader(http: HttpClient) { useClass: CoreInterceptor, multi: true, }, - StatusBar, - SplashScreen, - SQLite, - Keyboard, CoreLoggerProvider, CoreDbProvider, CoreAppProvider, diff --git a/src/core/emulator/emulator.module.ts b/src/core/emulator/emulator.module.ts index 0e18b1e1f..d4724b600 100644 --- a/src/core/emulator/emulator.module.ts +++ b/src/core/emulator/emulator.module.ts @@ -20,8 +20,12 @@ import { File } from '@ionic-native/file'; import { FileTransfer } from '@ionic-native/file-transfer'; import { Globalization } from '@ionic-native/globalization'; import { InAppBrowser } from '@ionic-native/in-app-browser'; +import { Keyboard } from '@ionic-native/keyboard'; import { LocalNotifications } from '@ionic-native/local-notifications'; import { Network } from '@ionic-native/network'; +import { SplashScreen } from '@ionic-native/splash-screen'; +import { StatusBar } from '@ionic-native/status-bar'; +import { SQLite } from '@ionic-native/sqlite'; import { Zip } from '@ionic-native/zip'; import { ClipboardMock } from './providers/clipboard'; @@ -86,6 +90,7 @@ import { CoreInitDelegate } from '../../providers/init'; return !appProvider.isDesktop() ? new InAppBrowser() : new InAppBrowserMock(appProvider, fileProvider, urlUtils); } }, + Keyboard, { provide: LocalNotifications, deps: [CoreAppProvider, CoreUtilsProvider], @@ -102,6 +107,9 @@ import { CoreInitDelegate } from '../../providers/init'; return platform.is('cordova') ? new Network() : new NetworkMock(); } }, + SplashScreen, + StatusBar, + SQLite, { provide: Zip, deps: [CoreAppProvider, File, CoreMimetypeUtilsProvider, CoreTextUtilsProvider],