Skip to content

Commit 6e74170

Browse files
sipra-acharyasipra-acharya
committed
border,bottomsheet added & some ui updation
1 parent 4c31d9f commit 6e74170

25 files changed

+314
-65
lines changed

‎lib/assets/gif/Borders.gif

1.2 MB
Loading

‎lib/assets/gif/Checkboxlist.gif

234 KB
Loading

‎lib/assets/gif/Progressbar.gif

1.41 MB
Loading

‎lib/assets/gif/Shimmer.gif

663 KB
Loading

‎lib/assets/gif/floating.gif

348 KB
Loading

‎lib/assets/gif/radio.gif

460 KB
Loading

‎lib/assets/gif/radiolist.gif

92.3 KB
Loading

‎lib/assets/images/gflogo.png

27.5 KB
Loading

‎lib/assets/logo.png

2.96 KB
Loading

‎lib/screens/accordion/accordion.dart

+6
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ class _AccordionState extends State<Accordion> {
6161
color: Colors.black.withOpacity(0.2), width: 0.5),
6262
),
6363
contentborder: Border(
64+
top: BorderSide(
65+
color: Colors.black.withOpacity(0.2), width: 0.5),
6466
bottom: BorderSide(
6567
color: Colors.black.withOpacity(0.2), width: 0.5),
6668
left: BorderSide(
@@ -103,6 +105,8 @@ class _AccordionState extends State<Accordion> {
103105
color: Colors.black.withOpacity(0.2), width: 0.5),
104106
),
105107
contentborder: Border(
108+
top: BorderSide(
109+
color: Colors.black.withOpacity(0.2), width: 0.5),
106110
bottom: BorderSide(
107111
color: Colors.black.withOpacity(0.2), width: 0.5),
108112
left: BorderSide(
@@ -150,6 +154,8 @@ class _AccordionState extends State<Accordion> {
150154
color: Colors.black.withOpacity(0.2), width: 0.5),
151155
),
152156
contentborder: Border(
157+
top: BorderSide(
158+
color: Colors.black.withOpacity(0.2), width: 0.5),
153159
bottom: BorderSide(
154160
color: Colors.black.withOpacity(0.2), width: 0.5),
155161
left: BorderSide(

‎lib/screens/border/border.dart

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:getwidget/getwidget.dart';
3+
import 'package:gf_web/screens/layout/layout.dart';
4+
import 'package:gf_web/styles/styles.dart';
5+
6+
class Border extends StatefulWidget {
7+
@override
8+
_BorderState createState() => _BorderState();
9+
}
10+
11+
class _BorderState extends State<Border> {
12+
@override
13+
Widget build(BuildContext context) {
14+
return Scaffold(
15+
body: Layout(
16+
demoImageUrl: 'lib/assets/gif/Borders.gif',
17+
body: ListView(
18+
children: <Widget>[
19+
Text(
20+
'Border',
21+
style: hintStyleTextblackbolder(),
22+
),
23+
SizedBox(
24+
height: 20,
25+
),
26+
Text(
27+
"The most basic way is to wrap your widget in a DecoratedBox.A border of a box, comprised of four sides: top, right, bottom, left.",
28+
style: hintStyleTextblackdull(),
29+
),
30+
const Padding(
31+
padding: EdgeInsets.only(left: 15, top: 30, bottom: 10),
32+
child: GFTypography(
33+
child: Text(
34+
'Solid Borders',
35+
style: TextStyle(
36+
fontSize: 20.0,
37+
color: Colors.black,
38+
fontWeight: FontWeight.w600,
39+
),
40+
),
41+
type: GFTypographyType.typo5,
42+
dividerWidth: 45,
43+
dividerColor: Color(0xFF19CA4B),
44+
),
45+
),
46+
Container(
47+
margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15),
48+
child: GFBorder(
49+
radius: Radius.circular(30),
50+
color: Color(0xFF19CA4B),
51+
dashedLine: [2, 0],
52+
type: GFBorderType.Rect,
53+
child: Container(
54+
height: 100,
55+
color: Color(0xFFE9FFEF),
56+
),
57+
),
58+
),
59+
const Padding(
60+
padding: EdgeInsets.only(left: 15, top: 30, bottom: 10),
61+
child: GFTypography(
62+
child: Text(
63+
'Dashed Borders',
64+
style: TextStyle(
65+
fontSize: 20.0,
66+
color: Colors.black,
67+
fontWeight: FontWeight.w600,
68+
),
69+
),
70+
type: GFTypographyType.typo5,
71+
dividerWidth: 45,
72+
dividerColor: Color(0xFF19CA4B),
73+
),
74+
),
75+
Container(
76+
margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15),
77+
child: GFBorder(
78+
type: GFBorderType.RRect,
79+
radius: Radius.circular(20),
80+
color: Color(0xFFAA66CC),
81+
child: Container(
82+
decoration: BoxDecoration(
83+
color: Color(0xFFFAF0FF),
84+
borderRadius: BorderRadius.circular(20)),
85+
height: 100,
86+
),
87+
),
88+
),
89+
const Padding(
90+
padding: EdgeInsets.only(left: 15, top: 30, bottom: 10),
91+
child: GFTypography(
92+
child: Text(
93+
'Dotted Borders',
94+
style: TextStyle(
95+
fontSize: 20.0,
96+
color: Colors.black,
97+
fontWeight: FontWeight.w600,
98+
),
99+
),
100+
type: GFTypographyType.typo5,
101+
dividerWidth: 45,
102+
dividerColor: Color(0xFF19CA4B),
103+
),
104+
),
105+
Container(
106+
margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15),
107+
child: GFBorder(
108+
radius: Radius.circular(30),
109+
color: Color(0xFF19CA4B),
110+
dashedLine: [2, 1],
111+
type: GFBorderType.Rect,
112+
child: Container(
113+
height: 100,
114+
color: Color(0xFFE9FFEF),
115+
),
116+
),
117+
),
118+
SizedBox(
119+
height: 20,
120+
)
121+
],
122+
),
123+
),
124+
);
125+
}
126+
}

‎lib/screens/bottomsheet/bottomsheet.dart

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:getwidget/getwidget.dart';
3+
import 'package:gf_web/screens/layout/layout.dart';
4+
import 'package:gf_web/styles/styles.dart';
5+
6+
class BottomSheet extends StatefulWidget {
7+
@override
8+
_BottomSheetState createState() => _BottomSheetState();
9+
}
10+
11+
class _BottomSheetState extends State<BottomSheet> {
12+
final GFBottomSheetController _controller = GFBottomSheetController();
13+
14+
@override
15+
Widget build(BuildContext context) {
16+
return Scaffold(
17+
bottomSheet: GFBottomSheet(
18+
controller: _controller,
19+
//animationDuration: 800,
20+
// minContentHeight: 100,
21+
maxContentHeight: 200,
22+
// elevation: 10,
23+
enableExpandableContent: true,
24+
stickyHeaderHeight: 100,
25+
stickyHeader: Container(
26+
decoration: BoxDecoration(color: Colors.white,
27+
// borderRadius: BorderRadius.circular(10),
28+
boxShadow: [BoxShadow(color: Colors.black45, blurRadius: 0)]),
29+
// height: 100,
30+
child: const GFListTile(
31+
avatar: GFAvatar(
32+
backgroundImage: AssetImage('lib/assets/images/gflogo.png'),
33+
),
34+
titleText: 'GetWidget',
35+
subtitleText: 'Open source UI library',
36+
),
37+
),
38+
contentBody: Container(
39+
margin: EdgeInsets.symmetric(horizontal: 15, vertical: 10),
40+
child: ListView(
41+
shrinkWrap: true,
42+
physics: const ScrollPhysics(),
43+
children: const [
44+
Center(
45+
child: Text(
46+
'Getwidget reduces your overall app development time to minimum 30% because of its pre-build clean UI widget that you can use in flutter app development. We have spent more than 1000+ hours to build this library to make flutter developer’s life easy.',
47+
style: TextStyle(
48+
fontSize: 15, wordSpacing: 0.3, letterSpacing: 0.2),
49+
))
50+
],
51+
),
52+
),
53+
stickyFooter: Container(
54+
color: GFColors.SUCCESS,
55+
height: 100,
56+
child: Row(
57+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
58+
children: [
59+
Text(
60+
'Get in touch',
61+
style: TextStyle(
62+
fontSize: 18,
63+
fontWeight: FontWeight.bold,
64+
color: Colors.white),
65+
),
66+
Text(
67+
'info@getwidget.dev',
68+
style: TextStyle(fontSize: 15, color: Colors.white),
69+
),
70+
],
71+
),
72+
),
73+
stickyFooterHeight: 50,
74+
),
75+
floatingActionButton: FloatingActionButton(
76+
backgroundColor: GFColors.SUCCESS,
77+
child: const Icon(Icons.keyboard_arrow_down),
78+
onPressed: () {
79+
_controller.isBottomSheetOpened
80+
? _controller.hideBottomSheet()
81+
: _controller.showBottomSheet();
82+
}),
83+
body: Layout(
84+
demoImageUrl: 'lib/assets/gif/ratings.gif',
85+
body: ListView(
86+
children: <Widget>[
87+
Text(
88+
'BottomSheet',
89+
style: hintStyleTextblackbolder(),
90+
),
91+
SizedBox(
92+
height: 20,
93+
),
94+
Text(
95+
"The BottomSheet can be used to open panels to the bottom of the screen.",
96+
style: hintStyleTextblackdull(),
97+
),
98+
SizedBox(
99+
height: 20,
100+
)
101+
],
102+
),
103+
),
104+
);
105+
}
106+
}

‎lib/screens/buttons/pills-buttons.dart

+6-24
Original file line numberDiff line numberDiff line change
@@ -926,10 +926,7 @@ class _PillButtonsState extends State<PillButtons> {
926926
shape: GFButtonShape.pills,
927927
blockButton: true,
928928
type: GFButtonType.outline,
929-
child: Text("Large",
930-
style: TextStyle(
931-
color: GFColors.WHITE,
932-
)),
929+
child: Text("Large", style: TextStyle()),
933930
color: GFColors.PRIMARY,
934931
size: GFSize.LARGE,
935932
),
@@ -941,10 +938,7 @@ class _PillButtonsState extends State<PillButtons> {
941938
shape: GFButtonShape.pills,
942939
type: GFButtonType.outline,
943940
blockButton: true,
944-
child: Text("Normal",
945-
style: TextStyle(
946-
color: GFColors.WHITE,
947-
)),
941+
child: Text("Normal", style: TextStyle()),
948942
color: GFColors.PRIMARY,
949943
size: GFSize.MEDIUM,
950944
),
@@ -956,10 +950,7 @@ class _PillButtonsState extends State<PillButtons> {
956950
shape: GFButtonShape.pills,
957951
type: GFButtonType.outline,
958952
blockButton: true,
959-
child: Text("Small",
960-
style: TextStyle(
961-
color: GFColors.WHITE,
962-
)),
953+
child: Text("Small", style: TextStyle()),
963954
color: GFColors.PRIMARY,
964955
size: GFSize.SMALL,
965956
),
@@ -1359,10 +1350,7 @@ class _PillButtonsState extends State<PillButtons> {
13591350
shape: GFButtonShape.pills,
13601351
type: GFButtonType.outline2x,
13611352
blockButton: true,
1362-
child: Text("Large",
1363-
style: TextStyle(
1364-
color: GFColors.WHITE,
1365-
)),
1353+
child: Text("Large", style: TextStyle()),
13661354
color: GFColors.PRIMARY,
13671355
size: GFSize.LARGE,
13681356
),
@@ -1374,10 +1362,7 @@ class _PillButtonsState extends State<PillButtons> {
13741362
shape: GFButtonShape.pills,
13751363
type: GFButtonType.outline2x,
13761364
blockButton: true,
1377-
child: Text("Normal",
1378-
style: TextStyle(
1379-
color: GFColors.WHITE,
1380-
)),
1365+
child: Text("Normal", style: TextStyle()),
13811366
color: GFColors.PRIMARY,
13821367
size: GFSize.MEDIUM,
13831368
),
@@ -1389,10 +1374,7 @@ class _PillButtonsState extends State<PillButtons> {
13891374
shape: GFButtonShape.pills,
13901375
type: GFButtonType.outline2x,
13911376
blockButton: true,
1392-
child: Text("Small",
1393-
style: TextStyle(
1394-
color: GFColors.WHITE,
1395-
)),
1377+
child: Text("Small", style: TextStyle()),
13961378
color: GFColors.PRIMARY,
13971379
size: GFSize.SMALL,
13981380
),

‎lib/screens/cards/cards.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ class _CardsState extends State<Cards> {
370370
shape: GFIconButtonShape.circle,
371371
icon: Icon(
372372
IconData(
373-
0xe904,
373+
0xe906,
374374
fontFamily: 'icomoon',
375375
),
376376
color: GFColors.WHITE,
@@ -382,7 +382,7 @@ class _CardsState extends State<Cards> {
382382
shape: GFIconButtonShape.circle,
383383
icon: Icon(
384384
IconData(
385-
0xe90f,
385+
0xe910,
386386
fontFamily: 'icomoon',
387387
),
388388
color: GFColors.WHITE,
@@ -393,7 +393,7 @@ class _CardsState extends State<Cards> {
393393
shape: GFIconButtonShape.circle,
394394
icon: Icon(
395395
IconData(
396-
0xe911,
396+
0xe912,
397397
fontFamily: 'icomoon',
398398
),
399399
color: GFColors.WHITE,
@@ -522,7 +522,7 @@ class _CardsState extends State<Cards> {
522522
shape: GFIconButtonShape.circle,
523523
icon: Icon(
524524
IconData(
525-
0xe904,
525+
0xe906,
526526
fontFamily: 'icomoon',
527527
),
528528
color: GFColors.WHITE,

‎lib/screens/checkbox-listtile/checkbox_listtile.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class _CheckboxListtileState extends State<CheckboxListtile> {
1515
Widget build(BuildContext context) {
1616
return Scaffold(
1717
body: Layout(
18-
demoImageUrl: 'lib/assets/gif/ratings.gif',
18+
demoImageUrl: 'lib/assets/gif/Checkboxlist.gif',
1919
body: ListView(
2020
children: <Widget>[
2121
Text(
@@ -26,9 +26,12 @@ class _CheckboxListtileState extends State<CheckboxListtile> {
2626
height: 20,
2727
),
2828
Text(
29-
"A ListTile with a Checkbox. In other words, a checkbox with a label.The entire list tile is interactive: tapping anywhere in the tile toggles the checkbox.",
29+
"A ListTile with a Checkbox. In other words, a checkbox with a label.The entire list tile is interactive tapping anywhere in the tile toggles the checkbox.",
3030
style: hintStyleTextblackdull(),
3131
),
32+
SizedBox(
33+
height: 30,
34+
),
3235
GFCheckboxListTile(
3336
titleText: 'hi',
3437
subtitleText: 'Happy Ugadi',

0 commit comments

Comments
 (0)