Skip to content

Commit 31ae56f

Browse files
kuczynski-merixkuczynski-merix
committed
refactor
1 parent 31353e0 commit 31ae56f

File tree

70 files changed

+367
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+367
-226
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions

‎example/lib/pages/bar_page.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import 'dart:math';
22

33
import 'package:flutter/material.dart';
4-
import 'package:mrx_charts/chart.dart';
5-
import 'package:mrx_charts/models/axis/chart_axis_layer.dart';
6-
import 'package:mrx_charts/models/bar/chart_bar_layer.dart';
7-
import 'package:mrx_charts/models/chart_layer.dart';
4+
import 'package:mrx_charts/mrx_charts.dart';
85

96
class BarPage extends StatefulWidget {
107
const BarPage({Key? key}) : super(key: key);

‎example/lib/pages/candle_page.dart‎

Lines changed: 55 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:intl/intl.dart';
3-
import 'package:mrx_charts/chart.dart';
4-
import 'package:mrx_charts/models/axis/chart_axis_layer.dart';
5-
import 'package:mrx_charts/models/candle/chart_candle_layer.dart';
6-
import 'package:mrx_charts/models/chart_layer.dart';
7-
import 'package:mrx_charts/models/grid/chart_grid_layer.dart';
3+
import 'package:mrx_charts/mrx_charts.dart';
84

95
class CandlePage extends StatefulWidget {
106
const CandlePage({Key? key}) : super(key: key);
@@ -60,7 +56,8 @@ class _CandlePageState extends State<CandlePage> {
6056
List<ChartLayer> layers() {
6157
_whichCandleMock = !_whichCandleMock;
6258
final double frequency =
63-
(DateTime(2017, 11).millisecondsSinceEpoch.toDouble() - DateTime(2017, 4).millisecondsSinceEpoch.toDouble()) /
59+
(DateTime(2017, 11).millisecondsSinceEpoch.toDouble() -
60+
DateTime(2017, 4).millisecondsSinceEpoch.toDouble()) /
6461
4;
6562
final double frequencyData = frequency / 3;
6663
final double from = DateTime(2017, 4).millisecondsSinceEpoch.toDouble();
@@ -102,47 +99,73 @@ class _CandlePageState extends State<CandlePage> {
10299
),
103100
),
104101
),
105-
labelX: (value) => DateFormat('MMM yyyy').format(DateTime.fromMillisecondsSinceEpoch(value.toInt())),
102+
labelX: (value) => DateFormat('MMM yyyy')
103+
.format(DateTime.fromMillisecondsSinceEpoch(value.toInt())),
106104
labelY: (value) => value.toInt().toString(),
107105
),
108106
ChartCandleLayer(
109107
items: _whichCandleMock
110108
? [
111109
_candleItem(Colors.green, 50.0, 52.0, 48.0, 53.0, from),
112-
_candleItem(Colors.red, 52.0, 54.0, 51.0, 57.0, from + frequencyData),
113-
_candleItem(Colors.red, 53.0, 56.0, 53.0, 56.0, from + 2 * frequencyData),
114-
_candleItem(Colors.green, 54.0, 56.0, 53.0, 58.0, from + 3 * frequencyData),
115-
_candleItem(Colors.green, 55.0, 57.0, 53.0, 58.0, from + 4 * frequencyData),
116-
_candleItem(Colors.green, 56.0, 58.0, 56.0, 58.0, from + 5 * frequencyData),
117-
_candleItem(Colors.red, 58.0, 60.0, 57.0, 61.0, from + 6 * frequencyData),
118-
_candleItem(Colors.green, 57.5, 59.0, 56.5, 60.3, from + 7 * frequencyData),
119-
_candleItem(Colors.green, 57.0, 59.0, 57.0, 60.0, from + 8 * frequencyData),
120-
_candleItem(Colors.red, 60.0, 62.0, 57.0, 61.0, from + 9 * frequencyData),
121-
_candleItem(Colors.green, 63.0, 65.0, 62.0, 66.0, from + 10 * frequencyData),
122-
_candleItem(Colors.green, 64.0, 66.0, 63.0, 66.0, from + 11 * frequencyData),
123-
_candleItem(Colors.red, 62.0, 64.0, 61.0, 64.0, from + 12 * frequencyData),
110+
_candleItem(
111+
Colors.red, 52.0, 54.0, 51.0, 57.0, from + frequencyData),
112+
_candleItem(Colors.red, 53.0, 56.0, 53.0, 56.0,
113+
from + 2 * frequencyData),
114+
_candleItem(Colors.green, 54.0, 56.0, 53.0, 58.0,
115+
from + 3 * frequencyData),
116+
_candleItem(Colors.green, 55.0, 57.0, 53.0, 58.0,
117+
from + 4 * frequencyData),
118+
_candleItem(Colors.green, 56.0, 58.0, 56.0, 58.0,
119+
from + 5 * frequencyData),
120+
_candleItem(Colors.red, 58.0, 60.0, 57.0, 61.0,
121+
from + 6 * frequencyData),
122+
_candleItem(Colors.green, 57.5, 59.0, 56.5, 60.3,
123+
from + 7 * frequencyData),
124+
_candleItem(Colors.green, 57.0, 59.0, 57.0, 60.0,
125+
from + 8 * frequencyData),
126+
_candleItem(Colors.red, 60.0, 62.0, 57.0, 61.0,
127+
from + 9 * frequencyData),
128+
_candleItem(Colors.green, 63.0, 65.0, 62.0, 66.0,
129+
from + 10 * frequencyData),
130+
_candleItem(Colors.green, 64.0, 66.0, 63.0, 66.0,
131+
from + 11 * frequencyData),
132+
_candleItem(Colors.red, 62.0, 64.0, 61.0, 64.0,
133+
from + 12 * frequencyData),
124134
]
125135
: [
126136
_candleItem(Colors.red, 62.0, 64.0, 61.0, 64.0, from),
127-
_candleItem(Colors.green, 64.0, 66.0, 63.0, 66.0, from + frequencyData),
128-
_candleItem(Colors.green, 63.0, 65.0, 62.0, 66.0, from + 2 * frequencyData),
129-
_candleItem(Colors.red, 60.0, 62.0, 57.0, 61.0, from + 3 * frequencyData),
130-
_candleItem(Colors.green, 57.0, 59.0, 57.0, 60.0, from + 4 * frequencyData),
131-
_candleItem(Colors.green, 57.5, 59.0, 56.5, 60.3, from + 5 * frequencyData),
132-
_candleItem(Colors.red, 58.0, 60.0, 57.0, 61.0, from + 6 * frequencyData),
133-
_candleItem(Colors.green, 56.0, 58.0, 56.0, 58.0, from + 7 * frequencyData),
134-
_candleItem(Colors.green, 55.0, 57.0, 53.0, 58.0, from + 8 * frequencyData),
135-
_candleItem(Colors.green, 54.0, 56.0, 53.0, 58.0, from + 9 * frequencyData),
136-
_candleItem(Colors.red, 53.0, 56.0, 53.0, 56.0, from + 10 * frequencyData),
137-
_candleItem(Colors.red, 52.0, 54.0, 51.0, 57.0, from + 11 * frequencyData),
138-
_candleItem(Colors.green, 50.0, 52.0, 48.0, 53.0, from + 12 * frequencyData),
137+
_candleItem(
138+
Colors.green, 64.0, 66.0, 63.0, 66.0, from + frequencyData),
139+
_candleItem(Colors.green, 63.0, 65.0, 62.0, 66.0,
140+
from + 2 * frequencyData),
141+
_candleItem(Colors.red, 60.0, 62.0, 57.0, 61.0,
142+
from + 3 * frequencyData),
143+
_candleItem(Colors.green, 57.0, 59.0, 57.0, 60.0,
144+
from + 4 * frequencyData),
145+
_candleItem(Colors.green, 57.5, 59.0, 56.5, 60.3,
146+
from + 5 * frequencyData),
147+
_candleItem(Colors.red, 58.0, 60.0, 57.0, 61.0,
148+
from + 6 * frequencyData),
149+
_candleItem(Colors.green, 56.0, 58.0, 56.0, 58.0,
150+
from + 7 * frequencyData),
151+
_candleItem(Colors.green, 55.0, 57.0, 53.0, 58.0,
152+
from + 8 * frequencyData),
153+
_candleItem(Colors.green, 54.0, 56.0, 53.0, 58.0,
154+
from + 9 * frequencyData),
155+
_candleItem(Colors.red, 53.0, 56.0, 53.0, 56.0,
156+
from + 10 * frequencyData),
157+
_candleItem(Colors.red, 52.0, 54.0, 51.0, 57.0,
158+
from + 11 * frequencyData),
159+
_candleItem(Colors.green, 50.0, 52.0, 48.0, 53.0,
160+
from + 12 * frequencyData),
139161
],
140162
settings: const ChartCandleSettings(),
141163
),
142164
];
143165
}
144166

