Skip to content

Commit ce2d735

Browse files
yannbfyannbf
authored
Merge pull request yannbf#24 from yannbf/feature/ionic3-update
Update ionic version to 3.x
2 parents ed31b09 + ec2eb2a commit ce2d735

File tree

29 files changed

+214
-188
lines changed

29 files changed

+214
-188
lines changed

‎config.xml

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,68 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<widget id="com.braga.advancedionic2components.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3-
<name>Advanced Ionic2 Components</name>
4-
<description>An awesome Ionic/Cordova app.</description>
5-
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
6-
<content src="index.html"/>
7-
<access origin="*"/>
8-
<allow-navigation href="http://ionic.local/*"/>
9-
<allow-intent href="http://*/*"/>
10-
<allow-intent href="https://*/*"/>
11-
<allow-intent href="tel:*"/>
12-
<allow-intent href="sms:*"/>
13-
<allow-intent href="mailto:*"/>
14-
<allow-intent href="geo:*"/>
15-
<engine name="android" spec="~6.1.2" />
16-
<platform name="android">
17-
<allow-intent href="market:*"/>
18-
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
19-
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
20-
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
21-
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
22-
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
23-
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
24-
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
25-
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
26-
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
27-
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
28-
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
29-
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
30-
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
31-
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
32-
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
33-
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
34-
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
35-
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
36-
</platform>
37-
<platform name="ios">
38-
<allow-intent href="itms:*"/>
39-
<allow-intent href="itms-apps:*"/>
40-
</platform>
41-
<preference name="webviewbounce" value="false"/>
42-
<preference name="UIWebViewBounce" value="false"/>
43-
<preference name="DisallowOverscroll" value="true"/>
44-
<preference name="android-minSdkVersion" value="16"/>
45-
<preference name="BackupWebStorage" value="none"/>
46-
<preference name="AutoHideSplashScreen" value="false"/>
47-
<preference name="SplashMaintainAspectRatio" value="true"/>
48-
<preference name="FadeSplashScreenDuration" value="300"/>
49-
<preference name="SplashShowOnlyFirstTime" value="false"/>
50-
<preference name="loadUrlTimeoutValue" value="70000"/>
51-
<preference name="SplashScreen" value="screen"/>
52-
<preference name="SplashScreenDelay" value="3000"/>
53-
<feature name="StatusBar">
54-
<param name="ios-package" onload="true" value="CDVStatusBar"/>
55-
</feature>
56-
<plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
57-
<plugin name="cordova-plugin-whitelist" spec="1.3.1"/>
58-
<plugin name="cordova-plugin-console" spec="1.0.5"/>
59-
<plugin name="cordova-plugin-statusbar" spec="2.2.1"/>
60-
<plugin name="cordova-plugin-device" spec="1.1.4"/>
61-
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1"/>
62-
<plugin name="cordova-plugin-camera" spec="~2.3.0"/>
63-
<plugin name="card.io.cordova.mobilesdk" spec="https://github.com/card-io/card.io-Cordova-Plugin"/>
64-
<plugin name="cordova.plugins.diagnostic" spec="~3.4.1"/>
65-
<icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
66-
</widget>
3+
<name>Advanced Ionic2 Components</name>
4+
<description>An awesome Ionic/Cordova app.</description>
5+
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
6+
<content src="index.html" />
7+
<access origin="*" />
8+
<allow-navigation href="http://ionic.local/*" />
9+
<allow-intent href="http://*/*" />
10+
<allow-intent href="https://*/*" />
11+
<allow-intent href="tel:*" />
12+
<allow-intent href="sms:*" />
13+
<allow-intent href="mailto:*" />
14+
<allow-intent href="geo:*" />
15+
<engine name="android" spec="~6.1.2" />
16+
<platform name="android">
17+
<allow-intent href="market:*" />
18+
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
19+
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
20+
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
21+
<splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
22+
<splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
23+
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
24+
<splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
25+
<splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
26+
<splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
27+
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
28+
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
29+
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
30+
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
31+
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
32+
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
33+
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
34+
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
35+
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
36+
</platform>
37+
<platform name="ios">
38+
<allow-intent href="itms:*" />
39+
<allow-intent href="itms-apps:*" />
40+
</platform>
41+
<preference name="webviewbounce" value="false" />
42+
<preference name="UIWebViewBounce" value="false" />
43+
<preference name="DisallowOverscroll" value="true" />
44+
<preference name="android-minSdkVersion" value="16" />
45+
<preference name="BackupWebStorage" value="none" />
46+
<preference name="AutoHideSplashScreen" value="false" />
47+
<preference name="SplashMaintainAspectRatio" value="true" />
48+
<preference name="FadeSplashScreenDuration" value="300" />
49+
<preference name="SplashShowOnlyFirstTime" value="false" />
50+
<preference name="loadUrlTimeoutValue" value="70000" />
51+
<preference name="SplashScreen" value="screen" />
52+
<preference name="SplashScreenDelay" value="3000" />
53+
<feature name="StatusBar">
54+
<param name="ios-package" onload="true" value="CDVStatusBar" />
55+
</feature>
56+
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
57+
<plugin name="cordova-plugin-whitelist" spec="1.3.1" />
58+
<plugin name="cordova-plugin-console" spec="1.0.5" />
59+
<plugin name="cordova-plugin-statusbar" spec="2.2.1" />
60+
<plugin name="cordova-plugin-device" spec="1.1.4" />
61+
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1" />
62+
<icon src="resources/android/icon/drawable-xhdpi-icon.png" />
63+
<plugin name="cordova-plugin-camera" spec="~2.3.1" />
64+
<plugin name="phonegap-plugin-barcodescanner" spec="~6.0.6" />
65+
<plugin name="cordova.plugins.diagnostic" spec="~3.4.1" />
66+
<plugin name="cordova-plugin-geolocation" spec="~2.4.2" />
67+
<plugin name="card.io.cordova.mobilesdk" spec="https://github.com/card-io/card.io-Cordova-Plugin" />
68+
</widget>

