Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/chart/base/axis_chart/axis_chart_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class AxisChartHelper {
isOverflowed = (axisPosition + (childSize / 2)) > parentAxisSize;
}

if (isOverflowed == false) return Offset.zero;
if (!isOverflowed) return Offset.zero;

// Calc offset if child overflowed
late double offset;
Expand Down
5 changes: 3 additions & 2 deletions lib/src/chart/base/custom_interactive_viewer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:async';
import 'dart:math' as math;

import 'package:flutter/foundation.dart' show clampDouble;
Expand Down Expand Up @@ -718,7 +719,7 @@ class _CustomInteractiveViewerState extends State<CustomInteractiveViewer>
);
_controller.duration = Duration(milliseconds: (tFinal * 1000).round());
_animation!.addListener(_onAnimate);
_controller.forward();
unawaited(_controller.forward());
case _GestureType.scale:
if (details.scaleVelocity.abs() < 0.1) {
_currentAxis = null;
Expand Down Expand Up @@ -746,7 +747,7 @@ class _CustomInteractiveViewerState extends State<CustomInteractiveViewer>
_scaleController.duration =
Duration(milliseconds: (tFinal * 1000).round());
_scaleAnimation!.addListener(_onScaleAnimate);
_scaleController.forward();
unawaited(_scaleController.forward());
case null:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
mockito: ^5.5.1
very_good_analysis: ^9.0.0
very_good_analysis: ^10.0.0

screenshots:
- description: "FL Chart Logo"
Expand Down
102 changes: 35 additions & 67 deletions test/chart/base/axis_chart/axis_chart_helper_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,34 @@ void main() {
group('iterateThroughAxis()', () {
test('test 1', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 0,
max: 0.1,
interval: 0.001,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(min: 0, max: 0.1, interval: 0.001, baseLine: 0)
.forEach(results.add);
expect(results.length, 101);
});

test('test 2', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 0,
minIncluded: false,
max: 0.1,
maxIncluded: false,
interval: 0.001,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(
min: 0,
minIncluded: false,
max: 0.1,
maxIncluded: false,
interval: 0.001,
baseLine: 0,
)
.forEach(results.add);
expect(results.length, 99);
expect(results[0], closeTo(0.001, tolerance));
expect(results[98], closeTo(0.099, tolerance));
});

test('test 3', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 0,
max: 1000,
interval: 200,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(min: 0, max: 1000, interval: 200, baseLine: 0)
.forEach(results.add);
expect(results.length, 6);
expect(results[0], 0);
expect(results[1], 200);
Expand All @@ -59,15 +46,9 @@ void main() {

test('test 4', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 0,
max: 10,
interval: 3,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(min: 0, max: 10, interval: 3, baseLine: 0)
.forEach(results.add);
expect(results.length, 5);
expect(results[0], 0);
expect(results[1], 3);
Expand All @@ -78,17 +59,16 @@ void main() {

test('test 5', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 0,
minIncluded: false,
max: 10,
maxIncluded: false,
interval: 3,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(
min: 0,
minIncluded: false,
max: 10,
maxIncluded: false,
interval: 3,
baseLine: 0,
)
.forEach(results.add);
expect(results.length, 3);
expect(results[0], 3);
expect(results[1], 6);
Expand All @@ -97,15 +77,9 @@ void main() {

test('test 6', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 35,
max: 130,
interval: 50,
baseLine: 0,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(min: 35, max: 130, interval: 50, baseLine: 0)
.forEach(results.add);
expect(results.length, 4);
expect(results[0], 35);
expect(results[1], 50);
Expand All @@ -115,15 +89,9 @@ void main() {

test('test 7', () {
final results = <double>[];
final axisValues = AxisChartHelper().iterateThroughAxis(
min: 5,
max: 35,
interval: 10,
baseLine: 5,
);
for (final axisValue in axisValues) {
results.add(axisValue);
}
AxisChartHelper()
.iterateThroughAxis(min: 5, max: 35, interval: 10, baseLine: 5)
.forEach(results.add);
expect(results.length, 4);
expect(results[0], 5);
expect(results[1], 15);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,6 @@ void main() {
const Size(viewSize, 40),
);
expect(
// This is for test
// ignore: invalid_use_of_protected_member
renderFlex.computeDistanceToActualBaseline(TextBaseline.alphabetic),
null,
);
Expand All @@ -214,8 +212,6 @@ void main() {
const Size(viewSize, 40),
);
expect(
// This is for test
// ignore: invalid_use_of_protected_member
renderFlex.computeDistanceToActualBaseline(TextBaseline.alphabetic),
null,
);
Expand Down
4 changes: 0 additions & 4 deletions test/chart/base/render_base_chart_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,6 @@ class TestRenderBaseChart extends RenderBaseChart<LineTouchResponse> {
required this.longPressGestureRecognizerOverride,
}) : super(touchData, context, canBeScaled: canBeScaled);

int panGestureAddPointerCallCount = 0;
int longPressGestureAddPointerCallCount = 0;
int tapGestureAddPointerCallCount = 0;

final PanGestureRecognizer panGestureRecognizerOverride;
final TapGestureRecognizer tapGestureRecognizerOverride;
final LongPressGestureRecognizer longPressGestureRecognizerOverride;
Expand Down
4 changes: 4 additions & 0 deletions test/helper_methods.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class HelperMethods {
return true;
}

// This is actually used, I don't know why the linter thinks otherwise
// ignore: unreachable_from_main
static bool equalsRRects(
RRect rrect1,
RRect rrect2, {
Expand Down Expand Up @@ -85,6 +87,8 @@ class HelperMethods {
return true;
}

// This is actually used, I don't know why the linter thinks otherwise
// ignore: unreachable_from_main
static bool equalsOffsets(
Offset offset1,
Offset offset2, {
Expand Down