Merge pull request #80 from imaNNeoFighT/feature/bar-area-cut-off-y

Feature/bar area cut off y
imaNNeo · Oct 3, 2019 · b267a79 · b267a79
2 parents dd9014c + e6cddc8
commit b267a79
Show file tree

Hide file tree

Showing 13 changed files with 305 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.3.3
+* BREAKING CHANGES
+* added support for drawing below and above areas separately in LineChart
+* added cutOffY feature in LineChart, see this [issue](https://github.com/imaNNeoFighT/fl_chart/issues/62)
+* added `aboveBarData` in [LineChartBarData](https://github.com/imaNNeoFighT/fl_chart/blob/master/repo_files/documentations/line_chart.md#linechartbardata)
+* `BelowBarData` class renamed to [BarAreaData](https://github.com/imaNNeoFighT/fl_chart/blob/master/repo_files/documentations/line_chart.md#barareadata) to reuse for both above and below are
+* `belowSpotsLine` renamed to `spotsLine` in [BarAreaData](https://github.com/imaNNeoFighT/fl_chart/blob/master/repo_files/documentations/line_chart.md#barareadata)
+* `cutOffY` and `applyCutOffY` fields is added in [BarAreaData](https://github.com/imaNNeoFighT/fl_chart/blob/master/repo_files/documentations/line_chart.md#barareadata) to handle cutting of drawing below or above area
+* `BelowSpotsLine` renamed to [BarAreaSpotsLine](https://github.com/imaNNeoFighT/fl_chart/blob/master/repo_files/documentations/line_chart.md#barareaspotsline), and inside it `heckToShowSpotBelowLine` renamed to `heckToShowSpotLine`
+
 ## 0.3.2
 * provided default size (square with 30% smaller than screen) for the FLChart, fixed this [issue](https://github.com/imaNNeoFighT/fl_chart/issues/74).
 

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Thank you all!
 
 ```kotlin
 dependencies:
-  fl_chart: ^0.3.2
+  fl_chart: ^0.3.3
 ```
 
 

diff --git a/example/lib/line_chart/samples/line_chart_sample1.dart b/example/lib/line_chart/samples/line_chart_sample1.dart
@@ -135,7 +135,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         leftTitles: SideTitles(
           showTitles: true,
           textStyle: TextStyle(
-            color: Color(0xff75729e),
+            color: const Color(0xff75729e),
             fontWeight: FontWeight.bold,
             fontSize: 14,
           ),
@@ -202,7 +202,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: false,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: false,
         ),
       ),
@@ -224,7 +224,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: false,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: false,
           colors: [
             Color(0x00aa4cfc),
@@ -248,7 +248,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: false,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: false,
         ),
       ),
@@ -286,7 +286,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         leftTitles: SideTitles(
           showTitles: true,
           textStyle: TextStyle(
-            color: Color(0xff75729e),
+            color: const Color(0xff75729e),
             fontWeight: FontWeight.bold,
             fontSize: 14,
           ),
@@ -356,7 +356,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: false,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: false,
         ),
       ),
@@ -378,7 +378,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: false,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: true,
           colors: [
             Color(0x33aa4cfc),
@@ -403,7 +403,7 @@ class LineChartSample1State extends State<LineChartSample1> {
         dotData: FlDotData(
           show: true,
         ),
-        belowBarData: BelowBarData(
+        belowBarData: BarAreaData(
           show: false,
         ),
       ),

diff --git a/example/lib/line_chart/samples/line_chart_sample2.dart b/example/lib/line_chart/samples/line_chart_sample2.dart
@@ -139,7 +139,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
           dotData: const FlDotData(
             show: false,
           ),
-          belowBarData: BelowBarData(
+          belowBarData: BarAreaData(
             show: true,
             colors: gradientColors.map((color) => color.withOpacity(0.3)).toList(),
           ),
@@ -235,7 +235,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
           dotData: const FlDotData(
             show: false,
           ),
-          belowBarData: BelowBarData(
+          belowBarData: BarAreaData(
             show: true,
             colors: [
               ColorTween(begin: gradientColors[0], end: gradientColors[1]).lerp(0.2).withOpacity(0.1),

diff --git a/example/lib/line_chart/samples/line_chart_sample3.dart b/example/lib/line_chart/samples/line_chart_sample3.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 
 class LineChartSample3 extends StatelessWidget {
 
-  var weekDays = ['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', ];
+  final weekDays = ['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', ];
 
   @override
   Widget build(BuildContext context) {
@@ -13,12 +13,12 @@ class LineChartSample3 extends StatelessWidget {
       children: <Widget>[
         Row(
           mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            const Text('Average Line',
+          children: const <Widget> [
+            Text('Average Line',
               style: TextStyle(color: Colors.green, fontWeight: FontWeight.bold, fontSize: 16),),
-            const Text(' and ',
+            Text(' and ',
               style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold, fontSize: 16),),
-            const Text('Indicators',
+            Text('Indicators',
               style: TextStyle(color: Colors.blue, fontWeight: FontWeight.bold, fontSize: 16),),
           ],
         ),
@@ -71,7 +71,7 @@ class LineChartSample3 extends StatelessWidget {
                 ),
                 lineBarsData: [
                   LineChartBarData(
-                    spots: [
+                    spots: const [
                       FlSpot(0, 1.3),
                       FlSpot(1, 1),
                       FlSpot(2, 1.8),
@@ -85,22 +85,22 @@ class LineChartSample3 extends StatelessWidget {
                     colors: [
                       Colors.orange,
                     ],
-                    belowBarData: BelowBarData(
+                    belowBarData: BarAreaData(
                       show: true,
                       colors: [
                         Colors.orange.withOpacity(0.5),
                         Colors.orange.withOpacity(0.0),
                       ],
                       gradientColorStops: [0.5, 1.0],
-                      gradientFrom: Offset(0, 0),
-                      gradientTo: Offset(0, 1),
-                      belowSpotsLine: BelowSpotsLine(
+                      gradientFrom: const Offset(0, 0),
+                      gradientTo: const Offset(0, 1),
+                      spotsLine: BarAreaSpotsLine(
                         show: true,
                         flLineStyle: const FlLine(
                           color: Colors.blue,
                           strokeWidth: 2,
                         ),
-                        checkToShowSpotBelowLine: (spot) {
+                        checkToShowSpotLine: (spot) {
                           if (spot.x == 0 || spot.x == 6) {
                             return false;
                           }
@@ -188,5 +188,4 @@ class LineChartSample3 extends StatelessWidget {
       ],
     );
   }
-
 }
diff --git a/example/lib/line_chart/samples/line_chart_sample4.dart b/example/lib/line_chart/samples/line_chart_sample4.dart
@@ -5,6 +5,9 @@ class LineChartSample4 extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+
+    const cutOffYValue = 5.0;
+
     return SizedBox(
       width: 300,
       height: 140,
@@ -14,7 +17,7 @@ class LineChartSample4 extends StatelessWidget {
             lineTouchData: const LineTouchData(enabled: false),
             lineBarsData: [
               LineChartBarData(
-                spots: [
+                spots: const [
                   FlSpot(0, 4),
                   FlSpot(1, 3.5),
                   FlSpot(2, 4.5),
@@ -33,11 +36,19 @@ class LineChartSample4 extends StatelessWidget {
                 colors: [
                   Colors.purpleAccent,
                 ],
-                belowBarData: BelowBarData(
+                belowBarData: BarAreaData(
+                  show: true,
+                  colors: [Colors.deepPurple.withOpacity(0.4)],
+                  cutOffY: cutOffYValue,
+                  applyCutOffY: true,
+                ),
+                aboveBarData: BarAreaData(
                   show: true,
-                  colors: [Colors.deepPurple.withOpacity(0.2)],
+                  colors: [Colors.orange.withOpacity(0.6)],
+                  cutOffY: cutOffYValue,
+                  applyCutOffY: true,
                 ),
-                dotData: FlDotData(
+                dotData: const FlDotData(
                   show: false,
                 ),
               ),
@@ -73,6 +84,7 @@ class LineChartSample4 extends StatelessWidget {
                       return 'Nov';
                     case 11:
                       return 'Dec';
+                    default: return '';
                   }
                 }
               ),

diff --git a/example/lib/line_chart/samples/line_chart_sample5.dart b/example/lib/line_chart/samples/line_chart_sample5.dart
@@ -13,7 +13,7 @@ class LineChartSample5 extends StatelessWidget {
           LineChartData(
             lineTouchData: const LineTouchData(enabled: false),
             lineBarsData: [
-              LineChartBarData(
+              const LineChartBarData(
                 spots: [
                   FlSpot(0, 1),
                   FlSpot(1, 2),
@@ -25,7 +25,7 @@ class LineChartSample5 extends StatelessWidget {
                 ],
                 isCurved: true,
                 barWidth: 4,
-                belowBarData: BelowBarData(
+                belowBarData: BarAreaData(
                   show: true,
                 ),
                 dotData: FlDotData(show: false),
@@ -63,7 +63,7 @@ class LineChartSample5 extends StatelessWidget {
                 )
               ),
             ),
-            gridData: FlGridData(show: false),
+            gridData: const FlGridData(show: false),
             borderData: FlBorderData(
               show: true,
             ),

diff --git a/example/lib/line_chart/samples/line_chart_sample6.dart b/example/lib/line_chart/samples/line_chart_sample6.dart
@@ -85,7 +85,7 @@ class LineChartSample6 extends StatelessWidget {
                       isCurved: true,
                       isStrokeCapRound: true,
                       barWidth: 10,
-                      belowBarData: const BelowBarData(
+                      belowBarData: const BarAreaData(
                         show: false,
                       ),
                       dotData: FlDotData(
@@ -103,7 +103,7 @@ class LineChartSample6 extends StatelessWidget {
                       isCurved: true,
                       isStrokeCapRound: true,
                       barWidth: 10,
-                      belowBarData: const BelowBarData(
+                      belowBarData: const BarAreaData(
                         show: false,
                       ),
                       dotData: FlDotData(