Simplify the codebase by using the single line functions style or new switch statement

Author: imaNNeo

lib/src/chart/bar_chart/bar_chart_data.dart

@@ -94,23 +94,22 @@ class BarChartData extends AxisChartData with EquatableMixin {
     double? baselineY,
     Color? backgroundColor,
     ExtraLinesData? extraLinesData,
-  }) {
-    return BarChartData(
-      barGroups: barGroups ?? this.barGroups,
-      groupsSpace: groupsSpace ?? this.groupsSpace,
-      alignment: alignment ?? this.alignment,
-      titlesData: titlesData ?? this.titlesData,
-      rangeAnnotations: rangeAnnotations ?? this.rangeAnnotations,
-      barTouchData: barTouchData ?? this.barTouchData,
-      gridData: gridData ?? this.gridData,
-      borderData: borderData ?? this.borderData,
-      maxY: maxY ?? this.maxY,
-      minY: minY ?? this.minY,
-      baselineY: baselineY ?? this.baselineY,
-      backgroundColor: backgroundColor ?? this.backgroundColor,
-      extraLinesData: extraLinesData ?? this.extraLinesData,
-    );
-  }
+  }) =>
+      BarChartData(
+        barGroups: barGroups ?? this.barGroups,
+        groupsSpace: groupsSpace ?? this.groupsSpace,
+        alignment: alignment ?? this.alignment,
+        titlesData: titlesData ?? this.titlesData,
+        rangeAnnotations: rangeAnnotations ?? this.rangeAnnotations,
+        barTouchData: barTouchData ?? this.barTouchData,
+        gridData: gridData ?? this.gridData,
+        borderData: borderData ?? this.borderData,
+        maxY: maxY ?? this.maxY,
+        minY: minY ?? this.minY,
+        baselineY: baselineY ?? this.baselineY,
+        backgroundColor: backgroundColor ?? this.backgroundColor,
+        extraLinesData: extraLinesData ?? this.extraLinesData,
+      );
 
   /// Lerps a [BaseChartData] based on [t] value, check [Tween.lerp].
   @override
@@ -243,35 +242,32 @@ class BarChartGroupData with EquatableMixin {
     List<BarChartRodData>? barRods,
     double? barsSpace,
     List<int>? showingTooltipIndicators,
-  }) {
-    return BarChartGroupData(
-      x: x ?? this.x,
-      groupVertically: groupVertically ?? this.groupVertically,
-      barRods: barRods ?? this.barRods,
-      barsSpace: barsSpace ?? this.barsSpace,
-      showingTooltipIndicators:
-          showingTooltipIndicators ?? this.showingTooltipIndicators,
-    );
-  }
+  }) => BarChartGroupData(
+    x: x ?? this.x,
+    groupVertically: groupVertically ?? this.groupVertically,
+    barRods: barRods ?? this.barRods,
+    barsSpace: barsSpace ?? this.barsSpace,
+    showingTooltipIndicators:
+    showingTooltipIndicators ?? this.showingTooltipIndicators,
+  );
 
   /// Lerps a [BarChartGroupData] based on [t] value, check [Tween.lerp].
   static BarChartGroupData lerp(
     BarChartGroupData a,
     BarChartGroupData b,
     double t,
-  ) {
-    return BarChartGroupData(
-      x: (a.x + (b.x - a.x) * t).round(),
-      groupVertically: b.groupVertically,
-      barRods: lerpBarChartRodDataList(a.barRods, b.barRods, t),
-      barsSpace: lerpDouble(a.barsSpace, b.barsSpace, t),
-      showingTooltipIndicators: lerpIntList(
-        a.showingTooltipIndicators,
-        b.showingTooltipIndicators,
-        t,
-      ),
-    );
-  }
+  ) =>
+      BarChartGroupData(
+        x: (a.x + (b.x - a.x) * t).round(),
+        groupVertically: b.groupVertically,
+        barRods: lerpBarChartRodDataList(a.barRods, b.barRods, t),
+        barsSpace: lerpDouble(a.barsSpace, b.barsSpace, t),
+        showingTooltipIndicators: lerpIntList(
+          a.showingTooltipIndicators,
+          b.showingTooltipIndicators,
+          t,
+        ),
+      );
 
   /// Used for equality check, see [EquatableMixin].
   @override
