Merge pull request #33 from ionicfirebaseapp/master

master pull

Author: shravyackm

example/lib/main_temp.dart

@@ -68,6 +68,16 @@ class _GFBadgeState extends State<GFBadge> {
     super.initState();
   }
 
+  @override
+  void didUpdateWidget(GFBadge oldWidget) {
+    color = widget.color;
+    textColor = widget.textColor;
+    child = widget.text != null ? Text(widget.text ?? '') : widget.child;
+    counterShape = widget.shape;
+    size = widget.size;
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   Widget build(BuildContext context) {
     final BorderSide shapeBorder = widget.border != null

lib/components/badge/gf_badge.dart

@@ -4,7 +4,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:getflutter/getflutter.dart';
 
-class GFButtonBadge extends GFButton {
+class GFButtonBadge extends StatefulWidget {
   /// Create badges badges of all types. check out [GFIconButton] for icon badges, and [GFBadge] for badges
   const GFButtonBadge({
     Key key,
@@ -58,15 +58,17 @@ class GFButtonBadge extends GFButton {
         assert(animationDuration != null),
         assert(clipBehavior != null),
         assert(autofocus != null),
-        super(key: key, onPressed: onPressed);
+        super(
+          key: key,
+        );
 
   /// Called when the button is tapped or otherwise activated.
   final VoidCallback onPressed;
 
   /// Called by the underlying [InkWell] widget's InkWell.onHighlightChanged callback.
   final ValueChanged<bool> onHighlightChanged;
 
-  /// Defines the default text style, with [Material.textStyle], for the button's [child].
+  /// Defines the default text style, with [Material.textStyle], for the button's child.
   final TextStyle textStyle;
 
   /// The border side for the badge's [Material].
@@ -102,7 +104,7 @@ class GFButtonBadge extends GFButton {
   /// The elevation for the badge's [Material] when the badge is not [enabled].
   final double disabledElevation;
 
-  /// The internal padding for the badge's [child].
+  /// The internal padding for the badge's child.
   final EdgeInsetsGeometry padding;
 
   /// Defines the badge's size.
@@ -219,48 +221,104 @@ class GFButtonBadge extends GFButton {
   /// Can be used to display GFBadge, [Icons] inside badge design
   final Widget icon;
 
+  @override
+  _GFButtonBadgeState createState() => _GFButtonBadgeState();
+}
+
+class _GFButtonBadgeState extends State<GFButtonBadge> {
+  @override
   Widget build(BuildContext context) => ConstrainedBox(
         constraints: const BoxConstraints(
           minHeight: 26,
           minWidth: 98,
         ),
         child: Container(
-          height: size,
+          height: widget.size,
           child: GFButton(
-            onPressed: onPressed,
-            onHighlightChanged: onHighlightChanged,
-            textStyle: textStyle,
-            boxShadow: boxShadow,
-            buttonBoxShadow: badgeBoxShadow,
-            focusColor: focusColor,
-            hoverColor: hoverColor,
-            highlightColor: highlightColor,
-            splashColor: splashColor,
-            elevation: elevation,
-            focusElevation: focusElevation,
-            hoverElevation: hoverElevation,
-            highlightElevation: highlightElevation,
-            disabledElevation: disabledElevation,
-            constraints: constraints,
-            borderShape: borderShape,
-            animationDuration: animationDuration,
-            clipBehavior: clipBehavior,
-            focusNode: focusNode,
-            autofocus: autofocus,
-            type: type,
-            shape: shape,
-            color: color,
-            textColor: textColor,
-            position: position,
-            size: size,
-            borderSide: borderSide,
-            text: text,
-            icon: icon,
-            blockButton: blockButton,
-            fullWidthButton: fullWidthButton,
-            disabledColor: disabledTextColor,
-            disabledTextColor: disabledColor,
+            onPressed: widget.onPressed,
+            onHighlightChanged: widget.onHighlightChanged,
+            textStyle: widget.textStyle,
+            boxShadow: widget.boxShadow,
+            buttonBoxShadow: widget.badgeBoxShadow,
+            focusColor: widget.focusColor,
+            hoverColor: widget.hoverColor,
+            highlightColor: widget.highlightColor,
+            splashColor: widget.splashColor,
+            elevation: widget.elevation,
+            focusElevation: widget.focusElevation,
+            hoverElevation: widget.hoverElevation,
+            highlightElevation: widget.highlightElevation,
+            disabledElevation: widget.disabledElevation,
+            constraints: widget.constraints,
+            borderShape: widget.borderShape,
+            animationDuration: widget.animationDuration,
+            clipBehavior: widget.clipBehavior,
+            focusNode: widget.focusNode,
+            autofocus: widget.autofocus,
+            type: widget.type,
+            shape: widget.shape,
+            color: widget.color,
+            textColor: widget.textColor,
+            position: widget.position,
+            size: widget.size,
+            borderSide: widget.borderSide,
+            text: widget.text,
+            icon: widget.icon,
+            blockButton: widget.blockButton,
+            fullWidthButton: widget.fullWidthButton,
+            disabledColor: widget.disabledTextColor,
+            disabledTextColor: widget.disabledColor,
           ),
         ),
       );
 }
+
+//
+//class GFButtonBadge extends GFButton {
+//
+//
+//  Widget build(BuildContext context) => ConstrainedBox(
+//        constraints: const BoxConstraints(
+//          minHeight: 26,
+//          minWidth: 98,
+//        ),
+//        child: Container(
+//          height: size,
+//          child: GFButton(
+//            onPressed: onPressed,
+//            onHighlightChanged: onHighlightChanged,
+//            textStyle: textStyle,
+//            boxShadow: boxShadow,
+//            buttonBoxShadow: badgeBoxShadow,
+//            focusColor: focusColor,
+//            hoverColor: hoverColor,
+//            highlightColor: highlightColor,
+//            splashColor: splashColor,
+//            elevation: elevation,
+//            focusElevation: focusElevation,
+//            hoverElevation: hoverElevation,
+//            highlightElevation: highlightElevation,
+//            disabledElevation: disabledElevation,
+//            constraints: constraints,
+//            borderShape: borderShape,
+//            animationDuration: animationDuration,
+//            clipBehavior: clipBehavior,
+//            focusNode: focusNode,
+//            autofocus: autofocus,
+//            type: type,
+//            shape: shape,
+//            color: color,
+//            textColor: textColor,
+//            position: position,
+//            size: size,
+//            borderSide: borderSide,
+//            text: text,
+//            icon: icon,
+//            blockButton: blockButton,
+//            fullWidthButton: fullWidthButton,
+//            disabledColor: disabledTextColor,
+//            disabledTextColor: disabledColor,
+//          ),
+//        ),
+//      );
+//}