Update to ng4 (#6)

vfede · web-flow · commit 0a000dc01330 · 2017-10-13T18:21:10.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ pubspec.lock
 
 # Directory created by dartdoc
 doc/api/
+
+# Idea IntelliJ
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.0
+
+- Version bump to AngularDart v4.0
+- Cleaner project
+
 ## 0.0.1
 
 - Initial version, created by Stagehand
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 # toastino
 
 Toast component written in AngularDart.
-Provides clear and easy to use notifying system. 
+Provides clear and easy to use notifying system.
 
 ## Usage
 
-1. Create a new ToastManagerComponent in your class by this way:
+1. Create a new ToastManagerComponent in your class in this way:
 
     ```dart
      ToastManagerComponent _toastManager;
 
-      ToastinoExampleComponent(DynamicComponentLoader toastComponentLoader, ViewContainerRef viewContainerRef){
+      ToastinoExampleComponent(SlowComponentLoader toastComponentLoader, ViewContainerRef viewContainerRef){
            _toastManager = new ToastManagerComponent(toastComponentLoader, viewContainerRef);
       }
     ```
@@ -25,4 +25,4 @@ Provides clear and easy to use notifying system.
 
 ## Libraries
 
-- **[toast_manager_component](./lib/src/toast_manager_component.dart)** - The core of Toastino: It keeps trace of every toast created and manages their positioning and removal.
+- **[toast_manager_component](./lib/src/toast_manager_component.dart)** - The core of Toastino: it keeps trace of every toast created and manages their positioning and removal.
diff --git a/example/lib/toastino_example_component.css b/example/lib/toastino_example_component.css
diff --git a/example/lib/toastino_example_component.dart b/example/lib/toastino_example_component.dart
@@ -1,18 +1,17 @@
 // Copyright (c) 2017, Marco Bramini, Qurami. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:core';
-import 'package:angular2/core.dart';
+import 'package:angular/angular.dart';
+import 'package:angular/core.dart';
 import 'package:toastino/toastino.dart';
 
 @Component(
-  selector: 'toastino-example',
-  templateUrl: 'toastino_example_component.html',
-)
+    selector: 'toastino-example',
+    templateUrl: 'toastino_example_component.html')
 class ToastinoExampleComponent {
   ToastManagerComponent _toastManager;
 
-  ToastinoExampleComponent(DynamicComponentLoader toastComponentLoader,
+  ToastinoExampleComponent(SlowComponentLoader toastComponentLoader,
       ViewContainerRef viewContainerRef) {
     _toastManager =
         new ToastManagerComponent(toastComponentLoader, viewContainerRef);
diff --git a/example/lib/toastino_example_component.html b/example/lib/toastino_example_component.html
@@ -1,4 +1,4 @@
 <!-- Copyright (c) 2017, Marco Bramini, Qurami. All rights reserved. Use of this source code is governed by a
 BSD-style license that can be found in the LICENSE file. -->
 
-<button (click)="toast('HelloWorld')" style="top: 400px;position: absolute">newToast</button>
+<button (click)="toast('HelloWorld')" style="top: 400px;position: absolute">newToast</button>
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,19 +1,17 @@
 name: toastino_example
 description: Use example of Toastino library.
-version: 0.0.1
+version: 0.1.0
 author: Marco Bramini, Qurami <marco.bramini@qurami.com>
 dependencies:
-  angular2: ^3.1.0
+  angular: ^4.0.0
   toastino:
     path: ..
+
 dev_dependencies:
   browser: ^0.10.0
-  dart_to_js_script_rewriter: "^1.0.3"
+  dart_to_js_script_rewriter: ^1.0.3
+
 transformers:
-- angular2:
-    entry-point: web/main.dart
-    platform_directives:
-    - 'package:angular2/common.dart#COMMON_DIRECTIVES'
-    platform_pipes:
-    - 'package:angular2/common.dart#COMMON_PIPES'
-- dart_to_js_script_rewriter
+- angular:
+    entry_points: web/main.dart
+- dart_to_js_script_rewriter
diff --git a/example/web/index.html b/example/web/index.html
@@ -3,16 +3,16 @@
 
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <title>toastino</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script defer src="main.dart" type="application/dart"></script>
     <script defer src="packages/browser/dart.js"></script>
     <link rel="stylesheet" href="styles.css">
     <link rel="icon" type="image/png" href="favicon.png">
-  </head>
-  <body>
-    <toastino-example>Loading...</toastino-example>
-  </body>
+</head>
+<body>
+<toastino-example>Loading...</toastino-example>
+</body>
 </html>
diff --git a/example/web/main.dart b/example/web/main.dart
@@ -1,7 +1,7 @@
 // Copyright (c) 2017, Marco Bramini, Qurami. All rights reserved. Use of this source code
 // is governed by a BSD-style license that can be found in the LICENSE file.
 
-import 'package:angular2/platform/browser.dart';
+import 'package:angular/angular.dart';
 
 import 'package:toastino_example/toastino_example_component.dart';
 
diff --git a/lib/src/toast_component.css b/lib/src/toast_component.css
@@ -5,9 +5,9 @@
     :host {
         display: flex;
         position: fixed;
-        bottom:0;
+        bottom: 0;
         left: 0;
-        right:0;
+        right: 0;
         justify-content: flex-start;
         align-items: center;
         width: 100%;
@@ -22,13 +22,14 @@
         animation-duration: 600ms;
     }
 }
+
 @media screen and (min-width: 650px) {
     :host {
         display: flex;
         position: fixed;
         bottom: 0;
         left: 0;
-        right:0;
+        right: 0;
         justify-content: flex-start;
         align-items: center;
         height: 8%;
@@ -45,19 +46,25 @@
         animation-duration: 600ms;
     }
 }
-@-webkit-keyframes show {
-    from{bottom:-10%; opacity: 0}
-    to{bottom:0; opacity: 1}
-}
+
 @keyframes show {
-    from{bottom:-10%; opacity: 0}
-    to{bottom:0; opacity: 1}
-}
-@-webkit-keyframes hide {
-    from{bottom:0; opacity: 1}
-    to{bottom:-10%; opacity: 0}
+    from {
+        bottom: -10%;
+        opacity: 0
+    }
+    to {
+        bottom: 0;
+        opacity: 1
+    }
 }
+
 @keyframes hide {
-    from{bottom:0; opacity: 1}
-    to{bottom:-10%; opacity: 0}
+    from {
+        bottom: 0;
+        opacity: 1
+    }
+    to {
+        bottom: -10%;
+        opacity: 0
+    }
 }
diff --git a/lib/src/toast_component.dart b/lib/src/toast_component.dart
@@ -2,19 +2,19 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:core';
-import 'package:angular2/core.dart';
+
+import 'package:angular/angular.dart';
 
 /// A Toast component.
 /// It's used to display a toast.
 ///
 /// [ToastComponent]'s [_position] affects the host's bottom property.
 ///
-
-@Component(selector: 'toast', template: '{{title}}', styleUrls: const [
-  'toast_component.css'
-], host: const {
-  '[style.animation-name]': 'animation'
-})
+@Component(
+    selector: 'toast',
+    template: '{{title}}',
+    styleUrls: const ['toast_component.css'],
+    host: const {'[style.animation-name]': 'animation'})
 class ToastComponent {
   String _title;
 
@@ -38,4 +38,4 @@ class ToastComponent {
   void hide() {
     _animation = "hide";
   }
-}
+}
diff --git a/lib/src/toast_manager_component.dart b/lib/src/toast_manager_component.dart
@@ -1,10 +1,10 @@
 // Copyright (c) 2017, Marco Bramini, Qurami. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 import 'dart:async';
-import 'package:angular2/core.dart';
 import 'dart:core';
-import 'package:angular2/angular2.dart';
 
+import 'package:angular/angular.dart';
+import 'package:angular/core.dart';
 import 'package:toastino/src/toast_component.dart';
 
 /// A Toast manager component.
@@ -17,20 +17,18 @@ import 'package:toastino/src/toast_component.dart';
 ///
 ///  ToastManagerComponent _toastManager;
 ///
-///  ToastinoExampleComponent(DynamicComponentLoader toastComponentLoader, ViewContainerRef viewContainerRef){
+///  ToastinoExampleComponent(SlowComponentLoader toastComponentLoader, ViewContainerRef viewContainerRef){
 ///   _toastManager = new ToastManagerComponent(toastComponentLoader, viewContainerRef);
 ///  }
 ///
 ///  void toast(String title){
 ///   _toastManager.newToast(title, callback: (){print('hi');});
 ///  }
 ///
-@Component(
-  selector: 'toast-manager',
-  template: '<ng-content></ng-content>',
-)
+@Component(selector: 'toast-manager', template: '<ng-content></ng-content>')
 class ToastManagerComponent {
-  DynamicComponentLoader _toastComponentLoader;
+  SlowComponentLoader
+      _toastComponentLoader; // TODO should use faster ComponentLoader
 
   ViewContainerRef _viewContainerRef;
 
@@ -41,7 +39,7 @@ class ToastManagerComponent {
 
   ComponentRef _activeToastRef;
 
-  /// Constructor requires the injection of a [DynamicComponentLoader] and the [ViewContainerRef],
+  /// Constructor requires the injection of a [SlowComponentLoader] and the [ViewContainerRef],
   /// next which new [ToastComponent]s will be appended.
   ToastManagerComponent(this._toastComponentLoader, this._viewContainerRef) {
     _streamController = new StreamController<String>();
@@ -51,7 +49,8 @@ class ToastManagerComponent {
     _stream.listen((String eventType) {
       if (eventType == "toast_added" && _activeToastRef == null)
         loadNextToast();
-      else if (eventType == "toast_removed" && _toastsQueue.length > 0) loadNextToast();
+      else if (eventType == "toast_removed" && _toastsQueue.length > 0)
+        loadNextToast();
     });
   }
 
diff --git a/lib/toastino.dart b/lib/toastino.dart
@@ -1,6 +1,4 @@
 // Copyright (c) 2017, Marco Bramini, Qurami. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library toastino;
-
 export 'src/toast_manager_component.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,14 +1,10 @@
 name: toastino
 description: Toast component written in AngularDart. Provides clear and easy to use notifying system.
-version: 0.0.1
+version: 0.1.0
 author: Marco Bramini, Qurami <marco.bramini@qurami.com>
+
 dependencies:
-  angular2: ^3.1.0
-  dart_to_js_script_rewriter: "^1.0.3"
+  angular: ^4.0.0
+
 transformers:
-- angular2:
-    platform_directives:
-    - 'package:angular2/common.dart#COMMON_DIRECTIVES'
-    platform_pipes:
-    - 'package:angular2/common.dart#COMMON_PIPES'
-- dart_to_js_script_rewriter
+- angular
