diff --git a/.gitignore b/.gitignore index 1c0466b..0b84276 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ node_modules/ www/build/ platforms/ plugins/ +typings/ *.swp .DS_Store Thumbs.db diff --git a/app/app.core.scss b/app/app.core.scss deleted file mode 100644 index 352b889..0000000 --- a/app/app.core.scss +++ /dev/null @@ -1,12 +0,0 @@ -// http://ionicframework.com/docs/v2/theming/ - - -// App Shared Imports -// -------------------------------------------------- -// These are the imports which make up the design of this app. -// By default each design mode includes these shared imports. -// App Shared Sass variables belong in app.variables.scss. - -@import "pages/movie-list/movie-list"; - -@import "pages/movie-info/movie-info"; \ No newline at end of file diff --git a/app/app.html b/app/app.html deleted file mode 100644 index bbeb8c8..0000000 --- a/app/app.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/app.ios.scss b/app/app.ios.scss deleted file mode 100644 index d196121..0000000 --- a/app/app.ios.scss +++ /dev/null @@ -1,31 +0,0 @@ -// http://ionicframework.com/docs/v2/theming/ - - -// App Shared Variables -// -------------------------------------------------- -// Shared Sass variables go in the app.varialbes.scss file -@import 'app.variables'; - - -// App iOS Variables -// -------------------------------------------------- -// iOS only Sass variables can go here - - -// Ionic iOS Sass -// -------------------------------------------------- -// Custom App variables must be declared before importing Ionic. -// Ionic will use its default values when a custom variable isn't provided. -@import "ionic.ios"; - - -// App Shared Sass -// -------------------------------------------------- -// All Sass files that make up this app goes into the app.core.scss file. -// For simpler CSS overrides, custom app CSS must come after Ionic's CSS. -@import 'app.core'; - - -// App iOS Only Sass -// -------------------------------------------------- -// CSS that should only apply to the iOS app diff --git a/app/app.js b/app/app.js deleted file mode 100644 index 0b3fa0d..0000000 --- a/app/app.js +++ /dev/null @@ -1,29 +0,0 @@ -import 'es6-shim'; -import {App, IonicApp, Platform} from 'ionic-angular'; -import {StatusBar} from 'ionic-native'; -import {MovieListPage} from './pages/movie-list/movie-list'; - -@App({ - templateUrl: 'build/app.html', - config: {} -}) - -class MyApp { - static get parameters() { - return [[IonicApp], [Platform]]; - } - - constructor(app, platform) { - this.app = app; - this.platform = platform; - this.initializeApp(); - - this.rootPage = MovieListPage; - } - - initializeApp() { - this.platform.ready().then(() => { - StatusBar.styleDefault(); - }); - } -} \ No newline at end of file diff --git a/app/app.md.scss b/app/app.md.scss deleted file mode 100644 index 1870f0c..0000000 --- a/app/app.md.scss +++ /dev/null @@ -1,31 +0,0 @@ -// http://ionicframework.com/docs/v2/theming/ - - -// App Shared Variables -// -------------------------------------------------- -// Shared Sass variables go in the app.varialbes.scss file -@import 'app.variables'; - - -// App Material Design Variables -// -------------------------------------------------- -// Material Design only Sass variables can go here - - -// Ionic Material Design Sass -// -------------------------------------------------- -// Custom App variables must be declared before importing Ionic. -// Ionic will use its default values when a custom variable isn't provided. -@import "ionic.md"; - - -// App Shared Sass -// -------------------------------------------------- -// All Sass files that make up this app goes into the app.core.scss file. -// For simpler CSS overrides, custom app CSS must come after Ionic's CSS. -@import 'app.core'; - - -// App Material Design Only Sass -// -------------------------------------------------- -// CSS that should only apply to the Material Design app diff --git a/app/app.ts b/app/app.ts new file mode 100644 index 0000000..d3426fa --- /dev/null +++ b/app/app.ts @@ -0,0 +1,21 @@ +import {App, Platform} from 'ionic-angular'; +import {StatusBar} from 'ionic-native'; +import {MovieListPage} from './pages/movie-list/movie-list'; + + +@App({ + template: '', + config: {} // http://ionicframework.com/docs/v2/api/config/Config/ +}) +export class MyApp { + + rootPage: any = MovieListPage; + + constructor(platform: Platform) { + 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. + StatusBar.styleDefault(); + }); + } +} diff --git a/app/app.variables.scss b/app/app.variables.scss deleted file mode 100644 index dfa9f7c..0000000 --- a/app/app.variables.scss +++ /dev/null @@ -1,30 +0,0 @@ -// http://ionicframework.com/docs/v2/theming/ - - -// App Shared Variables -// -------------------------------------------------- -// To customize the look and feel of this app, you can override -// the Sass variables found in Ionic's source scss files. Setting -// variables before Ionic's Sass will use these variables rather than -// Ionic's default Sass variable values. App Shared Sass imports belong -// in the app.core.scss file and not this file. Sass variables specific -// to the mode belong in either the app.ios.scss or app.md.scss files. - - -// App Shared Color Variables -// -------------------------------------------------- -// It's highly recommended to change the default colors -// to match your app's branding. Ionic uses a Sass map of -// colors so you can add, rename and remove colors as needed. -// The "primary" color is the only required color in the map. -// Both iOS and MD colors can be further customized if colors -// are different per mode. - -$colors: ( - primary: #387ef5, - secondary: #32db64, - danger: #f53d3d, - light: #f4f4f4, - dark: #222, - favorite: #69BB7B -); diff --git a/app/pages/movie-info/movie-info.html b/app/pages/movie-info/movie-info.html index 858e035..bba6d2d 100644 --- a/app/pages/movie-info/movie-info.html +++ b/app/pages/movie-info/movie-info.html @@ -1,30 +1,30 @@ - Movie Details + Movie Details -
- - - - - - -

