Use TextScaler textScaler insted of double textScale to get rid of th…

…e deprecation warning
imaNNeo · Nov 21, 2023 · 888803f · 888803f
1 parent 1877f37
commit 888803f
Show file tree

Hide file tree

Showing 21 changed files with 349 additions and 213 deletions.
diff --git a/lib/src/chart/bar_chart/bar_chart_painter.dart b/lib/src/chart/bar_chart/bar_chart_painter.dart
@@ -358,7 +358,7 @@ class BarChartPainter extends AxisChartPainter<BarChartData> {
       text: span,
       textAlign: tooltipItem.textAlign,
       textDirection: tooltipItem.textDirection,
-      textScaleFactor: holder.textScale,
+      textScaler: holder.textScaler,
     )..layout(maxWidth: tooltipData.maxContentWidth);
 
     /// creating TextPainters to calculate the width and height of the tooltip

diff --git a/lib/src/chart/bar_chart/bar_chart_renderer.dart b/lib/src/chart/bar_chart/bar_chart_renderer.dart
@@ -19,15 +19,15 @@ class BarChartLeaf extends LeafRenderObjectWidget {
         context,
         data,
         targetData,
-        MediaQuery.of(context).textScaleFactor,
+        MediaQuery.of(context).textScaler,
       );
 
   @override
   void updateRenderObject(BuildContext context, RenderBarChart renderObject) {
     renderObject
       ..data = data
       ..targetData = targetData
-      ..textScale = MediaQuery.of(context).textScaleFactor
+      ..textScaler = MediaQuery.of(context).textScaler
       ..buildContext = context;
   }
 }
@@ -39,10 +39,10 @@ class RenderBarChart extends RenderBaseChart<BarTouchResponse> {
     BuildContext context,
     BarChartData data,
     BarChartData targetData,
-    double textScale,
+    TextScaler textScaler,
   )   : _data = data,
         _targetData = targetData,
-        _textScale = textScale,
+        _textScaler = textScaler,
         super(targetData.barTouchData, context);
 
   BarChartData get data => _data;
@@ -64,12 +64,12 @@ class RenderBarChart extends RenderBaseChart<BarTouchResponse> {
     markNeedsPaint();
   }
 
-  double get textScale => _textScale;
-  double _textScale;
+  TextScaler get textScaler => _textScaler;
+  TextScaler _textScaler;
 
