GFColor changes in badge, button, alert

Author: Sandip Kakadiya

lib/components/alert/gf_alert.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:getflutter/getflutter.dart';
-import 'package:getflutter/types/gf_alert_type.dart';
 
 class GFAlert extends StatefulWidget {
   /// Alert has to be wrap inside the body like [GFFloatingWidget]. See [GFFloatingWidget]
@@ -106,8 +105,8 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
                           ? BorderRadius.circular(10)
                           : BorderRadius.zero,
                   color: widget.backgroundColor != null
-                      ? GFColors.getGFColor(widget.backgroundColor)
-                      : GFColors.getGFColor(GFColor.white),
+                      ? widget.backgroundColor
+                      : GFColors.WHITE,
                   boxShadow: [
                     BoxShadow(
                         color: Colors.black.withOpacity(0.40), blurRadius: 3)

lib/components/avatar/gf_avatar.dart

@@ -22,11 +22,11 @@ class GFAvatar extends StatelessWidget {
   /// Typically a [Text] widget. If the [CircleAvatar] is to have an image, use [backgroundImage] instead.
   final Widget child;
 
-  /// use [Color] or [GFColor]. The color with which to fill the circle.
-  final dynamic backgroundColor;
+  /// use [Color] or [GFColors]. The color with which to fill the circle.
+  final Color backgroundColor;
 
-  /// use [Color] or [GFColor]. The default text color for text in the circle.
-  final dynamic foregroundColor;
+  /// use [Color] or [GFColors]. The default text color for text in the circle.
+  final Color foregroundColor;
 
   /// The background image of the circle.
   final ImageProvider backgroundImage;
@@ -83,8 +83,8 @@ class GFAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final Color backgroundColor = GFColors.getGFColor(this.backgroundColor);
-    final Color foregroundColor = GFColors.getGFColor(this.foregroundColor);
+    final Color backgroundColor = this.backgroundColor;
+    final Color foregroundColor = this.foregroundColor;
     assert(debugCheckHasMediaQuery(context));
     final ThemeData theme = Theme.of(context);
     TextStyle textStyle = theme.primaryTextTheme.subtitle1.copyWith(

lib/components/badge/gf_badge.dart

@@ -8,8 +8,8 @@ class GFBadge extends StatefulWidget {
     this.textStyle,
     this.borderShape,
     this.shape = GFBadgeShape.standard,
-    this.color = GFColor.danger,
-    this.textColor = GFColor.white,
+    this.color = GFColors.DANGER,
+    this.textColor = GFColors.WHITE,
     this.size = GFSize.SMALL,
     this.border,
     this.text,
@@ -26,7 +26,7 @@ class GFBadge extends StatefulWidget {
   /// Counter type of [GFBadgeShape] i.e, standard, pills, square, circle
   final GFBadgeShape shape;
 
-  /// Pass [GFColor] or [Color]
+  /// Pass [GFColors] or [Color]
   final dynamic color;
 
   /// size of [double] or [GFSize] i.e, 1.2, small, medium, large etc.
@@ -41,7 +41,7 @@ class GFBadge extends StatefulWidget {
   /// text style of counter text.
   final TextStyle textStyle;
 
-  /// Pass [GFColor] or [Color]
+  /// Pass [GFColors] or [Color]
   final dynamic textColor;
 
   @override
@@ -60,8 +60,8 @@ class _GFBadgeState extends State<GFBadge> {
 
   @override
   void initState() {
-    color = GFColors.getGFColor(widget.color);
-    textColor = GFColors.getGFColor(widget.textColor);
+    color = widget.color;
+    textColor = widget.textColor;
     child = widget.text != null ? Text(widget.text ?? '') : widget.child;
     counterShape = widget.shape;
     size = widget.size;

lib/components/badge/gf_button_badge.dart

@@ -32,7 +32,7 @@ class GFButtonBadge extends GFButton {
     MaterialTapTargetSize materialTapTargetSize,
     this.type = GFButtonType.solid,
     this.shape = GFButtonShape.standard,
-    this.color = GFColor.primary,
+    this.color = GFColors.PRIMARY,
     this.textColor,
     this.position = GFPosition.end,
     this.size = GFSize.MEDIUM,
@@ -75,17 +75,17 @@ class GFButtonBadge extends GFButton {
   /// The box shadow for the badge's [Material].
   final BoxShadow boxShadow;
 
-  /// Pass [GFColor] or [Color]. The color for the badge's [Material] when it has the input focus.
-  final dynamic focusColor;
+  /// Pass [GFColors] or [Color]. The color for the badge's [Material] when it has the input focus.
+  final Color focusColor;
 
-  /// Pass [GFColor] or [Color]. The color for the badge's [Material] when a pointer is hovering over it.
-  final dynamic hoverColor;
+  /// Pass [GFColors] or [Color]. The color for the badge's [Material] when a pointer is hovering over it.
+  final Color hoverColor;
 
-  /// Pass [GFColor] or [Color]. The highlight color for the badge's [InkWell].
-  final dynamic highlightColor;
+  /// Pass [GFColors] or [Color]. The highlight color for the badge's [InkWell].
+  final Color highlightColor;
 
-  /// Pass [GFColor] or [Color]. The splash color for the badge's [InkWell].
-  final dynamic splashColor;
+  /// Pass [GFColors] or [Color]. The splash color for the badge's [InkWell].
+  final Color splashColor;
 
   /// The elevation for the badge's [Material] when the badge is [enabled] but not pressed.
   final double elevation;
@@ -135,8 +135,8 @@ class GFButtonBadge extends GFButton {
   /// Button type of GFButtonBadgeShape 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 badge when the badge is disabled.
   ///
@@ -146,10 +146,10 @@ class GFButtonBadge extends GFButton {
   /// See also:
   ///
   ///  * [color] - the fill color of the badge when the badge 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 badge's text when the badge is disabled.
   ///
@@ -165,7 +165,7 @@ class GFButtonBadge extends GFButton {
   /// See also:
   ///
   ///  * [textColor] - The color to use for this badge's text when the badge is [enabled].
-  final dynamic disabledTextColor;
+  final Color disabledTextColor;
 
   /// size of [double] or [GFSize] i.e, 1.2, small, medium, large etc.
   final double size;
@@ -247,7 +247,6 @@ class GFButtonBadge extends GFButton {
             clipBehavior: clipBehavior,
             focusNode: focusNode,
             autofocus: autofocus,
-            //  child: child,
             type: type,
             shape: shape,
             color: color,

lib/components/button/gf_button.dart

@@ -35,7 +35,7 @@ class GFButton extends StatefulWidget {
     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,
@@ -78,17 +78,17 @@ class GFButton extends StatefulWidget {
   /// 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;
@@ -141,8 +141,8 @@ class GFButton extends StatefulWidget {
   /// Button type of [GFButtonShape] 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.
   ///
@@ -152,10 +152,10 @@ class GFButton extends StatefulWidget {
   /// 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.
   ///
@@ -171,7 +171,7 @@ class GFButton extends StatefulWidget {
   /// 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;
@@ -247,17 +247,17 @@ class _GFButtonState extends State<GFButton> {
 
   @override
   void initState() {
-    color = GFColors.getGFColor(widget.color);
-    textColor = GFColors.getGFColor(widget.textColor);
+    color = widget.color;
+    textColor = widget.textColor;
     child = widget.text != null ? Text(widget.text) : widget.child;
     icon = widget.icon;
     onPressed = widget.onPressed;
     type = widget.type;
     shape = widget.shape;
     size = widget.size;
     position = widget.position;
-    disabledColor = GFColors.getGFColor(widget.disabledColor);
-    disabledTextColor = GFColors.getGFColor(widget.disabledTextColor);
+    disabledColor = widget.disabledColor;
+    disabledTextColor = widget.disabledTextColor;
     _updateState(
       MaterialState.disabled,
       !widget.enabled,
@@ -348,8 +348,7 @@ class _GFButtonState extends State<GFButton> {
 
     Color getBorderColor() {
       if (widget.enabled) {
-        final Color fillColor =
-            color == null ? GFColors.getGFColor(GFColor.primary) : color;
+        final Color fillColor = color ?? GFColors.PRIMARY;
         if (fillColor != null) {
           return fillColor;
         }
@@ -360,7 +359,7 @@ class _GFButtonState extends State<GFButton> {
           return color.withOpacity(0.48);
         }
       }
-      return color == null ? GFColors.getGFColor(GFColor.primary) : color;
+      return color ?? GFColors.PRIMARY;
     }
 
     Color getDisabledFillColor() {
@@ -382,8 +381,7 @@ class _GFButtonState extends State<GFButton> {
           widget.type == GFButtonType.outline2x) {
         return Colors.transparent;
       }
-      final Color fillColor =
-          color == null ? GFColors.getGFColor(GFColor.primary) : color;
+      final Color fillColor = color ?? GFColors.PRIMARY;
       return fillColor;
     }
 
@@ -395,7 +393,7 @@ class _GFButtonState extends State<GFButton> {
           widget.type == GFButtonType.transparent) {
         return color;
       } else {
-        return GFColors.getGFColor(GFColor.dark);
+        return GFColors.DARK;
       }
     }
 
@@ -405,17 +403,15 @@ class _GFButtonState extends State<GFButton> {
           widget.type == GFButtonType.transparent) {
         return widget.enabled
             ? textColor == null
-                ? color == GFColors.getGFColor(GFColor.transparent)
-                    ? GFColors.getGFColor(GFColor.dark)
-                    : color
+                ? color == GFColors.TRANSPARENT ? GFColors.DARK : color
                 : textColor
             : getDisabledTextColor();
       }
       if (textColor == null) {
-        if (color == GFColors.getGFColor(GFColor.transparent)) {
-          return GFColors.getGFColor(GFColor.dark);
+        if (color == GFColors.TRANSPARENT) {
+          return GFColors.DARK;
         } else {
-          return GFColors.getGFColor(GFColor.white);
+          return GFColors.WHITE;
         }
       } else {
         return textColor;
@@ -453,12 +449,11 @@ class _GFButtonState extends State<GFButton> {
     final BorderSide shapeBorder = widget.type == GFButtonType.outline ||
             widget.type == GFButtonType.outline2x
         ? outlineBorder
-        : widget.borderSide != null
-            ? widget.borderSide
-            : BorderSide(
-                color: color == null ? themeColor : getBorderColor(),
-                width: 0,
-              );
+        : widget.borderSide ??
+            BorderSide(
+              color: color == null ? themeColor : getBorderColor(),
+              width: 0,
+            );
 
     if (shape == GFButtonShape.pills) {
       shapeBorderType = RoundedRectangleBorder(
@@ -574,10 +569,10 @@ class _GFButtonState extends State<GFButton> {
           onTap: widget.onPressed,
           onLongPress: widget.onLongPress,
           enableFeedback: widget.enableFeedback,
-          splashColor: GFColors.getGFColor(widget.splashColor),
-          highlightColor: GFColors.getGFColor(widget.highlightColor),
-          focusColor: GFColors.getGFColor(widget.focusColor),
-          hoverColor: GFColors.getGFColor(widget.hoverColor),
+          splashColor: widget.splashColor,
+          highlightColor: widget.highlightColor,
+          focusColor: widget.focusColor,
+          hoverColor: widget.hoverColor,
           customBorder: widget.type == GFButtonType.transparent
               ? null
               : widget.borderShape ?? shapeBorderType,

lib/components/loader/gf_loader.dart

@@ -54,7 +54,7 @@ class GFLoader extends StatefulWidget {
 
   /// type of [double] or [GFSize] ie, small , medium or large which is used
   /// to change the size of android, ios, circle and square loaders only
-  final dynamic size;
+  final double size;
 
   @override
   _GFLoaderState createState() => _GFLoaderState();
@@ -220,7 +220,7 @@ class Loader extends StatelessWidget {
   final Color color;
   final GFLoaderType type;
   final Widget icon;
-  final dynamic size;
+  final double size;
   final Widget child;
 
   @override

lib/components/rating/gf_rating.dart

@@ -34,7 +34,7 @@ class GFRating extends StatefulWidget {
   final dynamic borderColor;
 
   /// defines the size of items. GFSize can be used for size variations like small. medium. large
-  final dynamic size;
+  final double size;
 
   /// if true, allow half rating of items. Default it will be in true state
   final bool allowHalfRating;