Clean up and ugprade to the latest SDK and Rikulo Commons

rikulo · Nov 25, 2015 · ca38422 · ca38422
1 parent 1027143
commit ca38422
Show file tree

Hide file tree

Showing 94 changed files with 1,022 additions and 362 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+.DS_Store
+.packages
+.idea
 debug
 codegen
 *.local

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 #Rikulo Changes
 
+##0.8.0
+
+* Upgrade to keep up with the latest SDK
+
 ##0.6.7
 
 * Issue 25: rename Selection to SelectionModel, Disables to DisablesModel, Opens to OpensModel, and AbstractSelectionModel to AbstractDataModel

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ You can access your application directly with a modern Web browser without any p
 
 * [Home](http://rikulo.org/projects/ui)
 * [Documentation](http://docs.rikulo.org/ui/latest)
-* [API Reference](http://api.rikulo.org/ui/latest)
+* [API Reference](http://www.dartdocs.org/documentation/rikulo_ui/0.8.0)
 * [Discussion](http://stackoverflow.com/questions/tagged/rikulo)
 * [Source Code Repos](https://github.com/rikulo/ui)
 * [Issues](https://github.com/rikulo/ui/issues)

diff --git a/example/circle/CircleView.dart b/example/circle/CircleView.dart
@@ -3,8 +3,6 @@
 import 'dart:html';
 import "dart:math";
 
-import 'package:rikulo_commons/html.dart' show browser;
-
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/effect.dart';
 

diff --git a/example/composite-view/CompositeViewDemo.dart b/example/composite-view/CompositeViewDemo.dart
@@ -1,6 +1,5 @@
 //Sample Code: CompositeViewDemo
 
-import 'dart:html';
 import 'package:rikulo_ui/view.dart';
 import 'LabeledInput.dart';
 

diff --git a/example/custom-layout/CustomLayoutDemo.dart b/example/custom-layout/CustomLayoutDemo.dart
@@ -2,9 +2,7 @@
 
 import 'dart:html' show Point;
 
-import 'package:rikulo_commons/html.dart';
-import "package:rikulo_commons/util.dart";
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
 

diff --git a/example/effect/DialogEffectDemo.dart b/example/effect/DialogEffectDemo.dart
@@ -1,12 +1,8 @@
 //Sample Code: SwipeGesture
 
 import "dart:html";
-import 'dart:math';
-
-import "package:rikulo_commons/util.dart";
 
 import 'package:rikulo_ui/view.dart';
-import 'package:rikulo_ui/view/impl.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';
 

diff --git a/example/effect/EasingDemo.dart b/example/effect/EasingDemo.dart
@@ -4,9 +4,7 @@ import 'dart:html';
 import 'dart:math';
 import "dart:collection" show HashMap;
 
-import "package:rikulo_commons/util.dart";
-import 'package:rikulo_commons/html.dart';
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';

diff --git a/example/effect/EffectDemo.dart b/example/effect/EffectDemo.dart
@@ -1,9 +1,6 @@
 //Sample Code: SwipeGesture
 
 import 'dart:html';
-import 'dart:math';
-
-import "package:rikulo_commons/util.dart";
 
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';

diff --git a/example/effect/MiscEffectDemo.dart b/example/effect/MiscEffectDemo.dart
@@ -1,11 +1,8 @@
 import "dart:html";
 import "dart:math";
 
-import "package:rikulo_commons/util.dart";
-import 'package:rikulo_commons/html.dart';
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
-import 'package:rikulo_ui/view/impl.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';
 
@@ -62,7 +59,7 @@ class ViewDemo {
   }
 
   void main() {
-    final Element body = query("#v-main-view");
+    final Element body = querySelector("#v-main-view");
 
     final View mainView = new View()..addToDocument(ref: body);
     View container = new View()..width = 240..height = 240;
@@ -171,7 +168,7 @@ class PanelDemo {
           easing: (num t) => t * t, period: 300, end: end);
 
   void main() {
-    final Element body = query("#v-main-panel");
+    final Element body = querySelector("#v-main-panel");
 
     final View mainView = new View()..addToDocument(ref: body);
     mainView.addChild(new Style(content: ".v-mask {background: rgba(127,127,127,0.25);}"));
@@ -317,7 +314,7 @@ class SwitchViewDemo {
   final Random rand = new Random();
 
   void main() {
-    Element body = query("#v-main-switch");
+    Element body = querySelector("#v-main-switch");
     if (body == null)
       body = document.body;
     final View v1 = new View()..addToDocument(ref: body);
@@ -436,7 +433,7 @@ class SwitchViewDemo {
           });
         }));
 
-    View w4 = btn("N/A")..profile.location = "bottom right";
+    btn("N/A")..profile.location = "bottom right";
     container.addChild(btn("N/A")
         ..profile.location = "bottom right"
         ..on.click.listen((ViewEvent event) => replace(v1, v2, _eff = null)));

diff --git a/example/effect/NaturalEffectDemo.dart b/example/effect/NaturalEffectDemo.dart
@@ -3,10 +3,7 @@
 import 'dart:html';
 import 'dart:math';
 
-import "package:rikulo_commons/util.dart";
-
 import 'package:rikulo_ui/view.dart';
-import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';
 
 TextView block(String text, int left, int top) {

diff --git a/example/effect/PanelEffectDemo.dart b/example/effect/PanelEffectDemo.dart
@@ -1,10 +1,7 @@
 import "dart:html";
 
-import "package:rikulo_commons/util.dart";
-import 'package:rikulo_commons/html.dart' show browser;
-
+import 'package:rikulo_ui/html.dart' show browser;
 import 'package:rikulo_ui/view.dart';
-import 'package:rikulo_ui/view/impl.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';
 
@@ -19,7 +16,7 @@ EasingMotion hideWithMask(EasingMotion motion, Element mask, MotionEnd end) =>
         easing: (num t) => t * t, period: 300, end: end);
 
 void main() {
-  final Element body = query("#v-main-panel");
+  final Element body = querySelector("#v-main-panel");
 
   final View mainView = new View()..addToDocument(ref: body);
   mainView.addChild(new Style(content: ".v-mask {background: rgba(127,127,127,0.25);}"));

diff --git a/example/effect/SwitchViewEffectDemo.dart b/example/effect/SwitchViewEffectDemo.dart
@@ -3,9 +3,7 @@
 import 'dart:html';
 import 'dart:math';
 
-import "package:rikulo_commons/util.dart";
-import 'package:rikulo_commons/html.dart';
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';

diff --git a/example/effect/SwitchViewEffectDemo2.dart b/example/effect/SwitchViewEffectDemo2.dart
@@ -3,9 +3,7 @@
 import 'dart:html';
 import 'dart:math';
 
-import "package:rikulo_commons/util.dart";
-import "package:rikulo_commons/html.dart";
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/effect.dart';
@@ -65,7 +63,7 @@ void addRandFly(Element element, Point range, List<MotionAction> actions, List<F
 final Random rand = new Random();
 
 void main() {
-  Element body = query("#v-main-switch");
+  Element body = querySelector("#v-main-switch");
   if (body == null)
     body = document.body;
   final View v1 = new View()..addToDocument(ref: body);
@@ -184,7 +182,7 @@ void main() {
     });
   }));
 
-  View w4 = btn("N/A")..profile.location = "bottom right";
+  btn("N/A")..profile.location = "bottom right";
   container.addChild(btn("N/A")
       ..profile.location = "bottom right"
       ..on.click.listen((ViewEvent event) => replace(v1, v2, _eff = null)));

diff --git a/example/effect/ViewEffectDemo.dart b/example/effect/ViewEffectDemo.dart
@@ -1,9 +1,6 @@
 //Sample Code: SwipeGesture
 
 import 'dart:html';
-import 'dart:math';
-
-import "package:rikulo_commons/util.dart";
 
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';

diff --git a/example/effect/ViewEffectDemo2.dart b/example/effect/ViewEffectDemo2.dart
@@ -1,7 +1,4 @@
 import 'dart:html';
-import 'dart:math';
-
-import "package:rikulo_commons/util.dart";
 
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
@@ -56,7 +53,7 @@ View radio(SlideDirection dir) {
 }
 
 void main() {
-  final Element body = query("#v-main-view");
+  final Element body = querySelector("#v-main-view");
 
   final View mainView = new View()..addToDocument(ref: body);
   View container = new View()..width = 240..height = 240;

diff --git a/example/gesture/AlbumDemo.dart b/example/gesture/AlbumDemo.dart
@@ -3,8 +3,7 @@
 import 'dart:html';
 import 'dart:math';
 
-import 'package:rikulo_commons/html.dart';
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
 import 'package:rikulo_ui/gesture.dart';

diff --git a/example/gesture/MapDemo.dart b/example/gesture/MapDemo.dart
@@ -2,8 +2,7 @@
 
 import 'dart:html';
 
-import 'package:rikulo_commons/html.dart';
-
+import 'package:rikulo_ui/html.dart';
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/gesture.dart';
 import 'package:rikulo_ui/event.dart';

diff --git a/example/scroll-view/GridViewDemo.dart b/example/scroll-view/GridViewDemo.dart
@@ -4,7 +4,7 @@ import 'dart:html';
 
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/event.dart';
-import 'package:rikulo_commons/html.dart';
+import 'package:rikulo_ui/html.dart';
 
 void main() {
   final View mainView = new View()..addToDocument();

diff --git a/example/scroll-view/ScrollViewDemo.dart b/example/scroll-view/ScrollViewDemo.dart
@@ -1,7 +1,7 @@
 //Sample Code: ScrollView
 
 import 'package:rikulo_ui/view.dart';
-import "package:rikulo_commons/html.dart";
+import "package:rikulo_ui/html.dart";
 
 void main() {
   final ScrollView view = new ScrollView();

diff --git a/example/scroll-view/StarChartDemo.dart b/example/scroll-view/StarChartDemo.dart
@@ -4,7 +4,7 @@ import 'dart:math';
 import 'dart:html';
 
 import 'package:rikulo_ui/view.dart';
-import 'package:rikulo_commons/html.dart';
+import 'package:rikulo_ui/html.dart';
 
 View _system(Point pos, num maxsyssize, int rad, [String name]) {
   View sys = new View();
@@ -16,10 +16,10 @@ View _system(Point pos, num maxsyssize, int rad, [String name]) {
   sys.style.borderWidth = sys.style.borderRadius = CssUtil.px(shownRad);
   sys.classes.add("star");
 
-  final int subsysnum = (rad * _rand() / 3).toInt();
+  final int subsysnum = rad * _rand() ~/ 3;
   for (int i = 0; i < subsysnum; i++) {
-    int subsyssize = (maxsyssize * (1 + _rand()) / 2).toInt();
-    int subrad = (rad * (_rand() * 2 + 1) / 3).toInt();
+    int subsyssize = maxsyssize * (1 + _rand()) ~/ 2;
+    int subrad = rad * (_rand() * 2 + 1) ~/ 3;
     num subdist = subsyssize + (maxsyssize - subsyssize) * 3 * _rand();
     num subarg = _rand() * PI * 2;
     Point subpos = new Point(subdist * cos(subarg), subdist * sin(subarg));

diff --git a/example/snake/SnakeCanvas.dart b/example/snake/SnakeCanvas.dart
@@ -4,12 +4,10 @@ library snake;
 import 'dart:html';
 import 'dart:math';
 
-import "package:rikulo_commons/util.dart";
 
 import 'package:rikulo_ui/view.dart';
 import 'package:rikulo_ui/gesture.dart';
 import 'package:rikulo_ui/effect.dart';
-import 'package:rikulo_ui/event.dart';
 
 part 'SnakePoint.dart';
 part 'SnakeEnvironment.dart';

diff --git a/example/viewport/Viewport.dart b/example/viewport/Viewport.dart
@@ -6,7 +6,7 @@ library rikulo_example_viewport;
 import "dart:html";
 
 import 'package:rikulo_ui/view.dart';
-import "package:rikulo_commons/html.dart";
+import "package:rikulo_ui/html.dart";
 
 /**
  * A view port that demostrates how to implement a view that the origin of

diff --git a/lib/effect.dart b/lib/effect.dart
@@ -8,7 +8,7 @@ import "dart:html";
 import "dart:math";
 
 import "package:rikulo_commons/util.dart";
-import 'package:rikulo_commons/html.dart';
+import "html.dart";
 
 part "src/effect/Animator.dart";
 part "src/effect/Motion.dart";

diff --git a/lib/event.dart b/lib/event.dart
@@ -8,10 +8,9 @@ import "dart:html";
 import "dart:async";
 import "dart:collection" show HashMap;
 
-import "package:rikulo_commons/util.dart";
 import "package:rikulo_commons/async.dart";
-import 'package:rikulo_commons/html.dart';
 
+import "html.dart";
 import "view.dart";
 import "layout.dart";
 import 'gesture.dart';

diff --git a/lib/gesture.dart b/lib/gesture.dart
@@ -8,9 +8,7 @@ import "dart:html";
 import "dart:math";
 import "dart:async";
 
-import 'package:rikulo_commons/util.dart';
-import 'package:rikulo_commons/html.dart';
-
+import "html.dart";
 import "view.dart";
 import "effect.dart";
 

diff --git a/lib/html.dart b/lib/html.dart
@@ -0,0 +1,34 @@
+//Copyright (C) 2012 Potix Corporation. All Rights Reserved.
+//History: Fri, May 04, 2012 11:20:47 AM
+// Author: tomyeh
+
+library rikulo_html;
+
+import "dart:html";
+import "dart:math";
+
+import "package:rikulo_commons/browser.dart" as bwr show Browser;
+
+import "view/impl.dart" show toHexString;
+
+part "src/html/dom_util.dart";
+part "src/html/css_util.dart";
+part "src/html/Points.dart";
+part "src/html/Size.dart";
+part "src/html/Matrix.dart";
+
+/** A function that returns a [Point].
+ */
+typedef Point AsPoint();
+/** A function that returns a [Point3D].
+ */
+typedef Point3D AsPoint3D();
+/** A function that returns a [Size].
+ */
+typedef Size AsSize();
+/** A function that returns a [Size3D].
+ */
+typedef Size3D AsSize3D();
+/** A function that returns a [Rect].
+ */
+typedef Rectangle AsRectangle();
diff --git a/lib/layout.dart b/lib/layout.dart
@@ -8,8 +8,8 @@ import "dart:math";
 import "dart:collection" show HashMap;
 
 import 'package:rikulo_commons/util.dart';
-import 'package:rikulo_commons/html.dart';
 
+import "html.dart";
 import "view.dart";
 import "view/impl.dart";