Merge branch 'remove-data'

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.8
+
+* Added more examples
+* Wrapped up automatic span calculation
+
 # 0.0.7
 
 * New API for creating a line chart widget

README.md

@@ -15,4 +15,37 @@ library) you will find the high level API to be somewhat familiar.
 
 ## Demo
 
-![Bar chart demo](https://i.imgur.com/D1Rd7jk.gif) ![Touch demo](https://i.imgur.com/pvHhenr.gif)
+![Bar chart demo](https://i.imgur.com/D1Rd7jk.gif) ![Touch demo](https://i.imgur.com/pvHhenr.gif)
+
+## Example Usage
+
+
+
+```dart
+class SimpleLineChart extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    // X value -> Y value
+    final data = [
+      ["A", "✔"],
+      ["B", "❓"],
+      ["C", "✖"],
+      ["D", "❓"],
+      ["E", "✖"],
+      ["F", "✖"],
+      ["G", "✔"],
+    ];
+
+    return new LineChart(
+      lines: [
+        new Line<List<String>, String, String>(
+          data: data,
+          xFn: (datum) => datum[0],
+          yFn: (datum) => datum[1],
+        ),
+      ],
+      chartPadding: new EdgeInsets.fromLTRB(30.0, 10.0, 10.0, 30.0),
+    );
+  }
+}
+```

example/README.md

@@ -1,3 +1,5 @@
 # fcharts_example
 
-Demonstrates how to use the fcharts plugin.
+Demonstrates how to use the fcharts plugin.
+
+See `lib/line` for example charts.

example/lib/data.dart

@@ -1,5 +1,3 @@
-
-
 /// 4-tiered level system.
 enum Level {
   Very,

example/lib/line/city_coolness.dart

@@ -0,0 +1,45 @@
+import 'package:fcharts/fcharts.dart';
+import 'package:fcharts_example/data.dart';
+import 'package:flutter/material.dart';
+import 'package:meta/meta.dart';
+
+/// A city in the world.
+@immutable
+class City {
+  const City(this.name, this.coolness);
+
+  /// The name of the city.
+  final String name;
+
+  /// How cool this city is, this is how we measure the city in the chart.
+  final Level coolness;
+}
+
+/// Our city data.
+final cities = [
+  new City("District X", Level.Not),
+  new City("Gotham", Level.Kinda),
+  new City("Mos Eisley", Level.Quite),
+  new City("Palo Alto", Level.Very),
+];
+
+class CityCoolnessChart extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return new LineChart.single(
+      chartPadding: new EdgeInsets.fromLTRB(60.0, 10.0, 10.0, 20.0),
+      line: new Line<City, String, Level>(
+        data: cities,
+        xFn: (city) => city.name,
+        yFn: (city) => city.coolness,
+        yAxis: new ChartAxis(
+          tickLabelFn: (coolness) =>
+              coolness.toString().replaceFirst("Level\.", ""),
+        ),
+        marker:
+            const MarkerOptions(paint: const PaintOptions(color: Colors.blue)),
+        stroke: const PaintOptions.stroke(color: Colors.blue),
+      ),
+    );
+  }
+}

example/lib/line/simple.dart

@@ -3,44 +3,29 @@ import 'package:flutter/material.dart';
 import 'package:meta/meta.dart';
 import 'package:fcharts/fcharts.dart';
 
-/// A city in the world.
-@immutable
-class City {
-  const City(this.name, this.coolness);
-
-  /// The name of the city.
-  final String name;
-
-  /// How cool this city is, this is how we measure the city in the chart.
-  final Level coolness;
-}
-
-/// Our city data.
-final cities = [
-  new City("District X", Level.Not),
-  new City("Gotham", Level.Kinda),
-  new City("Mos Eisley", Level.Quite),
-  new City("Palo Alto", Level.Very),
-];
-
 class SimpleLineChart extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return new LineChart.single(
-      chartPadding: new EdgeInsets.fromLTRB(60.0, 10.0, 10.0, 20.0),
-      line: new Line<City, String, Level>(
-        data: cities,
-        xFn: (city) => city.name,
-        yFn: (city) => city.coolness,
-        yAxis: new ChartAxis(
-          tickLabelFn: (coolness) =>
-              coolness.toString().replaceFirst("Level\.", ""),
-        ),
-        marker: const MarkerOptions(
-          paint: const PaintOptions(color: Colors.blue)
+    // X value -> Y value
+    final data = [
+      ["A", "✔"],
+      ["B", "❓"],
+      ["C", "✖"],
+      ["D", "❓"],
+      ["E", "✖"],
+      ["F", "✖"],
+      ["G", "✔"],
+    ];
+
+    return new LineChart(
+      lines: [
+        new Line<List<String>, String, String>(
+          data: data,
+          xFn: (datum) => datum[0],
+          yFn: (datum) => datum[1],
         ),
-        stroke: const PaintOptions.stroke(color: Colors.blue),
-      ),
+      ],
+      chartPadding: new EdgeInsets.fromLTRB(30.0, 10.0, 10.0, 30.0),
     );
   }
 }

example/lib/main.dart

@@ -1,17 +1,32 @@
+import 'package:fcharts_example/line/city_coolness.dart';
 import 'package:fcharts_example/line/simple.dart';
 import 'package:flutter/material.dart';
 
 void main() => runApp(new FChartsExampleApp());
 
 class ChartExample {
-  ChartExample(this.name, this.widget);
+  ChartExample(
+    this.name,
+    this.widget,
+    this.description,
+  );
 
   final String name;
   final Widget widget;
+  final String description;
 }
 
 final charts = [
-  new ChartExample('City Coolness', new SimpleLineChart()),
+  new ChartExample(
+    'Simple',
+    new SimpleLineChart(),
+    'Strings on the X-Axis and their index in the list on the Y-Axis.',
+  ),
+  new ChartExample(
+    'City Coolness',
+    new CityCoolnessChart(),
+    'Cities on the X-Axis and coolness on the Y-Axis with a painted line.',
+  ),
 ];
 
 class FChartsExampleApp extends StatefulWidget {
@@ -35,12 +50,23 @@ class _MyAppState extends State<FChartsExampleApp> {
           decoration: new BoxDecoration(
             color: Colors.white,
           ),
-          child: new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new AspectRatio(
-              aspectRatio: 4/3,
-              child: chart.widget,
-            ),
+          child: new Column(
+            children: [
+              new Padding(
+                padding: new EdgeInsets.all(30.0),
+                child: new Text(
+                  chart.description,
+                  textAlign: TextAlign.center,
+                ),
+              ),
+              new Padding(
+                padding: new EdgeInsets.all(20.0),
+                child: new AspectRatio(
+                  aspectRatio: 4 / 3,
+                  child: chart.widget,
+                ),
+              ),
+            ],
           ),
         ),
         floatingActionButton: new FloatingActionButton(

example/pubspec.yaml

@@ -4,10 +4,10 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^0.1.0
+  fcharts:
+    path: ../
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  fcharts:
-    path: ../
 flutter:
   uses-material-design: true

lib/src/widgets/chart_view.dart

@@ -93,6 +93,12 @@ class _ChartViewState extends State<ChartView> with TickerProviderStateMixin {
   Animation<double> _curve;
   _ChartPainter _painter;
 
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
   _ChartPainter _createPainter() {
     final charts = widget.charts;
     final decor = widget.decor == null ? ChartDecor.none : widget.decor;

pubspec.yaml

@@ -2,7 +2,7 @@ name: fcharts
 description: >
   A composable chart library for Flutter. Create beautiful, 
   animated, responsive charts using a simple and intuitive API.
-version: 0.0.7
+version: 0.0.8
 author: Keenan Thompson <keenan@keenant.com>
 homepage: https://github.com/thekeenant/fcharts