Skip to content

Commit deefc92

Browse files
deepikahrdeepikahr
authored
Merge pull request #30 from deepikahr/appbar
GFTabs, GFCarousel errors fixed
2 parents a7a1d86 + 4761fa5 commit deefc92

21 files changed

+1328
-1683
lines changed

‎demo_app/lib/screens/avatars.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
33
import 'package:ui_kit/components/avatar/gf_avatar.dart';
44
import 'package:ui_kit/components/card/gf_card.dart';
5-
import 'package:ui_kit/components/header/gf_header.dart';
5+
import 'package:ui_kit/components/typography/gf_typography.dart';
66
import 'package:ui_kit/shape/gf_avatar_shape.dart';
7-
import 'package:ui_kit/types/gf_heading_type.dart';
7+
import 'package:ui_kit/types/gf_typography_type.dart';
88
import 'package:ui_kit/colors/gf_color.dart';
99

1010
class Avatars extends StatefulWidget {
@@ -27,9 +27,9 @@ class _AvatarsState extends State<Avatars> {
2727
content: Column(
2828
crossAxisAlignment: CrossAxisAlignment.start,
2929
children: <Widget>[
30-
GFHeader(
30+
GFTypography(
3131
text: 'Circle Avatar',
32-
type: GFHeadingType.typo6,
32+
type: GFTypographyType.typo6,
3333
),
3434
SizedBox(
3535
height: 10,
@@ -109,9 +109,9 @@ class _AvatarsState extends State<Avatars> {
109109
content: Column(
110110
crossAxisAlignment: CrossAxisAlignment.start,
111111
children: <Widget>[
112-
GFHeader(
112+
GFTypography(
113113
text: 'Square Avatar',
114-
type: GFHeadingType.typo6,
114+
type: GFTypographyType.typo6,
115115
),
116116
SizedBox(
117117
height: 10,
@@ -200,9 +200,9 @@ class _AvatarsState extends State<Avatars> {
200200
content: Column(
201201
crossAxisAlignment: CrossAxisAlignment.start,
202202
children: <Widget>[
203-
GFHeader(
203+
GFTypography(
204204
text: 'Standard Avatar',
205-
type: GFHeadingType.typo6,
205+
type: GFTypographyType.typo6,
206206
),
207207
SizedBox(
208208
height: 10,

‎demo_app/lib/screens/badges.dart‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import 'package:ui_kit/components/badge/gf_badge.dart';
44
import 'package:ui_kit/components/badge/gf_button_badge.dart';
55
import 'package:ui_kit/components/badge/gf_icon_badge.dart';
66
import 'package:ui_kit/components/card/gf_card.dart';
7-
import 'package:ui_kit/components/header/gf_header.dart';
7+
import 'package:ui_kit/components/typography/gf_typography.dart';
88
import 'package:ui_kit/components/tabs/gf_tabs.dart';
99
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';
1313
import 'package:ui_kit/size/gf_size.dart';
14-
import 'package:ui_kit/types/gf_heading_type.dart';
14+
import 'package:ui_kit/types/gf_typography_type.dart';
1515
import 'package:ui_kit/types/gf_type.dart';
1616
import 'package:ui_kit/components/tabs/gf_tabBarView.dart';
1717

@@ -51,9 +51,9 @@ class _BadgesState extends State<Badges> {
5151
GFCard(
5252
content: Column(
5353
children: <Widget>[
54-
GFHeader(
54+
GFTypography(
5555
text: 'Types of Badges',
56-
type: GFHeadingType.typo6,
56+
type: GFTypographyType.typo6,
5757
),
5858
SizedBox(
5959
height: 10,
@@ -90,9 +90,9 @@ class _BadgesState extends State<Badges> {
9090
GFCard(
9191
content: Column(
9292
children: <Widget>[
93-
GFHeader(
93+
GFTypography(
9494
text: 'Circled Badges with different Sizes',
95-
type: GFHeadingType.typo6,
95+
type: GFTypographyType.typo6,
9696
),
9797
SizedBox(
9898
height: 10,
@@ -126,9 +126,9 @@ class _BadgesState extends State<Badges> {
126126
GFCard(
127127
content: Column(
128128
children: <Widget>[
129-
GFHeader(
129+
GFTypography(
130130
text: 'Squared Badges with different sizes',
131-
type: GFHeadingType.typo6,
131+
type: GFTypographyType.typo6,
132132
),
133133
SizedBox(
134134
height: 10,
@@ -162,9 +162,9 @@ class _BadgesState extends State<Badges> {
162162
GFCard(
163163
content: Column(
164164
children: <Widget>[
165-
GFHeader(
165+
GFTypography(
166166
text: 'Pills with different sizes',
167-
type: GFHeadingType.typo6,
167+
type: GFTypographyType.typo6,
168168
),
169169
SizedBox(
170170
height: 10,
@@ -201,9 +201,9 @@ class _BadgesState extends State<Badges> {
201201
GFCard(
202202
content: Column(
203203
children: <Widget>[
204-
GFHeader(
204+
GFTypography(
205205
text: 'Standard Badges with different sizes',
206-
type: GFHeadingType.typo6,
206+
type: GFTypographyType.typo6,
207207
),
208208
SizedBox(
209209
height: 10,
@@ -241,9 +241,9 @@ class _BadgesState extends State<Badges> {
241241
GFCard(
242242
content: Column(
243243
children: <Widget>[
244-
GFHeader(
244+
GFTypography(
245245
text: 'Types of Button Badges',
246-
type: GFHeadingType.typo6,
246+
type: GFTypographyType.typo6,
247247
),
248248
SizedBox(
249249
height: 10,
@@ -255,7 +255,7 @@ class _BadgesState extends State<Badges> {
255255
shape: GFButtonShape.pills,
256256
type: GFType.solid,
257257
color: GFColor.info,
258-
counterChild: GFBadge(
258+
icon: GFBadge(
259259
text: '12',
260260
color: GFColor.warning,
261261
shape: GFBadgeShape.circle,
@@ -268,7 +268,7 @@ class _BadgesState extends State<Badges> {
268268
shape: GFButtonShape.square,
269269
type: GFType.solid,
270270
color: GFColor.warning,
271-
counterChild: GFBadge(
271+
icon: GFBadge(
272272
text: '12',
273273
shape: GFBadgeShape.circle,
274274
color: GFColor.info,
@@ -280,7 +280,7 @@ class _BadgesState extends State<Badges> {
280280
color: GFColor.success,
281281
shape: GFButtonShape.standard,
282282
type: GFType.solid,
283-
counterChild: GFBadge(
283+
icon: GFBadge(
284284
text: '12',
285285
textColor: GFColor.white,
286286
color: GFColor.danger,
@@ -297,9 +297,9 @@ class _BadgesState extends State<Badges> {
297297
GFCard(
298298
content: Column(
299299
children: <Widget>[
300-
GFHeader(
300+
GFTypography(
301301
text: 'Positions of Button Badges',
302-
type: GFHeadingType.typo6,
302+
type: GFTypographyType.typo6,
303303
),
304304
SizedBox(
305305
height: 10,
@@ -311,7 +311,7 @@ class _BadgesState extends State<Badges> {
311311
shape: GFButtonShape.pills,
312312
type: GFType.solid,
313313
color: GFColor.info,
314-
counterChild: GFBadge(
314+
icon: GFBadge(
315315
text: '12',
316316
color: GFColor.warning,
317317
shape: GFBadgeShape.circle,
@@ -324,7 +324,7 @@ class _BadgesState extends State<Badges> {
324324
shape: GFButtonShape.square,
325325
type: GFType.solid,
326326
color: GFColor.warning,
327-
counterChild: GFBadge(
327+
icon: GFBadge(
328328
text: '12',
329329
shape: GFBadgeShape.circle,
330330
color: GFColor.info,
@@ -337,7 +337,7 @@ class _BadgesState extends State<Badges> {
337337
color: GFColor.success,
338338
shape: GFButtonShape.standard,
339339
type: GFType.solid,
340-
counterChild: GFBadge(
340+
icon: GFBadge(
341341
text: '12',
342342
textColor: GFColor.white,
343343
color: GFColor.danger,
@@ -355,9 +355,9 @@ class _BadgesState extends State<Badges> {
355355
GFCard(
356356
content: Column(
357357
children: <Widget>[
358-
GFHeader(
358+
GFTypography(
359359
text: 'Pilled shape Button Badges with sizes',
360-
type: GFHeadingType.typo6,
360+
type: GFTypographyType.typo6,
361361
),
362362
SizedBox(
363363
height: 10,
@@ -370,7 +370,7 @@ class _BadgesState extends State<Badges> {
370370
size: GFSize.large,
371371
type: GFType.solid,
372372
color: GFColor.info,
373-
counterChild: GFBadge(
373+
icon: GFBadge(
374374
text: '12',
375375
color: GFColor.warning,
376376
size: GFSize.large,
@@ -385,7 +385,7 @@ class _BadgesState extends State<Badges> {
385385
size: GFSize.medium,
386386
type: GFType.outline,
387387
color: GFColor.info,
388-
counterChild: GFBadge(
388+
icon: GFBadge(
389389
text: '12',
390390
color: GFColor.warning,
391391
size: GFSize.medium,
@@ -400,7 +400,7 @@ class _BadgesState extends State<Badges> {
400400
size: GFSize.small,
401401
type: GFType.transparent,
402402
color: GFColor.info,
403-
counterChild: GFBadge(
403+
icon: GFBadge(
404404
text: '12',
405405
color: GFColor.warning,
406406
size: GFSize.small,
@@ -418,9 +418,9 @@ class _BadgesState extends State<Badges> {
418418
GFCard(
419419
content: Column(
420420
children: <Widget>[
421-
GFHeader(
421+
GFTypography(
422422
text: 'Squared shape Button Badges with sizes',
423-
type: GFHeadingType.typo6,
423+
type: GFTypographyType.typo6,
424424
),
425425
SizedBox(
426426
height: 10,
@@ -433,7 +433,7 @@ class _BadgesState extends State<Badges> {
433433
size: GFSize.large,
434434
type: GFType.solid,
435435
color: GFColor.warning,
436-
counterChild: GFBadge(
436+
icon: GFBadge(
437437
text: '12',
438438
color: GFColor.info,
439439
size: GFSize.large,
@@ -448,7 +448,7 @@ class _BadgesState extends State<Badges> {
448448
size: GFSize.medium,
449449
type: GFType.outline,
450450
color: GFColor.warning,
451-
counterChild: GFBadge(
451+
icon: GFBadge(
452452
text: '12',
453453
color: GFColor.info,
454454
size: GFSize.medium,
@@ -463,7 +463,7 @@ class _BadgesState extends State<Badges> {
463463
size: GFSize.small,
464464
type: GFType.transparent,
465465
color: GFColor.warning,
466-
counterChild: GFBadge(
466+
icon: GFBadge(
467467
text: '12',
468468
color: GFColor.info,
469469
size: GFSize.small,
@@ -481,9 +481,9 @@ class _BadgesState extends State<Badges> {
481481
GFCard(
482482
content: Column(
483483
children: <Widget>[
484-
GFHeader(
484+
GFTypography(
485485
text: 'Standard Button Badges with sizes',
486-
type: GFHeadingType.typo6,
486+
type: GFTypographyType.typo6,
487487
),
488488
SizedBox(
489489
height: 10,
@@ -496,7 +496,7 @@ class _BadgesState extends State<Badges> {
496496
size: GFSize.large,
497497
type: GFType.solid,
498498
color: GFColor.primary,
499-
counterChild: GFBadge(
499+
icon: GFBadge(
500500
text: '12',
501501
color: GFColor.danger,
502502
size: GFSize.large,
@@ -512,7 +512,7 @@ class _BadgesState extends State<Badges> {
512512
size: GFSize.medium,
513513
type: GFType.outline,
514514
color: GFColor.primary,
515-
counterChild: GFBadge(
515+
icon: GFBadge(
516516
text: '12',
517517
color: GFColor.danger,
518518
textColor: GFColor.white,
@@ -528,7 +528,7 @@ class _BadgesState extends State<Badges> {
528528
size: GFSize.small,
529529
type: GFType.transparent,
530530
color: GFColor.primary,
531-
counterChild: GFBadge(
531+
icon: GFBadge(
532532
text: '12',
533533
color: GFColor.danger,
534534
textColor: GFColor.white,
@@ -551,9 +551,9 @@ class _BadgesState extends State<Badges> {
551551
GFCard(
552552
content: Column(
553553
children: <Widget>[
554-
GFHeader(
554+
GFTypography(
555555
text: 'Types of Icon Badges',
556-
type: GFHeadingType.typo6,
556+
type: GFTypographyType.typo6,
557557
),
558558
SizedBox(
559559
height: 10,
@@ -625,9 +625,9 @@ class _BadgesState extends State<Badges> {
625625
GFCard(
626626
content: Column(
627627
children: <Widget>[
628-
GFHeader(
628+
GFTypography(
629629
text: 'Shapes of Icon Badges',
630-
type: GFHeadingType.typo6,
630+
type: GFTypographyType.typo6,
631631
),
632632
SizedBox(
633633
height: 10,
@@ -693,9 +693,9 @@ class _BadgesState extends State<Badges> {
693693
GFCard(
694694
content: Column(
695695
children: <Widget>[
696-
GFHeader(
696+
GFTypography(
697697
text: 'Sizes of Icon Badges',
698-
type: GFHeadingType.typo6,
698+
type: GFTypographyType.typo6,
699699
),
700700
SizedBox(
701701
height: 10,

0 commit comments

Comments
 (0)