‎package.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,35 @@
1010
"ionic:serve": "ionic-app-scripts serve"
1111
},
1212
"dependencies": {
13-
"@angular/common": "2.2.1",
14-
"@angular/compiler": "2.2.1",
15-
"@angular/compiler-cli": "2.2.1",
16-
"@angular/core": "2.2.1",
17-
"@angular/forms": "2.2.1",
18-
"@angular/http": "2.2.1",
19-
"@angular/platform-browser": "2.2.1",
20-
"@angular/platform-browser-dynamic": "2.2.1",
21-
"@angular/platform-server": "2.2.1",
22-
"@ionic/storage": "1.1.7",
13+
"@angular/common": "4.0.0",
14+
"@angular/compiler": "4.0.0",
15+
"@angular/compiler-cli": "4.0.0",
16+
"@angular/core": "4.0.0",
17+
"@angular/forms": "4.0.0",
18+
"@angular/http": "4.0.0",
19+
"@angular/platform-browser": "4.0.0",
20+
"@angular/platform-browser-dynamic": "4.0.0",
21+
"@ionic-native/barcode-scanner": "^3.4.4",
22+
"@ionic-native/camera": "^3.4.4",
23+
"@ionic-native/card-io": "^3.4.4",
24+
"@ionic-native/core": "^3.4.2",
25+
"@ionic-native/diagnostic": "^3.4.4",
26+
"@ionic-native/geolocation": "^3.4.4",
27+
"@ionic-native/splash-screen": "3.4.2",
28+
"@ionic-native/status-bar": "3.4.2",
29+
"@ionic/storage": "2.0.1",
2330
"angular2-swing": "^0.10.0",
24-
"ionic-angular": "2.1.0",
25-
"ionic-native": "2.4.1",
31+
"chart.js": "^2.4.0",
32+
"ionic-angular": "3.0.0",
2633
"ionicons": "3.0.0",
2734
"moment": "^2.15.2",
28-
"chart.js": "^2.4.0",
29-
"rxjs": "5.0.0-beta.12",
35+
"rxjs": "5.1.1",
3036
"sw-toolbox": "3.4.0",
31-
"zone.js": "0.6.26"
37+
"zone.js": "^0.8.4"
3238
},
3339
"devDependencies": {
34-
"@ionic/app-scripts": "1.1.3",
35-
"typescript": "2.0.9"
40+
"@ionic/app-scripts": "1.3.0",
41+
"typescript": "~2.2.1"
3642
},
3743
"cordovaPlugins": [
3844
"cordova-plugin-whitelist",

‎src/app/app.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import { MiscellaneousListPage } from '../pages/miscellaneous/miscellaneous';
1111
import { ProfileListPage } from '../pages/profile/profile';
1212
import { Component, ViewChild } from '@angular/core';
1313
import { Nav, Platform } from 'ionic-angular';
14-
import { StatusBar, Splashscreen } from 'ionic-native';
14+
import { StatusBar } from '@ionic-native/status-bar';
15+
import { SplashScreen } from '@ionic-native/splash-screen';
1516

1617
import { HomePage } from '../pages/_home/home';
1718

@@ -30,7 +31,7 @@ export class MyApp {
3031
rightMenuItems: Array<{ icon: string, active: boolean }>;
3132
state: any;
3233

33-
constructor(public platform: Platform, public global: AppState) {
34+
constructor(public platform: Platform, public statusBar: StatusBar, public splashscreen: SplashScreen, public global: AppState) {
3435
this.initializeApp();
3536
this.rightMenuItems = [
3637
{ icon: 'home', active: true },
@@ -72,8 +73,8 @@ export class MyApp {
7273
this.global.set('theme', '');
7374
// Okay, so the platform is ready and our plugins are available.
7475
// Here you can do any higher level native things you might need.
75-
StatusBar.styleDefault();
76-
Splashscreen.hide();
76+
this.statusBar.styleDefault();
77+
this.splashscreen.hide();
7778
});
7879
}
7980

‎src/app/app.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<ion-content>
2020
<div #header>
2121
<ion-row style="align-items:center;">
22-
<ion-col width-25>
22+
<ion-col col-3>
2323
<img src="assets/icon/icon-email.svg" />
2424
<span class="icon-badge">4</span>
2525
</ion-col>
26-
<ion-col width-50>
26+
<ion-col col-6>
2727
<img class="user-avatar round" [src]="chosenPicture || placeholder" onerror="this.src='assets/img/avatar/girl-avatar.png'"
2828
/>
2929
</ion-col>
30-
<ion-col width-25>
30+
<ion-col col-3>
3131
<img src="assets/icon/icon-calendar.svg" />
3232
</ion-col>
3333
</ion-row>

‎src/app/app.imports.ts

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { LoginBackgroundSliderPage } from '../pages/login/login-background-slider/login-background-slider';
2-
import { SideMenuPage } from '../pages/side-menu/side-menu';
31
// Global state (used for theming)
42
import { AppState } from './app.global';
53

@@ -30,6 +28,7 @@ import { LoginOnePage } from '../pages/login/login-one/login-one';
3028
import { LoginInstagramPage } from '../pages/login/login-instagram/login-instagram';
3129
import { LoginSliderPage } from '../pages/login/login-slider/login-slider';
3230
import { LoginBackgroundVideoPage } from '../pages/login/login-background-video/login-background-video';
31+
import { LoginBackgroundSliderPage } from '../pages/login/login-background-slider/login-background-slider';
3332

3433
// Popup Menu list
3534
import { PopupMenuListPage } from '../pages/popup-menu/popup-menu';
@@ -90,13 +89,23 @@ import { GetImagePage } from '../pages/miscellaneous/get-image/get-image';
9089
import { BarcodescannerPage } from '../pages/miscellaneous/barcodescanner/barcodescanner';
9190
import { ExpandableHeaderPage } from '../pages/miscellaneous/expandable-header/expandable-header';
9291
import { FlashCardPage } from '../pages/miscellaneous/flash-card/flash-card';
92+
import { SideMenuPage } from '../pages/side-menu/side-menu';
9393

9494
// Providers
9595
import { WeatherService } from '../pages/miscellaneous/weather/weather.service';
9696
import { ToastService } from '../providers/util/toast.service';
9797
import { AlertService } from '../providers/util/alert.service';
9898
import { CameraProvider } from '../providers/util/camera.provider';
9999

100+
// Ionic native providers
101+
import { CardIO } from '@ionic-native/card-io';
102+
import { BarcodeScanner } from '@ionic-native/barcode-scanner';
103+
import { Camera } from '@ionic-native/camera';
104+
import { Diagnostic } from '@ionic-native/diagnostic';
105+
import { Geolocation } from '@ionic-native/geolocation';
106+
import { StatusBar } from '@ionic-native/status-bar';
107+
import { SplashScreen } from '@ionic-native/splash-screen';
108+
100109
// Directives
101110
import { SlidingDrawer } from '../components/sliding-drawer/sliding-drawer';
102111

@@ -114,6 +123,16 @@ import { OrderByPipe } from '../pipes/orderby.pipe';
114123
import { ShortenStringPipe } from '../pipes/shorten.pipe';
115124
import { CapitalizePipe } from '../pipes/capitalize.pipe';
116125

126+
// Modules
127+
import { SwingModule } from 'angular2-swing';
128+
import { BrowserModule } from '@angular/platform-browser';
129+
import { HttpModule } from '@angular/http';
130+
131+
export const Modules = [
132+
SwingModule,
133+
BrowserModule,
134+
HttpModule,
135+
]
117136

118137
export const Pages = [
119138
// Home
@@ -216,7 +235,20 @@ export const Pipes = [
216235
]
217236

218237
export const Providers = [
219-
WeatherService, AlertService, ToastService, AppState, CameraProvider
238+
WeatherService,
239+
AlertService,
240+
ToastService,
241+
AppState,
242+
CameraProvider,
243+
244+
// Ionic native specific providers
245+
BarcodeScanner,
246+
Camera,
247+
Diagnostic,
248+
Geolocation,
249+
CardIO,
250+
StatusBar,
251+
SplashScreen,
220252
]
221253

222254
export const Components = [

‎src/app/app.module.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { NgModule, ErrorHandler } from '@angular/core';
22
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
33
import { MyApp } from './app.component';
4-
import { SwingModule } from 'angular2-swing';
54

6-
import { Pages, Directives, Pipes, Providers, Components } from './app.imports';
5+
import { Modules, Pages, Directives, Pipes, Providers, Components } from './app.imports';
76

87
@NgModule({
98
declarations: [
@@ -15,8 +14,8 @@ import { Pages, Directives, Pipes, Providers, Components } from './app.imports';
1514
Pipes
1615
],
1716
imports: [
18-
IonicModule.forRoot(MyApp),
19-
SwingModule
17+
Modules,
18+
IonicModule.forRoot(MyApp)
2019
],
2120
bootstrap: [IonicApp],
2221
entryComponents: [

‎src/assets/img/avatar/cosima-avatar.jpg

6.79 KB
Loading

‎src/pages/login/login-background-video/login-background-video.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ion-navbar transparent>
33
</ion-navbar>
44
</ion-header>
5-
<ion-content fullscreen padding>
5+
<ion-content fullscreen padding text-center>
66
<img class="logo" src="assets/img/logo/logo-canon.png" />
77
<div class="buttons">
88
<button ion-button class="login-button facebook" (click)="goToLogin()">Continue with Facebook</button>

‎src/pages/login/login-slider/login-slider.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ion-navbar>
44
</ion-navbar>
55
</ion-header>
6-
<ion-slides #slider class="content-slider" [options]="{direction: 'vertical'}">
6+
<ion-slides #slider class="content-slider" direction="vertical">
77
<ion-slide class="swiper-no-swiping">
88
<div padding>
99
<img class="logo" src="assets/img/logo/logo-pr.png" />
10-
<ion-slides class="text-slider" [options]="{autoplay: 2000}">
10+
<ion-slides class="text-slider" autoplay="2000">
1111
<ion-slide>
1212
<h3> Really nice stuff </h3>
1313
</ion-slide>
@@ -22,10 +22,10 @@ <h3> Share what you love </h3>
2222
</ion-slide>
2323
</ion-slides>
2424
<ion-row>
25-
<ion-col width-50>
25+
<ion-col col-6>
2626
<button ion-button round color="light" class="login-button" (click)="goToLogin()">SIGN IN</button>
2727
</ion-col>
28-
<ion-col width-50>
28+
<ion-col col-6>
2929
<button ion-button round color="light" class="login-button" (click)="goToSignup()">SIGN UP</button>
3030
</ion-col>
3131
</ion-row>

‎src/pages/miscellaneous/barcodescanner/barcodescanner.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from '@angular/core';
22
import { NavController, AlertController } from 'ionic-angular';
3-
import { BarcodeScanner } from 'ionic-native';
3+
import { BarcodeScanner } from '@ionic-native/barcode-scanner';
44

55
@Component({
66
selector: 'page-barcodescanner',
@@ -10,7 +10,8 @@ export class BarcodescannerPage {
1010

1111
public barcodeData;
1212

13-
constructor(public navCtrl: NavController, public alertCtrl: AlertController) { }
13+
constructor(public navCtrl: NavController,
14+
public barcodeScanner: BarcodeScanner, public alertCtrl: AlertController) { }
1415

1516
ionViewDidLoad() {
1617
console.log('ionViewDidLoad BarcodescannerPage');
@@ -32,7 +33,7 @@ export class BarcodescannerPage {
3233
disableSuccessBeep: false // iOS
3334
};
3435

35-
BarcodeScanner.scan(options)
36+
this.barcodeScanner.scan(options)
3637
.then((data) => {
3738
this.barcodeData = data;
3839
let alert = this.alertCtrl.create({

0 commit comments

Comments
 (0)