packages/design_system/lib/src/buttons/custom_text_button.dart

@@ -1,28 +1,27 @@
 import 'package:flutter/material.dart';
 
-class CustomTextButton extends StatelessWidget{
-
-  final onPressed;
+class CustomTextButton extends StatelessWidget {
+  final VoidCallback onPressed;
   final String text;
   final double size;
   final FontWeight weight;
   final Color? color;
 
-  @override
   const CustomTextButton({
     super.key,
     required this.onPressed,
     required this.text,
     this.size = 14,
     this.weight = FontWeight.normal,
-    this.color
+    this.color,
   });
 
   @override
   Widget build(BuildContext context) {
-    
     return TextButton(
-      style: ButtonStyle(padding: WidgetStatePropertyAll(EdgeInsets.zero)),
+      style: const ButtonStyle(
+        padding: WidgetStatePropertyAll<EdgeInsetsGeometry>(EdgeInsets.zero),
+      ),
       onPressed: onPressed,
       child: Text(
         text,
@@ -30,10 +29,10 @@ class CustomTextButton extends StatelessWidget{
           fontSize: size,
           fontWeight: weight,
           letterSpacing: 0,
-          color: color?? Color(0xFF4B4B4B),
-          decoration: TextDecoration.underline
+          color: color ?? const Color(0xFF4B4B4B),
+          decoration: TextDecoration.underline,
         ),
-      )
+      ),
     );
   }
-}
+}

packages/design_system/lib/src/buttons/primary_button.dart

@@ -1,9 +1,7 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class PrimaryButton extends StatelessWidget{
-  final onPressed;
+class PrimaryButton extends StatelessWidget {
+  final VoidCallback onPressed;
   final String text;
   final Color color;
   final double height;
@@ -12,7 +10,8 @@ class PrimaryButton extends StatelessWidget{
   final double radius;
   final double padding;
 
-  PrimaryButton({
+  const PrimaryButton({
+    super.key,
     required this.onPressed,
     required this.text,
     required this.color,
@@ -25,30 +24,35 @@ class PrimaryButton extends StatelessWidget{
 
   @override
   Widget build(BuildContext context) {
-
     return FilledButton(
       style: ButtonStyle(
         backgroundColor: WidgetStatePropertyAll<Color>(color),
-        padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: padding)),
-        shape: WidgetStatePropertyAll(RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(radius)),
-        )),
+        padding: WidgetStatePropertyAll<EdgeInsetsGeometry>(
+          EdgeInsets.symmetric(horizontal: padding),
+        ),
+        shape: WidgetStatePropertyAll<OutlinedBorder>(
+          RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(radius)),
+          ),
+        ),
       ),
       onPressed: onPressed,
       child: SizedBox(
         width: width,
         height: height,
-        child: Center(child: Text(
-          text,
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontSize: size,
-            fontWeight: FontWeight.w500,
-            letterSpacing: 0,
-            color: Colors.white//theme.getColorFor(ThemeCode.textSecondary)
-          )
-        ))
-      )
+        child: Center(
+          child: Text(
+            text,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: size,
+              fontWeight: FontWeight.w500,
+              letterSpacing: 0,
+              color: Colors.white, // theme.getColorFor(ThemeCode.textSecondary)
+            ),
+          ),
+        ),
+      ),
     );
   }
-}
+}

packages/design_system/lib/src/buttons/secondary_button.dart

