From da51929462ffed97f08904589056a0a97cc71e63 Mon Sep 17 00:00:00 2001 From: ramin-deriv Date: Sun, 10 Dec 2023 10:44:27 +0800 Subject: [PATCH] Fix merge issues --- .../chart/data_visualization/markers/marker_area.dart | 2 +- lib/src/deriv_chart/chart/main_chart.dart | 1 + lib/src/deriv_chart/deriv_chart.dart | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart b/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart index 43d542603..60d578b27 100644 --- a/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart +++ b/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart @@ -79,7 +79,7 @@ class _MarkerAreaState extends State { duration: animationDuration, opacity: widget.markerSeries.activeMarker != null ? 0.5 : 1, child: CustomPaint( - child: Container(), + child: const SizedBox.shrink(), painter: _MarkerPainter( series: widget.markerSeries, epochToX: xAxis.xFromEpoch, diff --git a/lib/src/deriv_chart/chart/main_chart.dart b/lib/src/deriv_chart/chart/main_chart.dart index 9388e6943..9569febe5 100644 --- a/lib/src/deriv_chart/chart/main_chart.dart +++ b/lib/src/deriv_chart/chart/main_chart.dart @@ -13,6 +13,7 @@ import 'package:deriv_chart/src/deriv_chart/chart/x_axis/x_axis_model.dart'; import 'package:deriv_chart/src/models/chart_config.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../drawing_tool_chart/drawing_tool_chart.dart'; import 'basic_chart.dart'; import 'multiple_animated_builder.dart'; import 'data_visualization/annotations/chart_annotation.dart'; diff --git a/lib/src/deriv_chart/deriv_chart.dart b/lib/src/deriv_chart/deriv_chart.dart index 4b5a0e49c..d2799909c 100644 --- a/lib/src/deriv_chart/deriv_chart.dart +++ b/lib/src/deriv_chart/deriv_chart.dart @@ -334,6 +334,7 @@ class _DerivChartState extends State { dataFitEnabled: widget.dataFitEnabled, opacity: widget.opacity, annotations: widget.annotations, + chartAxisConfig: widget.chartAxisConfig, showCrosshair: widget.showCrosshair, indicatorsRepo: widget.indicatorsRepo ?? _indicatorsRepo, maxCurrentTickOffset: widget.maxCurrentTickOffset,