GFColor changes in button, listtile, rating

Author: Sandip Kakadiya

lib/components/button/gf_icon_button.dart

@@ -23,7 +23,7 @@ class GFIconButton extends StatefulWidget {
     this.tooltip,
     this.type = GFButtonType.solid,
     this.shape = GFIconButtonShape.standard,
-    this.color = GFColor.primary,
+    this.color = GFColors.PRIMARY,
     this.borderShape,
     this.boxShadow,
     this.size = GFSize.MEDIUM,
@@ -60,17 +60,17 @@ class GFIconButton extends StatefulWidget {
   /// Button type of [GFIconButtonShape] i.e, standard, pills, square, shadow, icons
   final GFIconButtonShape shape;
 
-  /// Pass [GFColor] or [Color]
-  final dynamic color;
+  /// Pass [GFColors] or [Color]
+  final Color color;
 
-  /// Pass [GFColor] or [Color]. The primary color of the button when the button is in the down (pressed) state.
-  final dynamic splashColor;
+  /// Pass [GFColors] or [Color]. The primary color of the button when the button is in the down (pressed) state.
+  final Color splashColor;
 
-  /// Pass [GFColor] or [Color]. The secondary color of the button when the button is in the down (pressed) state.
-  final dynamic highlightColor;
+  /// Pass [GFColors] or [Color]. The secondary color of the button when the button is in the down (pressed) state.
+  final Color highlightColor;
 
-  /// Pass [GFColor] or [Color]. The color to use for the icon inside the button, if the icon is disabled.
-  final dynamic disabledColor;
+  /// Pass [GFColors] or [Color]. The color to use for the icon inside the button, if the icon is disabled.
+  final Color disabledColor;
 
   /// The callback that is called when the button is tapped or otherwise activated.
   final VoidCallback onPressed;
@@ -115,7 +115,7 @@ class _GFIconButtonState extends State<GFIconButton> {
 
   @override
   void initState() {
-    color = GFColors.getGFColor(widget.color);
+    color = widget.color;
     onPressed = widget.onPressed;
     type = widget.type;
     shape = widget.shape;
@@ -162,16 +162,12 @@ class _GFIconButtonState extends State<GFIconButton> {
         widget.type == GFButtonType.outline ||
         widget.type == GFButtonType.outline2x) {
       return widget.onPressed != null
-          ? color == GFColors.getGFColor(GFColor.transparent)
-              ? GFColors.getGFColor(GFColor.dark)
-              : color
+          ? color == GFColors.TRANSPARENT ? GFColors.DARK : color
           : color.withOpacity(0.48);
-    } else if (color == GFColors.getGFColor(GFColor.transparent)) {
-      return widget.onPressed != null
-          ? GFColors.getGFColor(GFColor.dark)
-          : GFColors.getGFColor(GFColor.white);
+    } else if (color == GFColors.TRANSPARENT) {
+      return widget.onPressed != null ? GFColors.DARK : GFColors.WHITE;
     } else {
-      return GFColors.getGFColor(GFColor.white);
+      return GFColors.WHITE;
     }
   }
 
@@ -193,12 +189,11 @@ class _GFIconButtonState extends State<GFIconButton> {
     final BorderSide shapeBorder = widget.type == GFButtonType.outline ||
             widget.type == GFButtonType.outline2x
         ? outlineBorder
-        : widget.borderSide != null
-            ? widget.borderSide
-            : BorderSide(
-                color: color,
-                width: 0,
-              );
+        : widget.borderSide ??
+            BorderSide(
+              color: color,
+              width: 0,
+            );
 
     ShapeBorder shapeBorderType;
 
@@ -288,14 +283,13 @@ class _GFIconButtonState extends State<GFIconButton> {
                         spreadRadius: 2,
                         offset: Offset.zero,
                       )
-                    : widget.boxShadow != null
-                        ? widget.boxShadow
-                        : BoxShadow(
-                            color: Theme.of(context).canvasColor,
-                            blurRadius: 0,
-                            spreadRadius: 0,
-                            offset: Offset.zero,
-                          )
+                    : widget.boxShadow ??
+                        BoxShadow(
+                          color: Theme.of(context).canvasColor,
+                          blurRadius: 0,
+                          spreadRadius: 0,
+                          offset: Offset.zero,
+                        )
               ]);
         }
       }