@@ -1,10 +1,7 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class SecondaryButton extends StatelessWidget {
-
-  final onPressed;
+  final VoidCallback onPressed;
   final String? text;
   final IconData? icon;
   final String? label;
@@ -15,8 +12,8 @@ class SecondaryButton extends StatelessWidget {
   final double? width;
   final double? size;
 
-  @override
-  SecondaryButton({
+  const SecondaryButton({
+    super.key,
     required this.onPressed,
     this.text,
     this.icon,
@@ -31,37 +28,43 @@ class SecondaryButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-
     return OutlinedButton(
       style: ButtonStyle(
-        padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: padding)),
-        shape: WidgetStatePropertyAll(RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(radius)),
-          side: BorderSide(color: Color(0xFF4B4B4B))
-        )),
+        padding: WidgetStatePropertyAll(
+          EdgeInsets.symmetric(horizontal: padding),
+        ),
+        shape: WidgetStatePropertyAll(
+          RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(radius)),
+            side: BorderSide(color: Color(0xFF4B4B4B)),
+          ),
+        ),
       ),
       onPressed: onPressed,
       child: SizedBox(
         width: width,
         height: height,
-        child: Center(child: text!=null ? Text(
-          text!,
-          textAlign: TextAlign.center,
-          semanticsLabel: label,
-          style: TextStyle(
-            fontSize: size ?? 18,
-            fontWeight: FontWeight.w500,
-            letterSpacing: 0,
-            color: Color(0xFF4B4B4B)
-          )
-        ) : Icon(
-            icon,
-            semanticLabel: label,
-            size: size ?? 24,
-            color: color ?? Color(0xFF4B4B4B)
-        ))
-      )
+        child: Center(
+          child: text != null
+              ? Text(
+                  text!,
+                  textAlign: TextAlign.center,
+                  semanticsLabel: label,
+                  style: TextStyle(
+                    fontSize: size ?? 18,
+                    fontWeight: FontWeight.w500,
+                    letterSpacing: 0,
+                    color: Color(0xFF4B4B4B),
+                  ),
+                )
+              : Icon(
+                  icon,
+                  semanticLabel: label,
+                  size: size ?? 24,
+                  color: color ?? Color(0xFF4B4B4B),
+                ),
+        ),
+      ),
     );
   }
-
-}
+}

packages/design_system/lib/src/dropdowns/dropdown.dart

@@ -1,12 +1,10 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class CustomDropdown extends StatelessWidget{
+class CustomDropdown extends StatelessWidget {
   final List<Widget> items;
-  final values;
-  final onChanged;
-  final value;
+  final List<dynamic>? values;
+  final ValueChanged<dynamic> onChanged;
+  final dynamic value;
   final String? hint;
   final String? label;
   final double radius;
@@ -25,43 +23,54 @@ class CustomDropdown extends StatelessWidget{
     this.radius = 12,
     this.width = double.infinity,
     this.height = 70,
-    this.color
+    this.color,
   });
 
   @override
   Widget build(BuildContext context) {
-
     return Column(
       spacing: 8,
       children: [
-        if (label != null) Align(
-          alignment: Alignment.bottomLeft,
-          child: Text(
-            label!,
-            style: TextStyle(fontSize: 14, letterSpacing: 0),
+        if (label != null)
+          Align(
+            alignment: Alignment.bottomLeft,
+            child: Text(
+              label!,
+              style: const TextStyle(fontSize: 14, letterSpacing: 0),
+            ),
           ),
-        ),
         SizedBox(
           width: width,
           height: height,
-          child: Center(child: DropdownButtonFormField(
-            dropdownColor: Colors.white,
-            decoration: InputDecoration(
-              enabledBorder: OutlineInputBorder(
-                borderRadius: BorderRadius.all(Radius.circular(radius)),
-                borderSide: BorderSide(color: color??Color(0xFF4B4B4B))
-              )
+          child: Center(
+            child: DropdownButtonFormField<dynamic>(
+              dropdownColor: Colors.white,
+              decoration: InputDecoration(
+                enabledBorder: OutlineInputBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(radius)),
+                  borderSide: BorderSide(
+                    color: color ?? const Color(0xFF4B4B4B),
+                  ),
+                ),
+              ),
+              initialValue: value,
+              onChanged: onChanged,
+              hint: hint != null ? Text(hint!) : null,
+              items: List<DropdownMenuItem<dynamic>>.generate(items.length, (
+                int index,
+              ) {
+                final dynamic itemValue = values != null
+                    ? values![index]
+                    : index;
+                return DropdownMenuItem<dynamic>(
+                  value: itemValue,
+                  child: items[index],
+                );
+              }),
             ),
-            //underline: Container(),
-            initialValue: value,
-            onChanged: onChanged,
-            hint: Text(hint??""),
-            items: List<DropdownMenuItem>.generate(items.length, (int index){
-              return DropdownMenuItem(value: (values!=null)?values[index]:index, child: items[index]);
-            })
-          )),
-        )
+          ),
+        ),
       ],
-    ) ;
+    );
   }
-}
+}

packages/design_system/lib/src/inputs/textfields.dart

