code formatted

Author: Sandip Kakadiya

analysis_options.yaml

@@ -14,8 +14,7 @@ linter:
     # - always_put_required_named_parameters_first
     - always_require_non_null_named_parameters
     # - annotate_overrides
-    # required to Allow both GFColors and Colors
-    # - avoid_annotating_with_dynamic
+    - avoid_annotating_with_dynamic
     - avoid_as
     - avoid_bool_literals_in_conditional_expressions
     - avoid_catches_without_on_clauses

lib/components/badge/gf_badge.dart

@@ -27,7 +27,7 @@ class GFBadge extends StatefulWidget {
   final GFBadgeShape shape;
 
   /// Pass [GFColors] or [Color]
-  final dynamic color;
+  final Color color;
 
   /// size of [double] or [GFSize] i.e, 1.2, small, medium, large etc.
   final double size;
@@ -42,7 +42,7 @@ class GFBadge extends StatefulWidget {
   final TextStyle textStyle;
 
   /// Pass [GFColors] or [Color]
-  final dynamic textColor;
+  final Color textColor;
 
   @override
   _GFBadgeState createState() => _GFBadgeState();

lib/components/drawer/gf_drawer.dart

@@ -107,7 +107,7 @@ class GFDrawer extends StatelessWidget {
   final Gradient gradient;
 
   /// Defines the background color of the drawer
-  final dynamic color;
+  final Color color;
 
   @override
   Widget build(BuildContext context) {

lib/components/drawer/gf_drawer_header.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:getflutter/components/button/gf_icon_button.dart';
 import 'package:getflutter/getflutter.dart';
 
 class GFDrawerHeaderPictures extends StatelessWidget {

lib/components/loader/gf_loader.dart

@@ -23,13 +23,13 @@ class GFLoader extends StatefulWidget {
   final Widget child;
 
   /// Type of GFColor or [Color] which defines the color of the first dot in only  circle or square type of loader
-  final dynamic loaderColorOne;
+  final Color loaderColorOne;
 
   /// Type of GFColor or [Color] which defines the color of the second dot in only  circle or square type of loader
-  final dynamic loaderColorTwo;
+  final Color loaderColorTwo;
 
   /// Type of GFColor or [Color] which defines the color of the third dot in only  circle or square type of loader
-  final dynamic loaderColorThree;
+  final Color loaderColorThree;
 
   /// Type of duration which defines the animation duration of the loader only in circle and square type of loader
   final Duration duration;

lib/components/typography/gf_typography.dart

@@ -99,15 +99,17 @@ class GFTypography extends StatelessWidget {
               text != null
                   ? Expanded(
                       child: Text(
-                      text,
-                      style: TextStyle(
-                          color: textColor ?? backgroundImage != null
-                              ? Colors.white
-                              : Colors.black,
-                          fontSize: fontSize,
-                          letterSpacing: 0.3,
-                          fontWeight: FontWeight.w500),
-                    ))
+                        text,
+                        style: TextStyle(
+                            color: textColor ??
+                                (backgroundImage != null
+                                    ? Colors.white
+                                    : Colors.black),
+                            fontSize: fontSize,
+                            letterSpacing: 0.3,
+                            fontWeight: FontWeight.w500),
+                      ),
+                    )
                   : child
             ],
           ),
@@ -119,9 +121,10 @@ class GFTypography extends StatelessWidget {
                     width: dividerWidth != null ? dividerWidth : 70,
                     height: fontSize / 5,
                     decoration: BoxDecoration(
-                      color: dividerColor ?? backgroundImage != null
-                          ? Colors.white
-                          : Colors.black,
+                      color: dividerColor ??
+                          (backgroundImage != null
+                              ? Colors.white
+                              : Colors.black),
                       borderRadius: dividerBorderRadius ??
                           const BorderRadius.all(
                             Radius.circular(5),