@@ -386,42 +382,40 @@ class BarChartRodData with EquatableMixin {
     BorderSide? borderSide,
     BackgroundBarChartRodData? backDrawRodData,
     List<BarChartRodStackItem>? rodStackItems,
-  }) {
-    return BarChartRodData(
-      fromY: fromY ?? this.fromY,
-      toY: toY ?? this.toY,
-      color: color ?? this.color,
-      gradient: gradient ?? this.gradient,
-      width: width ?? this.width,
-      borderRadius: borderRadius ?? this.borderRadius,
-      borderDashArray: borderDashArray,
-      borderSide: borderSide ?? this.borderSide,
-      backDrawRodData: backDrawRodData ?? this.backDrawRodData,
-      rodStackItems: rodStackItems ?? this.rodStackItems,
-    );
-  }
+  }) =>
+      BarChartRodData(
+        fromY: fromY ?? this.fromY,
+        toY: toY ?? this.toY,
+        color: color ?? this.color,
+        gradient: gradient ?? this.gradient,
+        width: width ?? this.width,
+        borderRadius: borderRadius ?? this.borderRadius,
+        borderDashArray: borderDashArray,
+        borderSide: borderSide ?? this.borderSide,
+        backDrawRodData: backDrawRodData ?? this.backDrawRodData,
+        rodStackItems: rodStackItems ?? this.rodStackItems,
+      );
 
   /// Lerps a [BarChartRodData] based on [t] value, check [Tween.lerp].
-  static BarChartRodData lerp(BarChartRodData a, BarChartRodData b, double t) {
-    return BarChartRodData(
-      // ignore: invalid_use_of_protected_member
-      gradient: a.gradient?.lerpTo(b.gradient, t),
-      color: Color.lerp(a.color, b.color, t),
-      width: lerpDouble(a.width, b.width, t),
-      borderRadius: BorderRadius.lerp(a.borderRadius, b.borderRadius, t),
-      borderDashArray: lerpIntList(a.borderDashArray, b.borderDashArray, t),
-      borderSide: BorderSide.lerp(a.borderSide, b.borderSide, t),
-      fromY: lerpDouble(a.fromY, b.fromY, t),
-      toY: lerpDouble(a.toY, b.toY, t)!,
-      backDrawRodData: BackgroundBarChartRodData.lerp(
-        a.backDrawRodData,
-        b.backDrawRodData,
-        t,
-      ),
-      rodStackItems:
-          lerpBarChartRodStackList(a.rodStackItems, b.rodStackItems, t),
-    );
-  }
+  static BarChartRodData lerp(BarChartRodData a, BarChartRodData b, double t) =>
+      BarChartRodData(
+        // ignore: invalid_use_of_protected_member
+        gradient: a.gradient?.lerpTo(b.gradient, t),
+        color: Color.lerp(a.color, b.color, t),
+        width: lerpDouble(a.width, b.width, t),
+        borderRadius: BorderRadius.lerp(a.borderRadius, b.borderRadius, t),
+        borderDashArray: lerpIntList(a.borderDashArray, b.borderDashArray, t),
+        borderSide: BorderSide.lerp(a.borderSide, b.borderSide, t),
+        fromY: lerpDouble(a.fromY, b.fromY, t),
+        toY: lerpDouble(a.toY, b.toY, t)!,
+        backDrawRodData: BackgroundBarChartRodData.lerp(
+          a.backDrawRodData,
+          b.backDrawRodData,
+          t,
+        ),
+        rodStackItems:
+            lerpBarChartRodStackList(a.rodStackItems, b.rodStackItems, t),
+      );
 
   /// Used for equality check, see [EquatableMixin].
   @override
@@ -483,28 +477,26 @@ class BarChartRodStackItem with EquatableMixin {
     double? toY,
     Color? color,
     BorderSide? borderSide,
-  }) {
-    return BarChartRodStackItem(
-      fromY ?? this.fromY,
-      toY ?? this.toY,
-      color ?? this.color,
-      borderSide ?? this.borderSide,
-    );
-  }
+  }) =>
+      BarChartRodStackItem(
+        fromY ?? this.fromY,
+        toY ?? this.toY,
+        color ?? this.color,
+        borderSide ?? this.borderSide,
+      );
 
   /// Lerps a [BarChartRodStackItem] based on [t] value, check [Tween.lerp].
   static BarChartRodStackItem lerp(
     BarChartRodStackItem a,
     BarChartRodStackItem b,
     double t,
-  ) {
-    return BarChartRodStackItem(
-      lerpDouble(a.fromY, b.fromY, t)!,
-      lerpDouble(a.toY, b.toY, t)!,
-      Color.lerp(a.color, b.color, t)!,
-      BorderSide.lerp(a.borderSide, b.borderSide, t),
-    );
-  }
+  ) =>
+      BarChartRodStackItem(
+        lerpDouble(a.fromY, b.fromY, t)!,
+        lerpDouble(a.toY, b.toY, t)!,
+        Color.lerp(a.color, b.color, t)!,
+        BorderSide.lerp(a.borderSide, b.borderSide, t),
+      );
 
   /// Used for equality check, see [EquatableMixin].
   @override