@@ -1,10 +1,8 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class CustomTextField extends StatefulWidget{
-  bool? showPassword;
+class CustomTextField extends StatefulWidget {
+  final bool? showPassword;
   final bool numeric;
   final String hint;
   final String label;
@@ -12,7 +10,7 @@ class CustomTextField extends StatefulWidget{
   final ValueChanged<String>? onChanged;
   final int? length;
 
-  CustomTextField({
+  const CustomTextField({
     super.key,
     this.showPassword,
     this.numeric = false,
@@ -27,57 +25,65 @@ class CustomTextField extends StatefulWidget{
   State<CustomTextField> createState() => CustomTextFieldState();
 }
 
-class CustomTextFieldState extends State<CustomTextField>{
+class CustomTextFieldState extends State<CustomTextField> {
+  late bool _showPassword;
+  @override
+  void initState() {
+    super.initState();
+    _showPassword = widget.showPassword ?? true;
+  }
 
   @override
   Widget build(BuildContext context) {
-
     return Column(
       spacing: 8,
       children: [
-          ?widget.label == '' ? null : Align(
-          alignment: Alignment.bottomLeft,
-          child: Text(
-            widget.label,
-            style: TextStyle(fontSize: 14, letterSpacing: 0),
-          )
-        ),
+        if (widget.label.isNotEmpty)
+          Align(
+            alignment: Alignment.bottomLeft,
+            child: Text(
+              widget.label,
+              style: const TextStyle(fontSize: 14, letterSpacing: 0),
+            ),
+          ),
         TextFormField(
-          keyboardType: widget.numeric? TextInputType.number : TextInputType.text,
-          obscureText: !(widget.showPassword ?? true),
-          enableSuggestions: widget.showPassword ?? true,
-          autocorrect: !(widget.showPassword ?? false),
-          style: TextStyle(color: Color(0xFF4B4B4B)),
-          inputFormatters: widget.numeric? [
-           FilteringTextInputFormatter.digitsOnly
-          ] : [],
+          keyboardType: widget.numeric
+              ? TextInputType.number
+              : TextInputType.text,
+          obscureText: !_showPassword,
+          enableSuggestions: _showPassword,
+          autocorrect: !_showPassword,
+          style: const TextStyle(color: Color(0xFF4B4B4B)),
+          inputFormatters: widget.numeric
+              ? <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly]
+              : const <TextInputFormatter>[],
           decoration: InputDecoration(
             counterText: "",
             hintText: widget.hint,
-            //labelText: widget.label,
-            //floatingLabelBehavior: FloatingLabelBehavior.always,
-            border: OutlineInputBorder(
+            border: const OutlineInputBorder(
               borderRadius: BorderRadius.all(Radius.circular(12)),
               borderSide: BorderSide(color: Color(0xFF4B4B4B)),
-              gapPadding: 16
+              gapPadding: 16,
             ),
-            suffixIcon: widget.showPassword!=null ? IconButton(
-              icon: Icon(widget.showPassword!
-              ? Icons.visibility_off
-                : Icons.visibility),
-              onPressed: () {
-                setState(() {
-                  widget.showPassword = !widget.showPassword!;
-                });
-              },
-            ) : null,
+            suffixIcon: widget.showPassword != null
+                ? IconButton(
+                    icon: Icon(
+                      _showPassword ? Icons.visibility_off : Icons.visibility,
+                    ),
+                    onPressed: () {
+                      setState(() {
+                        _showPassword = !_showPassword;
+                      });
+                    },
+                  )
+                : null,
           ),
           minLines: widget.lines ?? 1,
           maxLines: widget.lines ?? 1,
           maxLength: widget.length,
-          onChanged: widget.onChanged ?? (_)=>{},
-        )
+          onChanged: widget.onChanged,
+        ),
       ],
     );
   }
-}
+}

packages/design_system/lib/src/progress_bars/progress_bar.dart

@@ -1,8 +1,7 @@
 import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class ProgressBar extends ConsumerWidget{
+class ProgressBar extends StatelessWidget {
   final double max;
   final double value;
   final double height;
@@ -13,6 +12,7 @@ class ProgressBar extends ConsumerWidget{
   final Color textColor;
 
   const ProgressBar({
+    super.key,
     required this.max,
     required this.value,
     required this.height,
@@ -20,21 +20,19 @@ class ProgressBar extends ConsumerWidget{
     required this.textSecondarySize,
     required this.backgroundColor,
     required this.foregroundColor,
-    required this.textColor,}
-  );
+    required this.textColor,
+  });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-
-    return
-      Stack(
-        children: [
-          LinearProgressIndicator(
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        LinearProgressIndicator(
           value: value / max,
           minHeight: height,
           borderRadius: BorderRadius.all(Radius.circular(24)),
           color: foregroundColor,
-          backgroundColor: backgroundColor
+          backgroundColor: backgroundColor,
         ),
         FractionallySizedBox(
           widthFactor: value / max,
@@ -47,10 +45,10 @@ class ProgressBar extends ConsumerWidget{
                 secondarySize: textSecondarySize,
                 color: textColor,
               ),
-            )
+            ),
           ),
         ),
-      ]
+      ],
     );
   }
-}
+}

packages/design_system/lib/src/snackbars/snackbar.dart

@@ -1,32 +1,20 @@
-import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-enum MessageType {
-  info,
-  error,
-  warning,
-  success
-}
+enum MessageType { info, error, warning, success }
 
-class CustomSnackBar extends StatelessWidget{
+class CustomSnackBar extends StatelessWidget {
   final MessageType? type;
   final String message;
 
-  const CustomSnackBar({
-    super.key,
-    this.type,
-    required this.message,
-  });
+  const CustomSnackBar({super.key, this.type, required this.message});
 
   @override
   SnackBar build(BuildContext context) {
-    
     late final Color foregroundColor;
     late final Color backgroundColor;
     late final IconData icon;
 
-    switch (type??MessageType.info){
+    switch (type ?? MessageType.info) {
       case MessageType.info:
         backgroundColor = Color(0xFFE3EFFD);
         foregroundColor = Color(0xFF1F4ECF);
@@ -50,15 +38,20 @@ class CustomSnackBar extends StatelessWidget{
       backgroundColor: backgroundColor,
       shape: RoundedRectangleBorder(
         side: BorderSide(color: foregroundColor, width: 1),
-        borderRadius: BorderRadius.all(Radius.circular(10))
+        borderRadius: BorderRadius.all(Radius.circular(10)),
       ),
       content: Row(
         spacing: 8,
         children: [
           Icon(icon, color: foregroundColor),
-          Expanded(child: Text(message, style: TextStyle(color: Color(0xFF4B4B4B), fontSize: 14)))
-         ],
-       ),
+          Expanded(
+            child: Text(
+              message,
+              style: TextStyle(color: Color(0xFF4B4B4B), fontSize: 14),
+            ),
+          ),
+        ],
+      ),
     );
   }
-}
+}

packages/design_system/test/widget_test.dart

@@ -7,195 +7,455 @@ void main() {
   themePackages();
 
   testGoldens('Step Indicator', (tester) async {
-    final widget = (int step)=>StepIndicator(total: 3, current: step, color: Colors.blueAccent);
+    StepIndicator stepIndicator(int step) =>
+        StepIndicator(total: 3, current: step, color: Colors.blueAccent);
+
     final builder = GoldenBuilder.column()
-      ..addScenario('step -1', widget(-1))
-      ..addScenario('step 0', widget(0))
-      ..addScenario('step 1', widget(1))
-      ..addScenario('step 2', widget(2))
-      ..addScenario('step 3', widget(3))
-      ..addScenario('step 4', widget(4));
+      ..addScenario('step -1', stepIndicator(-1))
+      ..addScenario('step 0', stepIndicator(0))
+      ..addScenario('step 1', stepIndicator(1))
+      ..addScenario('step 2', stepIndicator(2))
+      ..addScenario('step 3', stepIndicator(3))
+      ..addScenario('step 4', stepIndicator(4));
+
     await tester.pumpWidgetBuilder(builder.build());
     await screenMatchesGolden(tester, 'step_indicator');
   });
 
   testGoldens('Progress Bar - Small', (tester) async {
-    final widget = (double value, double max) => ProgressBar(max: max, value: value, height: 24, textSize: 16, textSecondarySize: 12, backgroundColor: Colors.blueGrey, foregroundColor: Colors.blueAccent, textColor: Colors.black87);
+    ProgressBar progressBar(double value, double max) => ProgressBar(
+      max: max,
+      value: value,
+      height: 24,
+      textSize: 16,
+      textSecondarySize: 12,
+      backgroundColor: Colors.blueGrey,
+      foregroundColor: Colors.blueAccent,
+      textColor: Colors.black87,
+    );
 
     final builder = GoldenBuilder.column()
-      ..addScenario('full', widget(100, 100))
-      ..addScenario('empty', widget(0, 100))
-      ..addScenario('half', widget(75, 150))
-      ..addScenario('overflowing', widget(200, 150))
-    //..addScenario('negative', widget(-20, 83))
-      ..addScenario('tiny value', widget(2.15, 150));
+      ..addScenario('full', progressBar(100, 100))
+      ..addScenario('empty', progressBar(0, 100))
+      ..addScenario('half', progressBar(75, 150))
+      ..addScenario('overflowing', progressBar(200, 150))
+      // ..addScenario('negative', progressBar(-20, 83))
+      ..addScenario('tiny value', progressBar(2.15, 150));
+
     await tester.pumpWidgetBuilder(builder.build());
     await screenMatchesGolden(tester, 'progress_bar_small');
   });
 
   testGoldens('Progress Bar - Large', (tester) async {
-    final widget = (double value, double max) => ProgressBar(max: max, value: value, height: 83, textSize: 40, textSecondarySize: 24, backgroundColor: Colors.blueGrey, foregroundColor: Colors.blueAccent, textColor: Colors.black87);
+    ProgressBar progressBar(double value, double max) => ProgressBar(
+      max: max,
+      value: value,
+      height: 83,
+      textSize: 40,
+      textSecondarySize: 24,
+      backgroundColor: Colors.blueGrey,
+      foregroundColor: Colors.blueAccent,
+      textColor: Colors.black87,
+    );
 
     final builder = GoldenBuilder.grid(columns: 3, widthToHeightRatio: 1)
-      ..addScenario('full', widget(100, 100))
-      ..addScenario('empty', widget(0, 100))
-      ..addScenario('half', widget(75, 150))
-      ..addScenario('overflowing', widget(200, 150))
-      ..addScenario('tiny value', widget(2.15, 150));
+      ..addScenario('full', progressBar(100, 100))
+      ..addScenario('empty', progressBar(0, 100))
+      ..addScenario('half', progressBar(75, 150))
+      ..addScenario('overflowing', progressBar(200, 150))
+      ..addScenario('tiny value', progressBar(2.15, 150));
+
     await tester.pumpWidgetBuilder(builder.build());
     await screenMatchesGolden(tester, 'progress_bar_large');
   });
 
   testGoldens('Text Field', (tester) async {
-
     final builder = GoldenBuilder.grid(columns: 3, widthToHeightRatio: 1)
-      ..addScenario('basic', SizedBox(height: 70, width: 250, child: CustomTextField()))
-      ..addScenario('hint', SizedBox(height: 70, width: 250, child: CustomTextField(hint: "type something")))
-      ..addScenario('label', SizedBox(height: 100, width: 250, child: CustomTextField(hint: "type something", label: "text input")))
-      ..addScenario('numeric', SizedBox(height: 70, width: 250, child: CustomTextField(numeric: true)))
-      ..addScenario('password', SizedBox(height: 70, width: 250, child: CustomTextField(showPassword: false)))
-      ..addScenario('multiline', SizedBox(height: 200, width: 250, child: CustomTextField(lines: 4)));
+      ..addScenario(
+        'basic',
+        SizedBox(height: 70, width: 250, child: CustomTextField()),
+      )
+      ..addScenario(
+        'hint',
+        SizedBox(
+          height: 70,
+          width: 250,
+          child: CustomTextField(hint: "type something"),
+        ),
+      )
+      ..addScenario(
+        'label',
+        SizedBox(
+          height: 100,
+          width: 250,
+          child: CustomTextField(hint: "type something", label: "text input"),
+        ),
+      )
+      ..addScenario(
+        'numeric',
+        SizedBox(height: 70, width: 250, child: CustomTextField(numeric: true)),
+      )
+      ..addScenario(
+        'password',
+        SizedBox(
+          height: 70,
+          width: 250,
+          child: CustomTextField(showPassword: false),
+        ),
+      )
+      ..addScenario(
+        'multiline',
+        SizedBox(height: 200, width: 250, child: CustomTextField(lines: 4)),
+      );
 
     await tester.pumpWidgetBuilder(builder.build());
     await screenMatchesGolden(tester, 'textfield');
   });
 
   testGoldens('Primary Button', (tester) async {
-    final widget = ({onPressed, text}) => SizedBox(
-        height: 70, width: 250,
-        child:PrimaryButton(onPressed: onPressed, text: text, color: Colors.blueAccent)
-    );
+    const double buttonHeight = 70;
+    const double buttonWidth = 250;
 
     final builder = GoldenBuilder.grid(columns: 2, widthToHeightRatio: 1)
-      ..addScenario('empty', SizedBox(height: 70, width: 250, child: PrimaryButton(onPressed: ()=>{}, text: "", color: Colors.blueAccent)))
-      ..addScenario('basic', SizedBox(height: 70, width: 250, child: PrimaryButton(onPressed: ()=>{}, text: "press me", color: Colors.blueAccent)))
-      ..addScenario('round', SizedBox(height: 70, width: 250, child: PrimaryButton(onPressed: ()=>{}, radius: 100, text: "press me", color: Colors.blueAccent)))
-      ..addScenario('small', SizedBox(height: 70, width: 250, child: PrimaryButton(onPressed: ()=>{}, width: 100, text: "press me", color: Colors.blueAccent)));
+      ..addScenario(
+        'empty',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: PrimaryButton(
+            onPressed: () {},
+            text: "",
+            color: Colors.blueAccent,
+          ),
+        ),
+      )
+      ..addScenario(
+        'basic',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: PrimaryButton(
+            onPressed: () {},
+            text: "press me",
+            color: Colors.blueAccent,
+          ),
+        ),
+      )
+      ..addScenario(
+        'round',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: PrimaryButton(
+            onPressed: () {},
+            radius: 100,
+            text: "press me",
+            color: Colors.blueAccent,
+          ),
+        ),
+      )
+      ..addScenario(
+        'small',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: PrimaryButton(
+            onPressed: () {},
+            width: 100,
+            text: "press me",
+            color: Colors.blueAccent,
+          ),
+        ),
+      );
 
     await tester.pumpWidgetBuilder(builder.build());
-
     await screenMatchesGolden(tester, 'primary_button');
   });
 
   testGoldens('Text Button', (tester) async {
-    final tapTarget = Key("tap-target");
+    const tapTarget = Key("tap-target");
 
     final builder = GoldenBuilder.column()
-      ..addScenario('empty', CustomTextButton(onPressed: ()=>{}, text: ""))
-      ..addScenario('basic', CustomTextButton(onPressed: ()=>{}, text: "press me"))
-      ..addScenario('tapped', CustomTextButton(onPressed: ()=>{}, text: "press me", key: tapTarget))
-      ..addScenario('large text', CustomTextButton(onPressed: ()=>{}, text: "press me", size: 40, weight: FontWeight.w500))
-      ..addScenario('small text', CustomTextButton(onPressed: ()=>{}, text: "press me", size: 10))
-      ..addScenario('colored', CustomTextButton(onPressed: ()=>{}, text: "press me", color: Colors.blueAccent));
+      ..addScenario('empty', CustomTextButton(onPressed: () {}, text: ""))
+      ..addScenario(
+        'basic',
+        CustomTextButton(onPressed: () {}, text: "press me"),
+      )
+      ..addScenario(
+        'tapped',
+        CustomTextButton(onPressed: () {}, text: "press me", key: tapTarget),
+      )
+      ..addScenario(
+        'large text',
+        CustomTextButton(
+          onPressed: () {},
+          text: "press me",
+          size: 40,
+          weight: FontWeight.w500,
+        ),
+      )
+      ..addScenario(
+        'small text',
+        CustomTextButton(onPressed: () {}, text: "press me", size: 10),
+      )
+      ..addScenario(
+        'colored',
+        CustomTextButton(
+          onPressed: () {},
+          text: "press me",
+          color: Colors.blueAccent,
+        ),
+      );
+
     await tester.pumpWidgetBuilder(builder.build());
     await tester.tap(find.byKey(tapTarget));
-    await tester.pump();
+    await tester.pumpAndSettle();
     await screenMatchesGolden(tester, 'text_button');
   });
 
   testGoldens('Money Text', (tester) async {
     final builder = GoldenBuilder.column()
-      ..addScenario('basic', MoneyText(text: "29.13€", size: 20, color: Colors.blueAccent))
-      ..addScenario('without cents', MoneyText(text: "50€", size: 20, color: Colors.blueAccent))
-      ..addScenario('different sizes', MoneyText(text: "29.13€", size: 30, secondarySize: 15, color: Colors.blueAccent))
-      ..addScenario('different sizes without cents', MoneyText(text: "50€", size: 30, secondarySize: 15, color: Colors.blueAccent));
+      ..addScenario(
+        'basic',
+        MoneyText(text: "29.13€", size: 20, color: Colors.blueAccent),
+      )
+      ..addScenario(
+        'without cents',
+        MoneyText(text: "50€", size: 20, color: Colors.blueAccent),
+      )
+      ..addScenario(
+        'different sizes',
+        MoneyText(
+          text: "29.13€",
+          size: 30,
+          secondarySize: 15,
+          color: Colors.blueAccent,
+        ),
+      )
+      ..addScenario(
+        'different sizes without cents',
+        MoneyText(
+          text: "50€",
+          size: 30,
+          secondarySize: 15,
+          color: Colors.blueAccent,
+        ),
+      );
 
     await tester.pumpWidgetBuilder(builder.build());
-
     await screenMatchesGolden(tester, 'money_text');
   });
 
   testGoldens('Secondary Button', (tester) async {
-    final widget = ({onPressed, text}) => SizedBox(
-        height: 70, width: 250,
-        child:SecondaryButton(onPressed: onPressed, text: text)
-    );
+    const double buttonHeight = 70;
+    const double buttonWidth = 250;
 
     final builder = GoldenBuilder.grid(columns: 3, widthToHeightRatio: 1)
-      ..addScenario('empty', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, text: "")))
-      ..addScenario('text', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, text: "press me")))
-      ..addScenario('icon', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, icon: Icons.account_circle_outlined)))
-      ..addScenario('colored', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, text: "press me", color: Colors.blueAccent,)))
-      ..addScenario('small', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, width: 100, text: "press me")))
-      ..addScenario('round', SizedBox(height: 70, width: 250, child:SecondaryButton(onPressed: ()=>{}, radius: 100, text: "press me", color: Colors.blueAccent,)));
+      ..addScenario(
+        'empty',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(onPressed: () {}, text: ""),
+        ),
+      )
+      ..addScenario(
+        'text',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(onPressed: () {}, text: "press me"),
+        ),
+      )
+      ..addScenario(
+        'icon',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(
+            onPressed: () {},
+            icon: Icons.account_circle_outlined,
+          ),
+        ),
+      )
+      ..addScenario(
+        'colored',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(
+            onPressed: () {},
+            text: "press me",
+            color: Colors.blueAccent,
+          ),
+        ),
+      )
+      ..addScenario(
+        'small',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(
+            onPressed: () {},
+            width: 100,
+            text: "press me",
+          ),
+        ),
+      )
+      ..addScenario(
+        'round',
+        SizedBox(
+          height: buttonHeight,
+          width: buttonWidth,
+          child: SecondaryButton(
+            onPressed: () {},
+            radius: 100,
+            text: "press me",
+            color: Colors.blueAccent,
+          ),
+        ),
+      );
 
     await tester.pumpWidgetBuilder(builder.build());