{{movie.title}}

-

{{movie.release_date}}

- - +
+ + + + + + +

{{movie.title}}

+

{{movie.release_date}}

+ + - - -

Overview

-

{{movie.overview}}

- - - -

Average Vote

-

{{movie.vote_average}}

- - -
+ + +

Overview

+

{{movie.overview}}

+ + + +

Average Vote

+

{{movie.vote_average}}

+ + +
diff --git a/app/pages/movie-info/movie-info.js b/app/pages/movie-info/movie-info.js deleted file mode 100644 index 4fa9863..0000000 --- a/app/pages/movie-info/movie-info.js +++ /dev/null @@ -1,17 +0,0 @@ -import {IonicApp, Page, NavController, NavParams} from 'ionic-angular'; - -@Page({ - templateUrl: 'build/pages/movie-info/movie-info.html' -}) - -export class MovieInfo { - static get parameters() { - return [[IonicApp], [NavController], [NavParams]]; - } - - constructor(app, nav, navParams) { - this.nav = nav; - this.movie = navParams.get('movie'); - console.log(this.movie); - } -} diff --git a/app/pages/movie-info/movie-info.scss b/app/pages/movie-info/movie-info.scss index d17c449..f3b58cf 100644 --- a/app/pages/movie-info/movie-info.scss +++ b/app/pages/movie-info/movie-info.scss @@ -1,16 +1,16 @@ div.selection { - font-size: 22px; - display: block; - text-align: center; - padding-top: 5%; + font-size: 22px; + display: block; + text-align: center; + padding-top: 5%; } ion-card ion-item ion-avatar img { - max-width: 10rem !important; - max-height: 10rem !important; - border-radius: 0 !important; + max-width: 10rem !important; + max-height: 10rem !important; + border-radius: 0 !important; } .item-description { - white-space: normal !important; -} \ No newline at end of file + white-space: normal !important; +} diff --git a/app/pages/movie-info/movie-info.ts b/app/pages/movie-info/movie-info.ts new file mode 100644 index 0000000..6deb707 --- /dev/null +++ b/app/pages/movie-info/movie-info.ts @@ -0,0 +1,16 @@ +import {IonicApp, Page, NavController, NavParams} from 'ionic-angular'; + +@Page({ + templateUrl: 'build/pages/movie-info/movie-info.html' +}) + +export class MovieInfo { + + private movie: any; + + constructor(private app: IonicApp, private nav: NavController, private navParams: NavParams) { + this.nav = nav; + this.movie = navParams.get('movie'); + console.log(this.movie); + } +} diff --git a/app/pages/movie-list/movie-list.html b/app/pages/movie-list/movie-list.html index 3726e08..8840285 100644 --- a/app/pages/movie-list/movie-list.html +++ b/app/pages/movie-list/movie-list.html @@ -1,22 +1,21 @@ - - Movie List + Movie List - - - - - - + + + + + + - - - - -