@@ -557,16 +549,14 @@ class BackgroundBarChartRodData with EquatableMixin {
     BackgroundBarChartRodData a,
     BackgroundBarChartRodData b,
     double t,
-  ) {
-    return BackgroundBarChartRodData(
-      fromY: lerpDouble(a.fromY, b.fromY, t),
-      toY: lerpDouble(a.toY, b.toY, t),
-      color: Color.lerp(a.color, b.color, t),
-      // ignore: invalid_use_of_protected_member
-      gradient: a.gradient?.lerpTo(b.gradient, t),
-      show: b.show,
-    );
-  }
+  ) => BackgroundBarChartRodData(
+    fromY: lerpDouble(a.fromY, b.fromY, t),
+    toY: lerpDouble(a.toY, b.toY, t),
+    color: Color.lerp(a.color, b.color, t),
+    // ignore: invalid_use_of_protected_member
+    gradient: a.gradient?.lerpTo(b.gradient, t),
+    show: b.show,
+  );
 
   /// Used for equality check, see [EquatableMixin].
   @override
@@ -645,19 +635,17 @@ class BarTouchData extends FlTouchData<BarTouchResponse> with EquatableMixin {
     EdgeInsets? touchExtraThreshold,
     bool? allowTouchBarBackDraw,
     bool? handleBuiltInTouches,
-  }) {
-    return BarTouchData(
-      enabled: enabled ?? this.enabled,
-      touchCallback: touchCallback ?? this.touchCallback,
-      mouseCursorResolver: mouseCursorResolver ?? this.mouseCursorResolver,
-      longPressDuration: longPressDuration ?? this.longPressDuration,
-      touchTooltipData: touchTooltipData ?? this.touchTooltipData,
-      touchExtraThreshold: touchExtraThreshold ?? this.touchExtraThreshold,
-      allowTouchBarBackDraw:
-          allowTouchBarBackDraw ?? this.allowTouchBarBackDraw,
-      handleBuiltInTouches: handleBuiltInTouches ?? this.handleBuiltInTouches,
-    );
-  }
+  }) => BarTouchData(
+    enabled: enabled ?? this.enabled,
+    touchCallback: touchCallback ?? this.touchCallback,
+    mouseCursorResolver: mouseCursorResolver ?? this.mouseCursorResolver,
+    longPressDuration: longPressDuration ?? this.longPressDuration,
+    touchTooltipData: touchTooltipData ?? this.touchTooltipData,
+    touchExtraThreshold: touchExtraThreshold ?? this.touchExtraThreshold,
+    allowTouchBarBackDraw:
+    allowTouchBarBackDraw ?? this.allowTouchBarBackDraw,
+    handleBuiltInTouches: handleBuiltInTouches ?? this.handleBuiltInTouches,
+  );
 
   /// Used for equality check, see [EquatableMixin].
   @override
@@ -864,9 +852,8 @@ typedef GetBarTooltipColor = Color Function(
 );
 
 /// Default implementation for [BarTouchTooltipData.getTooltipColor].
-Color defaultBarTooltipColor(BarChartGroupData group) {
-  return Colors.blueGrey.darken(15);
-}
+Color defaultBarTooltipColor(BarChartGroupData group) =>
+    Colors.blueGrey.darken(15);
 
 /// Holds information about touch response in the [BarChart].
 ///
@@ -884,11 +871,9 @@ class BarTouchResponse extends BaseTouchResponse {
   /// and replaces provided values.
   BarTouchResponse copyWith({
     BarTouchedSpot? spot,
-  }) {
-    return BarTouchResponse(
-      spot ?? this.spot,
-    );
-  }
+  }) => BarTouchResponse(
+    spot ?? this.spot,
+  );
 }
 
 /// It gives you information about the touched spot.