-
     await screenMatchesGolden(tester, 'secondary_button');
   });
 
-  final snackbarTest = ({message, type, testName}) {
+  void snackbarTest({
+    required String message,
+    required MessageType? type,
+    required String testName,
+  }) {
     testGoldens('Snackbar $testName', (tester) async {
       const Key tapTarget = Key('tap-target');
 
-      final widget = () =>
-        SizedBox(
-          width: 800,
-          height: 600,
-          child: MaterialApp(
-            home: Scaffold(
-              body: Builder(
-                builder: (BuildContext context) {
-                  return GestureDetector(
-                    onTap: () {
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        CustomSnackBar(
-                          message: message,
-                          type: type,
-                        ).build(context)
-                      );
-                    },
-                    behavior: HitTestBehavior.opaque,
-                    key: tapTarget,
-                  );
-                }
-              ),
+      SizedBox buildScaffold() => SizedBox(
+        width: 800,
+        height: 600,
+        child: MaterialApp(
+          home: Scaffold(
+            body: Builder(
+              builder: (BuildContext context) {
+                return GestureDetector(
+                  onTap: () {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      CustomSnackBar(
+                        message: message,
+                        type: type,
+                      ).build(context),
+                    );
+                  },
+                  behavior: HitTestBehavior.opaque,
+                  key: tapTarget,
+                );
+              },
             ),
           ),
-        );
+        ),
+      );
 
       final builder = DeviceBuilder()
-        ..overrideDevicesForAllScenarios(devices: [
-          Device(size: Size(750, 550), name: 'base')
-        ])
-        ..addScenario(name: testName, widget: widget());
+        ..overrideDevicesForAllScenarios(
+          devices: const [Device(size: Size(750, 550), name: 'base')],
+        )
+        ..addScenario(name: testName, widget: buildScaffold());
 
       await tester.pumpWidgetBuilder(builder.build());
       await tester.tap(find.byKey(tapTarget));
+      await tester.pumpAndSettle();
 
       await screenMatchesGolden(tester, 'snackbar/$testName');
     });
-  };
+  }
 
