Skip to content

Commit 8e3f9d7

Browse files
committed
Merge branch 'master' of https://github.com/shravyackm/getflutter into demo-app
2 parents 47c78a2 + 53e2692 commit 8e3f9d7

File tree

10 files changed

+2152
-675
lines changed

10 files changed

+2152
-675
lines changed

example/lib/main.dart

Lines changed: 241 additions & 123 deletions
Large diffs are not rendered by default.

lib/components/appbar/gf_appbar.dart

Lines changed: 1299 additions & 0 deletions
Large diffs are not rendered by default.

lib/components/badge/gf_button_badge.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class GFButtonBadge extends StatefulWidget {
6060
this.type = GFType.solid,
6161
this.shape = GFButtonShape.standard,
6262
this.color = GFColor.primary,
63-
this.textColor = GFColor.dark,
63+
this.textColor,
6464
this.position = GFPosition.end,
6565
this.size = GFSize.medium,
6666
this.borderSide,
@@ -88,7 +88,7 @@ class _GFButtonBadgeState extends State<GFButtonBadge> {
8888
@override
8989
void initState() {
9090
this.color = getGFColor(widget.color);
91-
this.textColor = getGFColor(widget.textColor);
91+
this.textColor = widget.type == GFType.outline && widget.textColor == null ? this.color : widget.textColor == null ? getGFColor(GFColor.dark) : getGFColor(widget.textColor);
9292
this.onPressed = widget.onPressed;
9393
this.type = widget.type;
9494
this.shape = widget.shape;

0 commit comments

Comments
 (0)