-  set textScale(double value) {
-    if (_textScale == value) return;
-    _textScale = value;
+  set textScaler(TextScaler value) {
+    if (_textScaler == value) return;
+    _textScaler = value;
     markNeedsPaint();
   }
 
@@ -80,9 +80,8 @@ class RenderBarChart extends RenderBaseChart<BarTouchResponse> {
   @visibleForTesting
   BarChartPainter painter = BarChartPainter();
 
-  PaintHolder<BarChartData> get paintHolder {
-    return PaintHolder(data, targetData, textScale);
-  }
+  PaintHolder<BarChartData> get paintHolder =>
+      PaintHolder(data, targetData, textScaler);
 
   @override
   void paint(PaintingContext context, Offset offset) {

diff --git a/lib/src/chart/base/base_chart/base_chart_painter.dart b/lib/src/chart/base/base_chart/base_chart_painter.dart
@@ -19,14 +19,14 @@ class BaseChartPainter<D extends BaseChartData> {
 /// Holds data for painting on canvas
 class PaintHolder<Data extends BaseChartData> {
   /// Holds data for painting on canvas
-  const PaintHolder(this.data, this.targetData, this.textScale);
+  const PaintHolder(this.data, this.targetData, this.textScaler);
 
   /// [data] is what we need to show frame by frame (it might be changed by an animator)
   final Data data;
 
   /// [targetData] is the target of animation that is playing.
   final Data targetData;
 
-  /// system [textScale]
-  final double textScale;
+  /// system [TextScaler] used for scaling texts for better readability
+  final TextScaler textScaler;
 }
diff --git a/lib/src/chart/line_chart/line_chart_painter.dart b/lib/src/chart/line_chart/line_chart_painter.dart
@@ -1012,7 +1012,7 @@ class LineChartPainter extends AxisChartPainter<LineChartData> {
         text: span,
         textAlign: tooltipItem.textAlign,
         textDirection: tooltipItem.textDirection,
-        textScaleFactor: holder.textScale,
+        textScaler: holder.textScaler,
       )..layout(maxWidth: tooltipData.maxContentWidth);
       drawingTextPainters.add(tp);
     }

diff --git a/lib/src/chart/line_chart/line_chart_renderer.dart b/lib/src/chart/line_chart/line_chart_renderer.dart
@@ -24,15 +24,15 @@ class LineChartLeaf extends LeafRenderObjectWidget {
         context,
         data,
         targetData,
-        MediaQuery.of(context).textScaleFactor,
+        MediaQuery.of(context).textScaler,
       );
 
   @override
   void updateRenderObject(BuildContext context, RenderLineChart renderObject) {
     renderObject
       ..data = data
       ..targetData = targetData
-      ..textScale = MediaQuery.of(context).textScaleFactor
+      ..textScaler = MediaQuery.of(context).textScaler
       ..buildContext = context;
   }
 }
@@ -44,10 +44,10 @@ class RenderLineChart extends RenderBaseChart<LineTouchResponse> {
     BuildContext context,
     LineChartData data,
     LineChartData targetData,
-    double textScale,
+    TextScaler textScaler,
   )   : _data = data,
         _targetData = targetData,
-        _textScale = textScale,
+        _textScaler = textScaler,
         super(
           targetData.lineTouchData,
           context,
@@ -70,11 +70,11 @@ class RenderLineChart extends RenderBaseChart<LineTouchResponse> {
     markNeedsPaint();
   }
 
-  double get textScale => _textScale;
-  double _textScale;
-  set textScale(double value) {
-    if (_textScale == value) return;
-    _textScale = value;
+  TextScaler get textScaler => _textScaler;
+  TextScaler _textScaler;
+  set textScaler(TextScaler value) {
+    if (_textScaler == value) return;
+    _textScaler = value;
     markNeedsPaint();
   }
 
@@ -85,9 +85,8 @@ class RenderLineChart extends RenderBaseChart<LineTouchResponse> {
   @visibleForTesting
   LineChartPainter painter = LineChartPainter();
 
-  PaintHolder<LineChartData> get paintHolder {
-    return PaintHolder(data, targetData, textScale);
-  }
+  PaintHolder<LineChartData> get paintHolder =>
+      PaintHolder(data, targetData, textScaler);
 
   @override
   void paint(PaintingContext context, Offset offset) {

diff --git a/lib/src/chart/pie_chart/pie_chart_painter.dart b/lib/src/chart/pie_chart/pie_chart_painter.dart
@@ -354,7 +354,7 @@ class PieChartPainter extends BaseChartPainter<PieChartData> {
           text: span,
           textAlign: TextAlign.center,
           textDirection: TextDirection.ltr,
-          textScaleFactor: holder.textScale,
+          textScaler: holder.textScaler,
         )..layout();
 
         canvasWrapper.drawText(

diff --git a/lib/src/chart/pie_chart/pie_chart_renderer.dart b/lib/src/chart/pie_chart/pie_chart_renderer.dart
@@ -26,15 +26,15 @@ class PieChartLeaf extends MultiChildRenderObjectWidget {
         context,
         data,
         targetData,
-        MediaQuery.of(context).textScaleFactor,
+        MediaQuery.of(context).textScaler,
       );
 
   @override
   void updateRenderObject(BuildContext context, RenderPieChart renderObject) {
     renderObject
       ..data = data
       ..targetData = targetData
-      ..textScale = MediaQuery.of(context).textScaleFactor
+      ..textScaler = MediaQuery.of(context).textScaler
       ..buildContext = context;
   }
 }
@@ -50,10 +50,10 @@ class RenderPieChart extends RenderBaseChart<PieTouchResponse>
     BuildContext context,
     PieChartData data,
     PieChartData targetData,
-    double textScale,
+    TextScaler textScaler,
   )   : _data = data,
         _targetData = targetData,
-        _textScale = textScale,
+        _textScaler = textScaler,
         super(targetData.pieTouchData, context);
 
   PieChartData get data => _data;
@@ -77,12 +77,12 @@ class RenderPieChart extends RenderBaseChart<PieTouchResponse>
     markNeedsLayout();
   }
 
-  double get textScale => _textScale;
-  double _textScale;
+  TextScaler get textScaler => _textScaler;
+  TextScaler _textScaler;
 
-  set textScale(double value) {
-    if (_textScale == value) return;
-    _textScale = value;
+  set textScaler(TextScaler value) {
+    if (_textScaler == value) return;
+    _textScaler = value;
     markNeedsPaint();
   }
 
@@ -93,9 +93,8 @@ class RenderPieChart extends RenderBaseChart<PieTouchResponse>
   @visibleForTesting
   PieChartPainter painter = PieChartPainter();
 
-  PaintHolder<PieChartData> get paintHolder {
-    return PaintHolder(data, targetData, textScale);
-  }
+  PaintHolder<PieChartData> get paintHolder =>
+      PaintHolder(data, targetData, textScaler);
 
   @override
   void setupParentData(RenderBox child) {

diff --git a/lib/src/chart/radar_chart/radar_chart_painter.dart b/lib/src/chart/radar_chart/radar_chart_painter.dart
@@ -276,7 +276,7 @@ class RadarChartPainter extends BaseChartPainter<RadarChartData> {
     _titleTextPaint
       ..textAlign = TextAlign.center
       ..textDirection = TextDirection.ltr
-      ..textScaleFactor = holder.textScale;
+      ..textScaler = holder.textScaler;
 
     for (var index = 0; index < data.titleCount; index++) {
       final baseTitleAngle = Utils().degrees(diffAngle * index);

diff --git a/lib/src/chart/radar_chart/radar_chart_renderer.dart b/lib/src/chart/radar_chart/radar_chart_renderer.dart
@@ -23,15 +23,15 @@ class RadarChartLeaf extends LeafRenderObjectWidget {
         context,
         data,
         targetData,
-        MediaQuery.of(context).textScaleFactor,
+        MediaQuery.of(context).textScaler,
       );
 
   @override
   void updateRenderObject(BuildContext context, RenderRadarChart renderObject) {
     renderObject
       ..data = data
       ..targetData = targetData
-      ..textScale = MediaQuery.of(context).textScaleFactor
+      ..textScaler = MediaQuery.of(context).textScaler
       ..buildContext = context;
   }
 }
@@ -43,10 +43,10 @@ class RenderRadarChart extends RenderBaseChart<RadarTouchResponse> {
     BuildContext context,
     RadarChartData data,
     RadarChartData targetData,
-    double textScale,
+    TextScaler textScaler,
   )   : _data = data,
         _targetData = targetData,
-        _textScale = textScale,
+        _textScaler = textScaler,
         super(targetData.radarTouchData, context);
 
   RadarChartData get data => _data;
@@ -68,12 +68,12 @@ class RenderRadarChart extends RenderBaseChart<RadarTouchResponse> {
     markNeedsPaint();
   }
 
-  double get textScale => _textScale;
-  double _textScale;
+  TextScaler get textScaler => _textScaler;
+  TextScaler _textScaler;
 
-  set textScale(double value) {
-    if (_textScale == value) return;
-    _textScale = value;
+  set textScaler(TextScaler value) {
+    if (_textScaler == value) return;
+    _textScaler = value;
     markNeedsPaint();
   }
 
@@ -84,9 +84,8 @@ class RenderRadarChart extends RenderBaseChart<RadarTouchResponse> {
   @visibleForTesting
   RadarChartPainter painter = RadarChartPainter();
 
-  PaintHolder<RadarChartData> get paintHolder {
-    return PaintHolder(data, targetData, textScale);
-  }
+  PaintHolder<RadarChartData> get paintHolder =>
+      PaintHolder(data, targetData, textScaler);
 
   @override
   void paint(PaintingContext context, Offset offset) {

diff --git a/lib/src/chart/scatter_chart/scatter_chart_painter.dart b/lib/src/chart/scatter_chart/scatter_chart_painter.dart
@@ -138,7 +138,7 @@ class ScatterChartPainter extends AxisChartPainter<ScatterChartData> {
           text: span,
           textAlign: TextAlign.center,
           textDirection: holder.data.scatterLabelSettings.textDirection,
-          textScaleFactor: holder.textScale,
+          textScaler: holder.textScaler,
         )..layout(maxWidth: viewSize.width);
 
         final pixelX = getPixelX(scatterSpot.x, viewSize, holder);
@@ -233,7 +233,7 @@ class ScatterChartPainter extends AxisChartPainter<ScatterChartData> {
       text: span,
       textAlign: tooltipItem.textAlign,
       textDirection: tooltipItem.textDirection,
-      textScaleFactor: holder.textScale,
+      textScaler: holder.textScaler,
     )..layout(maxWidth: tooltipData.maxContentWidth);
 
     final width = drawingTextPainter.width;

diff --git a/lib/src/chart/scatter_chart/scatter_chart_renderer.dart b/lib/src/chart/scatter_chart/scatter_chart_renderer.dart
@@ -24,7 +24,7 @@ class ScatterChartLeaf extends LeafRenderObjectWidget {
         context,
         data,
         targetData,
-        MediaQuery.of(context).textScaleFactor,
+        MediaQuery.of(context).textScaler,
       );
 
   @override
@@ -35,7 +35,7 @@ class ScatterChartLeaf extends LeafRenderObjectWidget {
     renderObject
       ..data = data
       ..targetData = targetData
-      ..textScale = MediaQuery.of(context).textScaleFactor
+      ..textScaler = MediaQuery.of(context).textScaler
       ..buildContext = context;
   }
 }
@@ -47,10 +47,10 @@ class RenderScatterChart extends RenderBaseChart<ScatterTouchResponse> {
     BuildContext context,
     ScatterChartData data,
     ScatterChartData targetData,
-    double textScale,
+    TextScaler textScaler,
   )   : _data = data,
         _targetData = targetData,
-        _textScale = textScale,
+        _textScaler = textScaler,
         super(targetData.scatterTouchData, context);
 
   ScatterChartData get data => _data;
@@ -72,12 +72,12 @@ class RenderScatterChart extends RenderBaseChart<ScatterTouchResponse> {
     markNeedsPaint();
   }
 
-  double get textScale => _textScale;
-  double _textScale;
+  TextScaler get textScaler => _textScaler;
+  TextScaler _textScaler;
 
-  set textScale(double value) {
-    if (_textScale == value) return;
-    _textScale = value;
+  set textScaler(TextScaler value) {
+    if (_textScaler == value) return;
+    _textScaler = value;
     markNeedsPaint();
   }
 
@@ -88,9 +88,8 @@ class RenderScatterChart extends RenderBaseChart<ScatterTouchResponse> {
   @visibleForTesting
   ScatterChartPainter painter = ScatterChartPainter();
 
-  PaintHolder<ScatterChartData> get paintHolder {
-    return PaintHolder(data, targetData, textScale);
-  }
+  PaintHolder<ScatterChartData> get paintHolder =>
+      PaintHolder(data, targetData, textScaler);
 
   @override
   void paint(PaintingContext context, Offset offset) {