145-
static _candleItem(Color color, double min1, double max1, double min2, double max2, double x) {
167+
static _candleItem(Color color, double min1, double max1, double min2,
168+
double max2, double x) {
146169
return ChartCandleDataItem(
147170
color: color,
148171
value1: ChartCandleDataItemValue(

‎example/lib/pages/group_bar_page.dart‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import 'dart:math';
22

33
import 'package:flutter/material.dart';
4-
import 'package:mrx_charts/chart.dart';
5-
import 'package:mrx_charts/models/axis/chart_axis_layer.dart';
6-
import 'package:mrx_charts/models/chart_layer.dart';
7-
import 'package:mrx_charts/models/group/bar/chart_group_bar_layer.dart';
8-
import 'package:mrx_charts/models/tooltip/chart_tooltip_layer.dart';
9-
import 'package:mrx_charts/models/tooltip/shape/chart_tooltip_shape.dart';
4+
import 'package:mrx_charts/mrx_charts.dart';
105

116
class GroupBarPage extends StatefulWidget {
127
const GroupBarPage({Key? key}) : super(key: key);

‎example/lib/pages/line_page.dart‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@ import 'dart:math';
22

33
import 'package:flutter/material.dart';
44
import 'package:intl/intl.dart';
5-
import 'package:mrx_charts/chart.dart';
6-
import 'package:mrx_charts/models/axis/chart_axis_layer.dart';
7-
import 'package:mrx_charts/models/chart_layer.dart';
8-
import 'package:mrx_charts/models/highlight/chart_highlight_layer.dart';
9-
import 'package:mrx_charts/models/highlight/shape/chart_highlight_shape.dart';
10-
import 'package:mrx_charts/models/line/chart_line_layer.dart';
11-
import 'package:mrx_charts/models/tooltip/chart_tooltip_layer.dart';
12-
import 'package:mrx_charts/models/tooltip/shape/chart_tooltip_shape.dart';
5+
import 'package:mrx_charts/mrx_charts.dart';
136

147
class LinePage extends StatefulWidget {
158
const LinePage({Key? key}) : super(key: key);
@@ -63,7 +56,8 @@ class _LinePageState extends State<LinePage> {
6356
List<ChartLayer> layers() {
6457
final from = DateTime(2021, 4);
6558
final to = DateTime(2021, 8);
66-
final frequency = (to.millisecondsSinceEpoch - from.millisecondsSinceEpoch) / 3.0;
59+
final frequency =
60+
(to.millisecondsSinceEpoch - from.millisecondsSinceEpoch) / 3.0;
6761
return [
6862
ChartHighlightLayer(
6963
shape: () => ChartHighlightLineShape<ChartLineDataItem>(
@@ -94,7 +88,8 @@ class _LinePageState extends State<LinePage> {
9488
),
9589
),
9690
),
97-
labelX: (value) => DateFormat('MMM').format(DateTime.fromMillisecondsSinceEpoch(value.toInt())),
91+
labelX: (value) => DateFormat('MMM')
92+
.format(DateTime.fromMillisecondsSinceEpoch(value.toInt())),
9893
labelY: (value) => value.toInt().toString(),
9994
),
10095
ChartLineLayer(

‎example/lib/pages/pie_page.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import 'dart:math';
22

33
import 'package:flutter/material.dart';
4-
import 'package:mrx_charts/chart.dart';
5-
import 'package:mrx_charts/models/chart_layer.dart';
6-
import 'package:mrx_charts/models/group/pie/chart_group_pie_layer.dart';
7-
import 'package:mrx_charts/models/tooltip/chart_tooltip_layer.dart';
8-
import 'package:mrx_charts/models/tooltip/shape/chart_tooltip_shape.dart';
4+
import 'package:mrx_charts/mrx_charts.dart';
95

106
class PiePage extends StatefulWidget {
117
const PiePage({Key? key}) : super(key: key);

‎lib/models/grid/data/chart_grid_data.dart‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎lib/models/highlight/shape/chart_highlight_shape.dart‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎lib/models/tooltip/shape/chart_tooltip_shape.dart‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎lib/mrx_charts.dart‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
export 'src/chart.dart';
2+
export 'src/models/animation/chart_animation.dart';
3+
export 'src/models/axis/chart_axis_layer.dart';
4+
export 'src/models/bar/chart_bar_layer.dart';
5+
export 'src/models/candle/chart_candle_layer.dart';
6+
export 'src/models/chart_axis_value.dart';
7+
export 'src/models/chart_data_item.dart';
8+
export 'src/models/chart_layer.dart';
9+
export 'src/models/chart_painter_data.dart';
10+
export 'src/models/grid/chart_grid_layer.dart';
11+
export 'src/models/group/bar/chart_group_bar_layer.dart';
12+
export 'src/models/group/pie/chart_group_pie_layer.dart';
13+
export 'src/models/highlight/chart_highlight_layer.dart';
14+
export 'src/models/highlight/shape/chart_highlight_shape.dart';
15+
export 'src/models/line/chart_line_layer.dart';
16+
export 'src/models/tooltip/chart_tooltip_layer.dart';
17+
export 'src/models/tooltip/shape/chart_tooltip_shape.dart';
18+
export 'src/models/touchable/arc_shape.dart';
19+
export 'src/models/touchable/rectangle_shape.dart';
20+
export 'src/models/touchable/touchable_shape.dart';
21+
export 'src/painter/chart_painter.dart';
22+
export 'src/touch/chart_touch_detector.dart';
23+
export 'src/touch/stock_touch_callback_data.dart';

0 commit comments

Comments
 (0)