Skip to content

Commit 32bf3ba

Browse files
deepikahrdeepikahr
authored
Merge pull request #31 from deepikahr/appbar
changes done in components
2 parents deefc92 + e6b59bc commit 32bf3ba

File tree

14 files changed

+1088
-584
lines changed

14 files changed

+1088
-584
lines changed

‎demo_app/lib/screens/badges.dart‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import 'package:ui_kit/components/button/gf_icon_button.dart';
1010
import 'package:ui_kit/position/gf_position.dart';
1111
import 'package:ui_kit/shape/gf_badge_shape.dart';
1212
import 'package:ui_kit/shape/gf_button_shape.dart';
13+
import 'package:ui_kit/shape/gf_icon_button_shape.dart';
1314
import 'package:ui_kit/size/gf_size.dart';
1415
import 'package:ui_kit/types/gf_typography_type.dart';
1516
import 'package:ui_kit/types/gf_type.dart';
@@ -562,9 +563,8 @@ class _BadgesState extends State<Badges> {
562563
mainAxisAlignment: MainAxisAlignment.spaceBetween,
563564
children: <Widget>[
564565
GFIconBadge(
565-
onPressed: null,
566566
child: GFIconButton(
567-
shape: GFButtonShape.pills,
567+
shape: GFIconButtonShape.pills,
568568
color: GFColor.success,
569569
type: GFType.solid,
570570
onPressed: null,
@@ -576,9 +576,8 @@ class _BadgesState extends State<Badges> {
576576
size: GFSize.small,
577577
)),
578578
GFIconBadge(
579-
onPressed: null,
580579
child: GFIconButton(
581-
shape: GFButtonShape.square,
580+
shape: GFIconButtonShape.square,
582581
color: GFColor.primary,
583582
type: GFType.solid,
584583
onPressed: null,
@@ -590,9 +589,8 @@ class _BadgesState extends State<Badges> {
590589
size: GFSize.small,
591590
)),
592591
GFIconBadge(
593-
onPressed: null,
594592
child: GFIconButton(
595-
shape: GFButtonShape.pills,
593+
shape: GFIconButtonShape.pills,
596594
color: GFColor.danger,
597595
type: GFType.solid,
598596
onPressed: null,
@@ -604,9 +602,8 @@ class _BadgesState extends State<Badges> {
604602
size: GFSize.small,
605603
)),
606604
GFIconBadge(
607-
onPressed: null,
608605
child: GFIconButton(
609-
shape: GFButtonShape.standard,
606+
shape: GFIconButtonShape.standard,
610607
type: GFType.solid,
611608
color: GFColor.warning,
612609
onPressed: null,
@@ -636,9 +633,8 @@ class _BadgesState extends State<Badges> {
636633
mainAxisAlignment: MainAxisAlignment.spaceBetween,
637634
children: <Widget>[
638635
GFIconBadge(
639-
onPressed: null,
640636
child: GFIconButton(
641-
shape: GFButtonShape.pills,
637+
shape: GFIconButtonShape.pills,
642638
onPressed: null,
643639
icon: Icon(Icons.mail),
644640
),
@@ -648,9 +644,8 @@ class _BadgesState extends State<Badges> {
648644
size: GFSize.small,
649645
)),
650646
GFIconBadge(
651-
onPressed: null,
652647
child: GFIconButton(
653-
shape: GFButtonShape.square,
648+
shape: GFIconButtonShape.square,
654649
onPressed: null,
655650
icon: Icon(Icons.mail),
656651
),
@@ -661,9 +656,8 @@ class _BadgesState extends State<Badges> {
661656
size: GFSize.small,
662657
)),
663658
GFIconBadge(
664-
onPressed: null,
665659
child: GFIconButton(
666-
shape: GFButtonShape.pills,
660+
shape: GFIconButtonShape.pills,
667661
onPressed: null,
668662
icon: Icon(Icons.mail),
669663
),
@@ -673,9 +667,8 @@ class _BadgesState extends State<Badges> {
673667
size: GFSize.small,
674668
)),
675669
GFIconBadge(
676-
onPressed: null,
677670
child: GFIconButton(
678-
shape: GFButtonShape.standard,
671+
shape: GFIconButtonShape.standard,
679672
onPressed: null,
680673
icon: Icon(Icons.mail),
681674
),
@@ -704,7 +697,6 @@ class _BadgesState extends State<Badges> {
704697
mainAxisAlignment: MainAxisAlignment.spaceBetween,
705698
children: <Widget>[
706699
GFIconBadge(
707-
onPressed: null,
708700
child: GFIconButton(
709701
size: GFSize.large,
710702
onPressed: null,
@@ -716,7 +708,6 @@ class _BadgesState extends State<Badges> {
716708
size: GFSize.small,
717709
)),
718710
GFIconBadge(
719-
onPressed: null,
720711
child: GFIconButton(
721712
size: GFSize.medium,
722713
onPressed: null,
@@ -728,7 +719,6 @@ class _BadgesState extends State<Badges> {
728719
size: GFSize.small,
729720
)),
730721
GFIconBadge(
731-
onPressed: null,
732722
child: GFIconButton(
733723
size: GFSize.small,
734724
onPressed: null,

‎demo_app/lib/screens/toasts.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:ui_kit/colors/gf_color.dart';
33
import 'package:ui_kit/components/button/gf_button.dart';
44
import 'package:ui_kit/components/card/gf_card.dart';
5-
import 'package:ui_kit/components/header/gf_typography.dart';
5+
import 'package:ui_kit/components/typography/gf_typography.dart';
66
import 'package:ui_kit/components/toast/gf_toast.dart';
77
import 'package:ui_kit/types/gf_typography_type.dart';
88
import 'package:ui_kit/types/gf_type.dart';
@@ -29,9 +29,9 @@ class _ToastsState extends State<Toasts> {
2929
GFCard(
3030
content: Column(
3131
children: <Widget>[
32-
GFHeader(
32+
GFTypography(
3333
text: 'Toast',
34-
type: GFHeadingType.typo6,
34+
type: GFTypographyType.typo6,
3535
),
3636
SizedBox(
3737
height: 10,

0 commit comments

Comments
 (0)