Merge remote-tracking branch 'upstream/master'

lib/pages/widgets/local_text.dart

@@ -7,9 +7,9 @@ import 'package:fcs/helpers/theme.dart';
 class LocalText extends Text {
   final BuildContext context;
   LocalText(this.context, String translationKey,
-      {Color? color,
-      double? fontSize,
-      FontWeight? fontWeight,
+      {Color color = secondaryColor,
+      double fontSize = 13,
+      FontWeight fontWeight = FontWeight.w500,
       List<String>? translationVariables,
       String? text,
       bool underline = false})
@@ -19,14 +19,14 @@ class LocalText extends Text {
                     translationVariables: translationVariables),
             style: Provider.of<LanguageModel>(context, listen: false).isEng
                 ? newLabelStyle(
-                    color: color!,
-                    fontSize: fontSize!,
-                    fontWeight: fontWeight!,
+                    color: color,
+                    fontSize: fontSize,
+                    fontWeight: fontWeight,
                     underline: underline)
                 : newLabelStyleMM(
-                    color: color!,
-                    fontSize: fontSize!,
-                    fontWeight: fontWeight!,
+                    color: color,
+                    fontSize: fontSize,
+                    fontWeight: fontWeight,
                     underline: underline));
 }