@@ -321,9 +315,7 @@ class _GFIconButtonState extends State<GFIconButton> {
             child: Material(
               shape: widget.type == GFButtonType.transparent
                   ? null
-                  : widget.borderShape == null
-                      ? shapeBorderType
-                      : widget.borderShape,
+                  : widget.borderShape ?? shapeBorderType,
               color: widget.onPressed != null
                   ? getColor()
                   : getDisabledFillColor(),
@@ -333,18 +325,12 @@ class _GFIconButtonState extends State<GFIconButton> {
               child: InkResponse(
                 onTap: widget.onPressed,
                 child: result,
-                focusColor: widget.focusColor != null
-                    ? GFColors.getGFColor(widget.focusColor)
-                    : Theme.of(context).focusColor,
-                hoverColor: widget.hoverColor != null
-                    ? GFColors.getGFColor(widget.hoverColor)
-                    : Theme.of(context).hoverColor,
-                highlightColor: widget.highlightColor != null
-                    ? GFColors.getGFColor(widget.highlightColor)
-                    : Theme.of(context).highlightColor,
-                splashColor: widget.splashColor != null
-                    ? GFColors.getGFColor(widget.splashColor)
-                    : Theme.of(context).splashColor,
+                focusColor: widget.focusColor ?? Theme.of(context).focusColor,
+                hoverColor: widget.hoverColor ?? Theme.of(context).hoverColor,
+                highlightColor:
+                    widget.highlightColor ?? Theme.of(context).highlightColor,
+                splashColor:
+                    widget.splashColor ?? Theme.of(context).splashColor,
                 radius: math.max(
                     Material.defaultSplashRadius,
                     (widget.iconSize +

lib/components/button/gf_social_button.dart

@@ -33,7 +33,7 @@ class GFSocialButton extends GFButton {
     this.child,
     this.type = GFButtonType.solid,
     this.shape = GFButtonShape.standard,
-    this.color = GFColor.primary,
+    this.color = GFColors.PRIMARY,
     this.textColor,
     this.position = GFPosition.start,
     this.size = GFSize.MEDIUM,
@@ -79,17 +79,17 @@ class GFSocialButton extends GFButton {
   /// The box shadow for the button's [Material], if GFButtonType is solid
   final BoxShadow boxShadow;
 
-  /// Pass [GFColor] or [Color]. The color for the button's [Material] when it has the input focus.
-  final dynamic focusColor;
+  /// Pass [GFColors] or [Color]. The color for the button's [Material] when it has the input focus.
+  final Color focusColor;
 
-  /// Pass [GFColor] or [Color]. The color for the button's [Material] when a pointer is hovering over it.
-  final dynamic hoverColor;
+  /// Pass [GFColors] or [Color]. The color for the button's [Material] when a pointer is hovering over it.
+  final Color hoverColor;
 
-  /// Pass [GFColor] or [Color]. The highlight color for the button's [InkWell].
-  final dynamic highlightColor;
+  /// Pass [GFColors] or [Color]. The highlight color for the button's [InkWell].
+  final Color highlightColor;
 
-  /// Pass [GFColor] or [Color]. The splash color for the button's [InkWell].
-  final dynamic splashColor;
+  /// Pass [GFColors] or [Color]. The splash color for the button's [InkWell].
+  final Color splashColor;
 
   /// The elevation for the button's [Material] when the button is [enabled] but not pressed.
   final double elevation;
@@ -142,8 +142,8 @@ class GFSocialButton extends GFButton {
   /// Button type of GFSocialButtonShape i.e, standard, pills, square, shadow, icons
   final GFButtonShape shape;
 
-  /// Pass [GFColor] or [Color]
-  final dynamic color;
+  /// Pass [GFColors] or [Color]
+  final Color color;
 
   /// The fill color of the button when the button is disabled.
   ///
@@ -153,10 +153,10 @@ class GFSocialButton extends GFButton {
   /// See also:
   ///
   ///  * [color] - the fill color of the button when the button is [enabled].
-  final dynamic disabledColor;
+  final Color disabledColor;
 
-  /// Pass [GFColor] or [Color]
-  final dynamic textColor;
+  /// Pass [GFColors] or [Color]
+  final Color textColor;
 
   /// The color to use for this button's text when the button is disabled.
   ///
@@ -172,7 +172,7 @@ class GFSocialButton extends GFButton {
   /// See also:
   ///
   ///  * [textColor] - The color to use for this button's text when the button is [enabled].
-  final dynamic disabledTextColor;
+  final Color disabledTextColor;
 
   /// size of [double] or [GFSize] i.e, 1.2, small, medium, large etc.
   final double size;
@@ -250,7 +250,7 @@ class GFSocialButton extends GFButton {
         child: child,
         type: GFButtonType.solid,
         shape: GFButtonShape.standard,
-        color: GFColor.primary,
+        color: GFColors.PRIMARY,
         textColor: textColor,
         position: GFPosition.start,
         size: size,

lib/components/list_tile/gf_list_tile.dart

@@ -23,8 +23,8 @@ class GFListTile extends StatelessWidget {
   ///type of [String] used to pass text, alternative to subtitle property and gets higher priority than subtitle
   final String subtitleText;
 
-  /// The GFListTile's background color. Can be given [Color] or [GFColor]
-  final dynamic color;
+  /// The GFListTile's background color. Can be given [Color] or [GFColors]
+  final Color color;
 
   /// type of [Widget] or [GFAvatar] used to create rounded user profile
   final Widget avatar;
@@ -68,7 +68,7 @@ class GFListTile extends StatelessWidget {
                             style: TextStyle(
                                 fontSize: 17,
                                 fontWeight: FontWeight.w500,
-                                color: GFColors.getGFColor(GFColor.dark)),
+                                color: GFColors.DARK),
                           )
                         : title ?? Container(),
                     subtitleText != null

lib/components/rating/gf_rating.dart

@@ -28,10 +28,10 @@ class GFRating extends StatefulWidget {
   final int itemCount;
 
   /// defines the color of items
-  final dynamic color;
+  final Color color;
 
   /// defines the border color of [halfFilledIcon]
-  final dynamic borderColor;
+  final Color borderColor;
 
   /// defines the size of items. GFSize can be used for size variations like small. medium. large
   final double size;
@@ -86,8 +86,7 @@ class _GFRatingState extends State<GFRating> {
       icon = widget.defaultIcon ??
           Icon(
             Icons.star_border,
-            color: GFColors.getGFColor(widget.borderColor) ??
-                Theme.of(context).primaryColor,
+            color: widget.borderColor ?? Theme.of(context).primaryColor,
             size: widget.size,
           );
     } else if (!widget.showTextForm
@@ -97,16 +96,14 @@ class _GFRatingState extends State<GFRating> {
       icon = widget.halfFilledIcon ??
           Icon(
             Icons.star_half,
-            color: GFColors.getGFColor(widget.color) ??
-                Theme.of(context).primaryColor,
+            color: widget.color ?? Theme.of(context).primaryColor,
             size: widget.size,
           );
     } else {
       icon = widget.filledIcon ??
           Icon(
             Icons.star,
-            color: GFColors.getGFColor(widget.color) ??
-                Theme.of(context).primaryColor,
+            color: widget.color ?? Theme.of(context).primaryColor,
             size: widget.size,
           );
     }