{{movie.original_title}}

-

{{movie.overview}}

- - + + + + +

{{movie.original_title}}

+

{{movie.overview}}

+ + diff --git a/app/pages/movie-list/movie-list.js b/app/pages/movie-list/movie-list.js deleted file mode 100644 index 5849f45..0000000 --- a/app/pages/movie-list/movie-list.js +++ /dev/null @@ -1,35 +0,0 @@ -import {Page, NavController} from 'ionic-angular'; -import {MovieService} from '../services/MovieService'; -import {MovieInfo} from '../movie-info/movie-info'; - -@Page({ - templateUrl: 'build/pages/movie-list/movie-list.html', - providers: [MovieService] -}) - -export class MovieListPage { - static get parameters() { - return [[NavController], [MovieService]]; - } - - constructor(nav, movieService) { - this.nav = nav; - this.movieService = movieService; - } - - searchMovieDB(event, key) { - if(event.target.value.length > 2) { - this.movieService.searchMovies(event.target.value).subscribe( - data => {this.movies = data.results; console.log(data);}, - err => this.logError(err), - () => console.log('Movie Search Complete') - ); - } - } - - itemTapped(event, movie) { - this.nav.push(MovieInfo, { - movie: movie - }); - } -} \ No newline at end of file diff --git a/app/pages/movie-list/movie-list.scss b/app/pages/movie-list/movie-list.scss index 7017a27..682cf91 100644 --- a/app/pages/movie-list/movie-list.scss +++ b/app/pages/movie-list/movie-list.scss @@ -1,19 +1,19 @@ .getting-started { - p { - margin: 20px 0; - line-height: 22px; - font-size: 16px; - } + p { + margin: 20px 0; + line-height: 22px; + font-size: 16px; + } } ion-avatar img { - max-width: 5rem !important; - max-height: 5rem !important; - border-radius: 0 !important; + max-width: 5rem !important; + max-height: 5rem !important; + border-radius: 0 !important; } .item-description { - white-space: normal !important; + white-space: normal !important; } diff --git a/app/pages/movie-list/movie-list.ts b/app/pages/movie-list/movie-list.ts new file mode 100644 index 0000000..a7be663 --- /dev/null +++ b/app/pages/movie-list/movie-list.ts @@ -0,0 +1,37 @@ +import {Page, NavController} from 'ionic-angular'; +import {MovieService} from '../services/movie-service'; +import {MovieInfo} from '../movie-info/movie-info'; + +@Page({ + templateUrl: 'build/pages/movie-list/movie-list.html', + providers: [MovieService] +}) + +export class MovieListPage { + + private movies: any; + + constructor(private nav: NavController, private movieService: MovieService) { + } + + searchMovieDB(event, key) { + if(event.target.value.length > 2) { + this.movieService.searchMovies(event.target.value).subscribe( + data => {this.movies = data.results; console.log(data);}, + err => this.logError(err), + () => console.log('Movie Search Complete') + ); + } + } + + itemTapped(event, movie) { + this.nav.push(MovieInfo, { + movie: movie + }); + } + + logError(err: any) : void { + + } + +} diff --git a/app/pages/services/MovieService.js b/app/pages/services/MovieService.js deleted file mode 100644 index f60b389..0000000 --- a/app/pages/services/MovieService.js +++ /dev/null @@ -1,18 +0,0 @@ -import {Http} from 'angular2/http'; -import 'rxjs/add/operator/map'; - -export class MovieService { - static get parameters() { - return [[Http]]; - } - - constructor(http) { - this.http = http - } - - searchMovies(movieName) { - var url = 'http://api.themoviedb.org/3/search/movie?query=&query=' + encodeURI(movieName) + '&api_key=5fbddf6b517048e25bc3ac1bbeafb919'; - this.response = this.http.get(url).map(res => res.json()); - return this.response; - } -} \ No newline at end of file diff --git a/app/pages/services/movie-service.ts b/app/pages/services/movie-service.ts new file mode 100644 index 0000000..2664668 --- /dev/null +++ b/app/pages/services/movie-service.ts @@ -0,0 +1,21 @@ +import {Injectable} from 'angular2/core'; +import {Http} from 'angular2/http'; +import 'rxjs/add/operator/map'; + +@Injectable() +export class MovieService { + + private response: any; + + constructor(private http: Http) { + } + + searchMovies(movieName): any { + + const url: string = 'http://api.themoviedb.org/3/search/movie?query=&query=' + encodeURI(movieName) + '&api_key=5fbddf6b517048e25bc3ac1bbeafb919'; + this.response = this.http.get(url).map(res => res.json()); + return this.response; + + } + +} diff --git a/app/theme/app.core.scss b/app/theme/app.core.scss index d85b76b..62358be 100644 --- a/app/theme/app.core.scss +++ b/app/theme/app.core.scss @@ -9,4 +9,4 @@ @import "../pages/movie-list/movie-list"; -@import "../pages/movie-info/movie-info"; \ No newline at end of file +@import "../pages/movie-info/movie-info"; diff --git a/app/theme/app.ios.scss b/app/theme/app.ios.scss index 18676a0..14ffaaf 100644 --- a/app/theme/app.ios.scss +++ b/app/theme/app.ios.scss @@ -16,7 +16,7 @@ // -------------------------------------------------- // Custom App variables must be declared before importing Ionic. // Ionic will use its default values when a custom variable isn't provided. -@import "ionic.ios"; +@import 'ionic.ios'; // App Shared Sass diff --git a/app/theme/app.md.scss b/app/theme/app.md.scss index 2041b8d..f2bfdcf 100644 --- a/app/theme/app.md.scss +++ b/app/theme/app.md.scss @@ -16,7 +16,7 @@ // -------------------------------------------------- // Custom App variables must be declared before importing Ionic. // Ionic will use its default values when a custom variable isn't provided. -@import "ionic.md"; +@import 'ionic.md'; // App Shared Sass diff --git a/app/theme/app.variables.scss b/app/theme/app.variables.scss index dfa9f7c..e957916 100644 --- a/app/theme/app.variables.scss +++ b/app/theme/app.variables.scss @@ -1,5 +1,10 @@ // http://ionicframework.com/docs/v2/theming/ +// Ionic Shared Functions +// -------------------------------------------------- +// Makes Ionic Sass functions available to your App + +@import 'globals.core'; // App Shared Variables // -------------------------------------------------- diff --git a/config.xml b/config.xml index 02388e1..90e1beb 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Ionic2FirstApp An Ionic Framework and Cordova project. Ionic Framework Team @@ -13,23 +13,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 86d812a..0f2edd0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,7 @@ var gulp = require('gulp'), gulpWatch = require('gulp-watch'), del = require('del'), + runSequence = require('run-sequence'), argv = process.argv; @@ -26,23 +27,46 @@ gulp.task('run:before', [shouldWatch ? 'watch' : 'build']); * changes, but you are of course welcome (and encouraged) to customize your * build however you see fit. */ -var buildBrowserify = require('ionic-gulp-browserify-es2015'); +var buildBrowserify = require('ionic-gulp-browserify-typescript'); var buildSass = require('ionic-gulp-sass-build'); var copyHTML = require('ionic-gulp-html-copy'); var copyFonts = require('ionic-gulp-fonts-copy'); var copyScripts = require('ionic-gulp-scripts-copy'); -gulp.task('watch', ['sass', 'html', 'fonts', 'scripts'], function(){ - gulpWatch('app/**/*.scss', function(){ gulp.start('sass'); }); - gulpWatch('app/**/*.html', function(){ gulp.start('html'); }); - return buildBrowserify({ watch: true }); +var isRelease = argv.indexOf('--release') > -1; + +gulp.task('watch', ['clean'], function(done){ + runSequence( + ['sass', 'html', 'fonts', 'scripts'], + function(){ + gulpWatch('app/**/*.scss', function(){ gulp.start('sass'); }); + gulpWatch('app/**/*.html', function(){ gulp.start('html'); }); + buildBrowserify({ watch: true }).on('end', done); + } + ); +}); + +gulp.task('build', ['clean'], function(done){ + runSequence( + ['sass', 'html', 'fonts', 'scripts'], + function(){ + buildBrowserify({ + minify: isRelease, + browserifyOptions: { + debug: !isRelease + }, + uglifyOptions: { + mangle: false + } + }).on('end', done); + } + ); }); -gulp.task('build', ['sass', 'html', 'fonts', 'scripts'], buildBrowserify); gulp.task('sass', buildSass); gulp.task('html', copyHTML); gulp.task('fonts', copyFonts); gulp.task('scripts', copyScripts); -gulp.task('clean', function(done){ - del('www/build', done); -}); \ No newline at end of file +gulp.task('clean', function(){ + return del('www/build'); +}); diff --git a/hooks/after_prepare/010_add_platform_class.js b/hooks/after_prepare/010_add_platform_class.js old mode 100644 new mode 100755 diff --git a/ionic.config.js b/ionic.config.js deleted file mode 100644 index 1d140ba..0000000 --- a/ionic.config.js +++ /dev/null @@ -1,11 +0,0 @@ -// Ionic CLI is no longer responsible for building your web assets, and now -// relies on gulp hooks instead. This file was used for exposing web build -// configuration and is no longer necessary. -// If this file is executed when running ionic commands, then an update to the -// CLI is needed. -// -// If your version of the Ionic CLI is beta.21 or greater, you can delete this file. -console.log('\nFrom ionic.config.js:'); -console.log('\nPlease update your version of the Ionic CLI:'); -console.log(' npm install -g ionic@beta\n'); -process.exit(1); diff --git a/ionic.config.json b/ionic.config.json index 05bf29b..c5481df 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,5 +1,6 @@ { "name": "Ionic2FirstApp", "app_id": "", - "v2": true + "v2": true, + "typescript": true } diff --git a/package.json b/package.json index 2b8c770..f753f31 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,25 @@ { "dependencies": { - "angular2": "2.0.0-beta.6", - "es6-promise": "3.0.2", - "es6-shim": "0.33.13", - "ionic-angular": "2.0.0-beta.3", - "ionic-native": "^1.1.0", - "ionicons": "3.0.0-alpha.3", + "angular2": "2.0.0-beta.15", + "es6-shim": "^0.35.1", + "ionic-angular": "2.0.0-beta.6", + "ionic-native": "^1.2.1", + "ionicons": "3.0.0", + "rxjs": "5.0.0-beta.2", "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.0", - "zone.js": "0.5.14" + "zone.js": "0.6.10" }, "devDependencies": { - "babel-plugin-transform-decorators-legacy": "1.3.4", - "babel-preset-es2015": "6.6.0", - "babelify": "7.2.0", "del": "2.2.0", "gulp": "3.9.1", "gulp-watch": "4.3.5", - "ionic-gulp-browserify-es2015": "^1.0.0", + "ionic-gulp-browserify-typescript": "^1.1.0", "ionic-gulp-fonts-copy": "^1.0.0", "ionic-gulp-html-copy": "^1.0.0", "ionic-gulp-sass-build": "^1.0.0", - "ionic-gulp-scripts-copy": "^1.0.0" + "ionic-gulp-scripts-copy": "^1.0.1", + "run-sequence": "1.1.5" }, - "name": "ionic2firstapp", - "description": "Ionic2FirstApp: An Ionic project", "cordovaPlugins": [ "cordova-plugin-device", "cordova-plugin-console", @@ -33,5 +28,15 @@ "cordova-plugin-statusbar", "ionic-plugin-keyboard" ], - "cordovaPlatforms": [] + "cordovaPlatforms": [ + "ios", + { + "platform": "ios", + "version": "", + "locator": "ios" + }, + "android" + ], + "name": "ionic2firstapp", + "description": "Ionic2FirstApp: An Ionic project" } diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index b910093..70bdd77 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 16cd5db..197398c 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 64a6cbc..a112930 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index 1605f69..055bf0d 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 56fb29e..4a93a72 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index e4a9152..42736d5 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 66b12fe..bc60634 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index 7dceec7..240bf5e 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 0dc2ba7..33b235b 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 39ae00c..bb2da32 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 3f591b1..c75b1c0 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 253e6f1..d31fc0f 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index e0dbb62..377ae7c 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 8e93c2d..8aac21f 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 0aaad62..d610189 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 64c27f8..44bb94e 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index f605e6a..cba6032 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index 2b993cf..f22cf0e 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png b/resources/icon.png index bee7766..bcace0c 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index 76cc53c..a17c67d 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index 64b4906..b83d6c7 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png new file mode 100644 index 0000000..8a96682 Binary files /dev/null and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 8bd51df..7aabed1 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index 2676f8f..79da78e 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index 11f3912..84145a5 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index b521048..8a96682 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index dbc8303..fc8074a 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index 4e5a827..70bdd77 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index 56fb29e..4a93a72 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index e66a90e..f160c01 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index 3f5c942..9bd4af3 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png new file mode 100644 index 0000000..0bfd245 Binary files /dev/null and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png index de3146d..6ee59f2 100644 Binary files a/resources/ios/icon/icon-small.png and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png index 916a02e..35a1709 100644 Binary files a/resources/ios/icon/icon-small@2x.png and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png index 0efa99d..3de2ab9 100644 Binary files a/resources/ios/icon/icon-small@3x.png and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index 89f8c00..48ef907 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index a6687a1..9ace1d1 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index d2128a6..c898c94 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index fc23e64..5f09af2 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index 71b16ca..acdc1a4 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index aaff74a..59e52ed 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index 19770a2..15db8e8 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index 6fe8925..b7d83a8 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index 3d06d86..0cfbbb5 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index 53ad4c4..63b1447 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index 6a13316..7ae4ee8 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 0aaad62..d610189 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..5322fe6 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,21 @@ +{ + "compilerOptions": { + "target": "es5", + "module": "commonjs", + "emitDecoratorMetadata": true, + "experimentalDecorators": true + }, + "filesGlob": [ + "**/*.ts", + "!node_modules/**/*" + ], + "exclude": [ + "node_modules", + "typings/main", + "typings/main.d.ts" + ], + "compileOnSave": false, + "atom": { + "rewriteTsconfig": false + } +} diff --git a/typings.json b/typings.json new file mode 100644 index 0000000..fbba3c0 --- /dev/null +++ b/typings.json @@ -0,0 +1,7 @@ +{ + "dependencies": {}, + "devDependencies": {}, + "ambientDependencies": { + "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654" + } +} diff --git a/www/index.html b/www/index.html index 22e6e43..06b7416 100644 --- a/www/index.html +++ b/www/index.html @@ -1,23 +1,30 @@ - + + Ionic + + + - + - + + + +