fix: [rfw] Fix fontWeight not applied in release mode

Author: iam-abhijha

packages/rfw/CHANGELOG.md

@@ -1,3 +1,7 @@
+## NEXT
+
+* Fixes `fontWeight` not being applied in release mode for `Text` widgets.
+
 ## 1.1.3
 
 * Fixes dartdoc comments that accidentally used HTML.

packages/rfw/lib/src/flutter/argument_decoders.dart

@@ -27,12 +27,7 @@ class AnimationDefaults extends InheritedWidget {
   ///
   /// The [duration] and [curve] are optional, and default to 200ms and
   /// [Curves.fastOutSlowIn] respectively.
-  const AnimationDefaults({
-    super.key,
-    this.duration,
-    this.curve,
-    required super.child,
-  });
+  const AnimationDefaults({super.key, this.duration, this.curve, required super.child});
 
   /// The default duration that [ArgumentsDecoder.duration] should use.
   ///
@@ -48,7 +43,8 @@ class AnimationDefaults extends InheritedWidget {
   /// ambient [AnimationDefaults] or if the nearest [AnimationDefaults] has a
   /// null [duration].
   static Duration durationOf(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<AnimationDefaults>()?.duration ?? const Duration(milliseconds: 200);
+    return context.dependOnInheritedWidgetOfExactType<AnimationDefaults>()?.duration ??
+        const Duration(milliseconds: 200);
   }
 
   /// Return the ambient [AnimationDefaults.curve], or [Curves.fastOutSlowIn] if
@@ -81,7 +77,8 @@ class ArgumentDecoders {
   const ArgumentDecoders._();
 
   /// This is a workaround for https://github.com/dart-lang/sdk/issues/47021
-  static const ArgumentDecoders __ = ArgumentDecoders._(); // ignore: unused_field
+  // ignore: unused_field
+  static const ArgumentDecoders __ = ArgumentDecoders._();
 
   // (in alphabetical order)
 
@@ -147,12 +144,7 @@ class ArgumentDecoders {
     final BorderSide? b = borderSide(source, [...key, 1]);
     final BorderSide? c = borderSide(source, [...key, 2]);
     final BorderSide? d = borderSide(source, [...key, 3]);
-    return BorderDirectional(
-      start: a,
-      top: b ?? a,
-      end: c ?? a,
-      bottom: d ?? b ?? a,
-    );
+    return BorderDirectional(start: a, top: b ?? a, end: c ?? a, bottom: d ?? b ?? a);
   }
 
   /// Returns a [BorderRadiusDirectional] from the specified list.
@@ -175,12 +167,7 @@ class ArgumentDecoders {
     final Radius? b = radius(source, [...key, 1]);
     final Radius? c = radius(source, [...key, 2]);
     final Radius? d = radius(source, [...key, 3]);
-    return BorderRadiusDirectional.only(
-      topStart: a,
-      topEnd: b ?? a,
-      bottomStart: c ?? a,
-      bottomEnd: d ?? b ?? a,
-    );
+    return BorderRadiusDirectional.only(topStart: a, topEnd: b ?? a, bottomStart: c ?? a, bottomEnd: d ?? b ?? a);
   }
 
   /// Returns a [BorderSide] from the specified map.
@@ -284,7 +271,8 @@ class ArgumentDecoders {
   }
 
   /// Extension mechanism for [colorFilter].
-  static final Map<String, ArgumentDecoder<ColorFilter?>> colorFilterDecoders = <String, ArgumentDecoder<ColorFilter?>>{};
+  static final Map<String, ArgumentDecoder<ColorFilter?>> colorFilterDecoders =
+      <String, ArgumentDecoder<ColorFilter?>>{};
 
   /// Returns a list of 20 doubles from the specified list.
   ///
@@ -495,7 +483,9 @@ class ArgumentDecoders {
       case 'flutterLogo':
         return FlutterLogoDecoration(
           textColor: color(source, [...key, 'color']) ?? const Color(0xFF757575),
-          style: enumValue<FlutterLogoStyle>(FlutterLogoStyle.values, source, [...key, 'style']) ?? FlutterLogoStyle.markOnly,
+          style:
+              enumValue<FlutterLogoStyle>(FlutterLogoStyle.values, source, [...key, 'style']) ??
+              FlutterLogoStyle.markOnly,
           margin: (edgeInsets(source, [...key, 'margin']) ?? EdgeInsets.zero).resolve(TextDirection.ltr),
         );
       case 'shape':
@@ -539,7 +529,10 @@ class ArgumentDecoders {
     return DecorationImage(
       image: provider,
       onError: (Object exception, StackTrace? stackTrace) {
-        final VoidCallback? handler = source.voidHandler([...key, 'onError'], { 'exception': exception.toString(), 'stackTrack': stackTrace.toString() });
+        final VoidCallback? handler = source.voidHandler(
+          [...key, 'onError'],
+          {'exception': exception.toString(), 'stackTrack': stackTrace.toString()},
+        );
         if (handler != null) {
           handler();
         }
@@ -550,7 +543,8 @@ class ArgumentDecoders {
       centerSlice: rect(source, [...key, 'centerSlice']),
       repeat: enumValue<ImageRepeat>(ImageRepeat.values, source, [...key, 'repeat']) ?? ImageRepeat.noRepeat,
       matchTextDirection: source.v<bool>([...key, 'matchTextDirection']) ?? false,
-      filterQuality: enumValue<FilterQuality>(FilterQuality.values, source, [...key, 'filterQuality']) ?? FilterQuality.medium,
+      filterQuality:
+          enumValue<FilterQuality>(FilterQuality.values, source, [...key, 'filterQuality']) ?? FilterQuality.medium,
     );
   }
 
@@ -598,12 +592,7 @@ class ArgumentDecoders {
     final double? b = source.v<double>([...key, 1]);
     final double? c = source.v<double>([...key, 2]);
     final double? d = source.v<double>([...key, 3]);
-    return EdgeInsetsDirectional.fromSTEB(
-      a,
-      b ?? a,
-      c ?? a,
-      d ?? b ?? a,
-    );
+    return EdgeInsetsDirectional.fromSTEB(a, b ?? a, c ?? a, d ?? b ?? a);
   }
 
   /// Returns one of the values of the specified enum `T`, from the specified string.
@@ -632,6 +621,66 @@ class ArgumentDecoders {
     return null;
   }
 
+  /// Returns a [FontWeight] from the specified string or integer.
+  ///
+  /// This does not use [FontWeight.toString], which is not guaranteed to be
+  /// stable in release builds.
+  ///
+  /// Supported values:
+  ///
+  ///  * strings `"w100"` ... `"w900"`
+  ///  * strings `"normal"` (mapped to [FontWeight.w400]) and `"bold"` (mapped
+  ///    to [FontWeight.w700])
+  ///  * integers `100` ... `900` in steps of 100
+  static FontWeight? fontWeight(DataSource source, List<Object> key) {
+    final int? numeric = source.v<int>(key);
+    if (numeric != null) {
+      switch (numeric) {
+        case 100:
+          return FontWeight.w100;
+        case 200:
+          return FontWeight.w200;
+        case 300:
+          return FontWeight.w300;
+        case 400:
+          return FontWeight.w400;
+        case 500:
+          return FontWeight.w500;
+        case 600:
+          return FontWeight.w600;
+        case 700:
+          return FontWeight.w700;
+        case 800:
+          return FontWeight.w800;
+        case 900:
+          return FontWeight.w900;
+      }
+    }
+    switch (source.v<String>(key)) {
+      case 'w100':
+        return FontWeight.w100;
+      case 'w200':
+        return FontWeight.w200;
+      case 'w300':
+        return FontWeight.w300;
+      case 'w400':
+      case 'normal':
+        return FontWeight.w400;
+      case 'w500':
+        return FontWeight.w500;
+      case 'w600':
+        return FontWeight.w600;
+      case 'w700':
+      case 'bold':
+        return FontWeight.w700;
+      case 'w800':
+        return FontWeight.w800;
+      case 'w900':
+        return FontWeight.w900;
+    }
+    return null;
+  }
+
   /// Returns a [FontFeature] from the specified map.
   ///
   /// The `feature` key is used as the font feature name (defaulting to the
@@ -689,7 +738,9 @@ class ArgumentDecoders {
         return LinearGradient(
           begin: alignment(source, [...key, 'begin']) ?? Alignment.centerLeft,
           end: alignment(source, [...key, 'end']) ?? Alignment.centerRight,
-          colors: list<Color>(source, [...key, 'colors'], colorOrBlack) ?? const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
+          colors:
+              list<Color>(source, [...key, 'colors'], colorOrBlack) ??
+              const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
           stops: list<double>(source, [...key, 'stops'], doubleOrZero),
           tileMode: enumValue<TileMode>(TileMode.values, source, [...key, 'tileMode']) ?? TileMode.clamp,
           // transform: GradientTransformMatrix(matrix(source, [...key, 'transform'])), // blocked by https://github.com/flutter/flutter/issues/87208
@@ -698,7 +749,9 @@ class ArgumentDecoders {
         return RadialGradient(
           center: alignment(source, [...key, 'center']) ?? Alignment.center,
           radius: source.v<double>([...key, 'radius']) ?? 0.5,
-          colors: list<Color>(source, [...key, 'colors'], colorOrBlack) ?? const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
+          colors:
+              list<Color>(source, [...key, 'colors'], colorOrBlack) ??
+              const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
           stops: list<double>(source, [...key, 'stops'], doubleOrZero),
           tileMode: enumValue<TileMode>(TileMode.values, source, [...key, 'tileMode']) ?? TileMode.clamp,
           focal: alignment(source, [...key, 'focal']),
@@ -710,7 +763,9 @@ class ArgumentDecoders {
           center: alignment(source, [...key, 'center']) ?? Alignment.center,
           startAngle: source.v<double>([...key, 'startAngle']) ?? 0.0,
           endAngle: source.v<double>([...key, 'endAngle']) ?? math.pi * 2,
-          colors: list<Color>(source, [...key, 'colors'], colorOrBlack) ?? const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
+          colors:
+              list<Color>(source, [...key, 'colors'], colorOrBlack) ??
+              const <Color>[Color(0xFF000000), Color(0xFFFFFFFF)],
           stops: list<double>(source, [...key, 'stops'], doubleOrZero),
           tileMode: enumValue<TileMode>(TileMode.values, source, [...key, 'tileMode']) ?? TileMode.clamp,
           // transform: GradientTransformMatrix(matrix(source, [...key, 'transform'])), // blocked by https://github.com/flutter/flutter/issues/87208
@@ -780,7 +835,8 @@ class ArgumentDecoders {
   }
 
   /// Extension mechanism for [gridDelegate].
-  static final Map<String, ArgumentDecoder<SliverGridDelegate?>> gridDelegateDecoders = <String, ArgumentDecoder<SliverGridDelegate?>>{};
+  static final Map<String, ArgumentDecoder<SliverGridDelegate?>> gridDelegateDecoders =
+      <String, ArgumentDecoder<SliverGridDelegate?>>{};
 
   /// Returns an [IconData] from the specified map.
   ///
@@ -870,7 +926,8 @@ class ArgumentDecoders {
   }
 
   /// Extension mechanism for [imageProvider].
-  static final Map<String, ArgumentDecoder<ImageProvider?>> imageProviderDecoders = <String, ArgumentDecoder<ImageProvider?>>{};
+  static final Map<String, ArgumentDecoder<ImageProvider?>> imageProviderDecoders =
+      <String, ArgumentDecoder<ImageProvider?>>{};
 
   /// Returns a [List] of `T` values from the specified list, using the given
   /// `decoder` to parse each value.
@@ -1047,7 +1104,10 @@ class ArgumentDecoders {
     if (paintColorFilter != null) {
       result.colorFilter = paintColorFilter;
     }
-    final FilterQuality? paintFilterQuality = enumValue<FilterQuality>(FilterQuality.values, source, [...key, 'filterQuality']);
+    final FilterQuality? paintFilterQuality = enumValue<FilterQuality>(FilterQuality.values, source, [
+      ...key,
+      'filterQuality',
+    ]);
     if (paintFilterQuality != null) {
       result.filterQuality = paintFilterQuality;
     }
@@ -1190,9 +1250,7 @@ class ArgumentDecoders {
           borderRadius: borderRadius(source, [...key, 'borderRadius']) ?? BorderRadius.zero,
         );
       case 'circle':
-        return CircleBorder(
-          side: borderSide(source, [...key, 'side']) ?? BorderSide.none,
-        );
+        return CircleBorder(side: borderSide(source, [...key, 'side']) ?? BorderSide.none);
       case 'continuous':
         return ContinuousRectangleBorder(
           side: borderSide(source, [...key, 'side']) ?? BorderSide.none,
@@ -1204,9 +1262,7 @@ class ArgumentDecoders {
           borderRadius: borderRadius(source, [...key, 'borderRadius']) ?? BorderRadius.zero,
         );
       case 'stadium':
-        return StadiumBorder(
-          side: borderSide(source, [...key, 'side']) ?? BorderSide.none,
-        );
+        return StadiumBorder(side: borderSide(source, [...key, 'side']) ?? BorderSide.none);
       default:
         final ArgumentDecoder<ShapeBorder>? decoder = shapeBorderDecoders[type];
         if (decoder == null) {
@@ -1243,7 +1299,8 @@ class ArgumentDecoders {
       case 'sweep':
         return gradient(source, key)!.createShader(
           rect(source, [...key, 'rect']) ?? Rect.zero,
-          textDirection: enumValue<TextDirection>(TextDirection.values, source, ['textDirection']) ?? TextDirection.ltr,
+          textDirection:
+              enumValue<TextDirection>(TextDirection.values, source, [...key, 'textDirection']) ?? TextDirection.ltr,
         );
       default:
         final ArgumentDecoder<Shader?>? decoder = shaderDecoders[type];
@@ -1276,7 +1333,7 @@ class ArgumentDecoders {
   /// following keys: 'fontFamily` (string), `fontFamilyFallback` ([list] of
   /// [string]), `fontSize` (double), `height` (double), `leadingDistribution`
   /// ([enumValue] of [TextLeadingDistribution]), `leading` (double),
-  /// `fontWeight` ([enumValue] of [FontWeight]), `fontStyle` ([enumValue] of
+  /// `fontWeight` ([fontWeight]), `fontStyle` ([enumValue] of
   /// [FontStyle]), `forceStrutHeight` (boolean).
   static StrutStyle? strutStyle(DataSource source, List<Object> key) {
     if (!source.isMap(key)) {
@@ -1287,9 +1344,12 @@ class ArgumentDecoders {
       fontFamilyFallback: list<String>(source, [...key, 'fontFamilyFallback'], string),
       fontSize: source.v<double>([...key, 'fontSize']),
       height: source.v<double>([...key, 'height']),
-      leadingDistribution: enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [...key, 'leadingDistribution']),
+      leadingDistribution: enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [
+        ...key,
+        'leadingDistribution',
+      ]),
       leading: source.v<double>([...key, 'leading']),
-      fontWeight: enumValue<FontWeight>(FontWeight.values, source, [...key, 'fontWeight']),
+      fontWeight: fontWeight(source, [...key, 'fontWeight']),
       fontStyle: enumValue<FontStyle>(FontStyle.values, source, [...key, 'fontStyle']),
       forceStrutHeight: source.v<bool>([...key, 'forceStrutHeight']),
     );
@@ -1311,7 +1371,9 @@ class ArgumentDecoders {
     return TextHeightBehavior(
       applyHeightToFirstAscent: source.v<bool>([...key, 'applyHeightToFirstAscent']) ?? true,
       applyHeightToLastDescent: source.v<bool>([...key, 'applyHeightToLastDescent']) ?? true,
-      leadingDistribution: enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [...key, 'leadingDistribution']) ?? TextLeadingDistribution.proportional,
+      leadingDistribution:
+          enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [...key, 'leadingDistribution']) ??
+          TextLeadingDistribution.proportional,
     );
   }
 
@@ -1350,7 +1412,7 @@ class ArgumentDecoders {
   ///
   /// Otherwise (even if it has no keys), the [TextStyle] is created from the
   /// following keys: `color` ([color]), `backgroundColor` ([color]), `fontSize`
-  /// (double), `fontWeight` ([enumValue] of [FontWeight]), `fontStyle`
+  /// (double), `fontWeight` ([fontWeight]), `fontStyle`
   /// ([enumValue] of [FontStyle]), `letterSpacing` (double), `wordSpacing`
   /// (double), `textBaseline` ([enumValue] of [TextBaseline]), `height`
   /// (double), `leadingDistribution` ([enumValue] of
@@ -1369,13 +1431,16 @@ class ArgumentDecoders {
       color: color(source, [...key, 'color']),
       backgroundColor: color(source, [...key, 'backgroundColor']),
       fontSize: source.v<double>([...key, 'fontSize']),
-      fontWeight: enumValue<FontWeight>(FontWeight.values, source, [...key, 'fontWeight']),
+      fontWeight: fontWeight(source, [...key, 'fontWeight']),
       fontStyle: enumValue<FontStyle>(FontStyle.values, source, [...key, 'fontStyle']),
       letterSpacing: source.v<double>([...key, 'letterSpacing']),
       wordSpacing: source.v<double>([...key, 'wordSpacing']),
-      textBaseline: enumValue<TextBaseline>(TextBaseline.values, source, ['textBaseline']),
+      textBaseline: enumValue<TextBaseline>(TextBaseline.values, source, [...key, 'textBaseline']),
       height: source.v<double>([...key, 'height']),
-      leadingDistribution: enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [...key, 'leadingDistribution']),
+      leadingDistribution: enumValue<TextLeadingDistribution>(TextLeadingDistribution.values, source, [
+        ...key,
+        'leadingDistribution',
+      ]),
       locale: locale(source, [...key, 'locale']),
       foreground: paint(source, [...key, 'foreground']),
       background: paint(source, [...key, 'background']),
@@ -1387,7 +1452,7 @@ class ArgumentDecoders {
       decorationThickness: source.v<double>([...key, 'decorationThickness']),
       fontFamily: source.v<String>([...key, 'fontFamily']),
       fontFamilyFallback: list<String>(source, [...key, 'fontFamilyFallback'], string),
-      overflow: enumValue<TextOverflow>(TextOverflow.values, source, ['overflow']),
+      overflow: enumValue<TextOverflow>(TextOverflow.values, source, [...key, 'overflow']),
     );
   }