-  final shortText = "Mensaje de prueba";
-  final longText = "Mensaje de prueba largo para comprobar los casos en los que el texto ocupa varias líneas";
+  const shortText = "Mensaje de prueba";
+  const longText =
+      "Mensaje de prueba largo para comprobar los casos en los que el texto ocupa varias líneas";
 
   snackbarTest(message: "", type: null, testName: "default_empty");
   snackbarTest(message: shortText, type: null, testName: "default");
   snackbarTest(message: longText, type: null, testName: "default_long_text");
   snackbarTest(message: "", type: MessageType.info, testName: "info_empty");
   snackbarTest(message: shortText, type: MessageType.info, testName: "info");
-  snackbarTest(message: longText, type: MessageType.info, testName: "info_long_text");
-  snackbarTest(message: "", type: MessageType.success, testName: "success_empty");
-  snackbarTest(message: shortText, type: MessageType.success, testName: "success");
-  snackbarTest(message: longText, type: MessageType.success, testName: "success_long_text");
-  snackbarTest(message: "", type: MessageType.warning, testName: "warning_empty");
-  snackbarTest(message: shortText, type: MessageType.warning, testName: "warning");
-  snackbarTest(message: longText, type: MessageType.warning, testName: "warning_long_text");
+  snackbarTest(
+    message: longText,
+    type: MessageType.info,
+    testName: "info_long_text",
+  );
+  snackbarTest(
+    message: "",
+    type: MessageType.success,
+    testName: "success_empty",
+  );
+  snackbarTest(
+    message: shortText,
+    type: MessageType.success,
+    testName: "success",
+  );
+  snackbarTest(
+    message: longText,
+    type: MessageType.success,
+    testName: "success_long_text",
+  );
+  snackbarTest(
+    message: "",
+    type: MessageType.warning,
+    testName: "warning_empty",
+  );
+  snackbarTest(
+    message: shortText,
+    type: MessageType.warning,
+    testName: "warning",
+  );
+  snackbarTest(
+    message: longText,
+    type: MessageType.warning,
+    testName: "warning_long_text",
+  );
   snackbarTest(message: "", type: MessageType.error, testName: "error_empty");
   snackbarTest(message: shortText, type: MessageType.error, testName: "error");
-  snackbarTest(message: longText, type: MessageType.error, testName: "error_long_text");
+  snackbarTest(
+    message: longText,
+    type: MessageType.error,
+    testName: "error_long_text",
+  );
 
   testGoldens('Dropdown', (tester) async {
-    final List<Widget> emptyList = [];
-    final List<Widget> shortList = [Text("A"), Text("B"), Text("C")];
+    const List<Widget> emptyList = [];
+    const List<Widget> shortList = [Text("A"), Text("B"), Text("C")];
 
     final builder = GoldenBuilder.column()
-      ..addScenario('empty', CustomDropdown(items: emptyList, onChanged: (_)=>{}, width: 200))
-      ..addScenario('initial value', CustomDropdown(items: shortList, value: 1, onChanged: (_)=>{}, width: 300))
-      ..addScenario('hint', CustomDropdown(items: shortList, hint: "choose an option", onChanged: (_)=>{}))
-      ..addScenario('label', CustomDropdown(items: shortList, label: "select", onChanged: (_)=>{}, width: 200));
+      ..addScenario(
+        'empty',
+        CustomDropdown(items: emptyList, onChanged: (_) {}, width: 200),
+      )
+      ..addScenario(
+        'initial value',
+        CustomDropdown(
+          items: shortList,
+          value: 1,
+          onChanged: (_) {},
+          width: 300,
+        ),
+      )
+      ..addScenario(
+        'hint',
+        CustomDropdown(
+          items: shortList,
+          hint: "choose an option",
+          onChanged: (_) {},
+        ),
+      )
+      ..addScenario(
+        'label',
+        CustomDropdown(
+          items: shortList,
+          label: "select",
+          onChanged: (_) {},
+          width: 200,
+        ),
+      );
+
     await tester.pumpWidgetBuilder(builder.build());
     await screenMatchesGolden(tester, 'dropdown');
   });
-}
+}