Skip to content

Commit 771207c

Browse files
shravyackmshravyackm
committed
master pull
2 parents 2ddb667 + bd4ea44 commit 771207c

File tree

17 files changed

+1096
-484
lines changed

17 files changed

+1096
-484
lines changed

‎example/pubspec.lock‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,66 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10+
<<<<<<< HEAD
1011
version: "2.5.0-nullsafety"
12+
=======
13+
version: "2.4.2"
14+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
1115
boolean_selector:
1216
dependency: transitive
1317
description:
1418
name: boolean_selector
1519
url: "https://pub.dartlang.org"
1620
source: hosted
21+
<<<<<<< HEAD
1722
version: "2.1.0-nullsafety"
23+
=======
24+
version: "2.0.0"
25+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
1826
characters:
1927
dependency: transitive
2028
description:
2129
name: characters
2230
url: "https://pub.dartlang.org"
2331
source: hosted
32+
<<<<<<< HEAD
2433
version: "1.1.0-nullsafety.2"
34+
=======
35+
version: "1.0.0"
36+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
2537
charcode:
2638
dependency: transitive
2739
description:
2840
name: charcode
2941
url: "https://pub.dartlang.org"
3042
source: hosted
43+
<<<<<<< HEAD
3144
version: "1.2.0-nullsafety"
45+
=======
46+
version: "1.1.3"
47+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
3248
clock:
3349
dependency: transitive
3450
description:
3551
name: clock
3652
url: "https://pub.dartlang.org"
3753
source: hosted
54+
<<<<<<< HEAD
3855
version: "1.1.0-nullsafety"
56+
=======
57+
version: "1.0.1"
58+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
3959
collection:
4060
dependency: transitive
4161
description:
4262
name: collection
4363
url: "https://pub.dartlang.org"
4464
source: hosted
65+
<<<<<<< HEAD
4566
version: "1.15.0-nullsafety.2"
67+
=======
68+
version: "1.14.13"
69+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
4670
convert:
4771
dependency: transitive
4872
description:
@@ -63,7 +87,11 @@ packages:
6387
name: fake_async
6488
url: "https://pub.dartlang.org"
6589
source: hosted
90+
<<<<<<< HEAD
6691
version: "1.1.0-nullsafety"
92+
=======
93+
version: "1.1.0"
94+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
6795
flutter:
6896
dependency: "direct main"
6997
description: flutter
@@ -99,7 +127,11 @@ packages:
99127
name: matcher
100128
url: "https://pub.dartlang.org"
101129
source: hosted
130+
<<<<<<< HEAD
102131
version: "0.12.10-nullsafety"
132+
=======
133+
version: "0.12.8"
134+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
103135
meta:
104136
dependency: transitive
105137
description:
@@ -113,7 +145,11 @@ packages:
113145
name: path
114146
url: "https://pub.dartlang.org"
115147
source: hosted
148+
<<<<<<< HEAD
116149
version: "1.8.0-nullsafety"
150+
=======
151+
version: "1.7.0"
152+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
117153
path_drawing:
118154
dependency: transitive
119155
description:
@@ -153,14 +189,22 @@ packages:
153189
name: source_span
154190
url: "https://pub.dartlang.org"
155191
source: hosted
192+
<<<<<<< HEAD
156193
version: "1.8.0-nullsafety"
194+
=======
195+
version: "1.7.0"
196+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
157197
stack_trace:
158198
dependency: transitive
159199
description:
160200
name: stack_trace
161201
url: "https://pub.dartlang.org"
162202
source: hosted
203+
<<<<<<< HEAD
163204
version: "1.10.0-nullsafety"
205+
=======
206+
version: "1.9.5"
207+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
164208
stream_channel:
165209
dependency: transitive
166210
description:
@@ -188,14 +232,22 @@ packages:
188232
name: test_api
189233
url: "https://pub.dartlang.org"
190234
source: hosted
235+
<<<<<<< HEAD
191236
version: "0.2.19-nullsafety"
237+
=======
238+
version: "0.2.17"
239+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
192240
typed_data:
193241
dependency: transitive
194242
description:
195243
name: typed_data
196244
url: "https://pub.dartlang.org"
197245
source: hosted
246+
<<<<<<< HEAD
198247
version: "1.3.0-nullsafety.2"
248+
=======
249+
version: "1.2.0"
250+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
199251
url_launcher:
200252
dependency: "direct main"
201253
description:
@@ -239,5 +291,9 @@ packages:
239291
source: hosted
240292
version: "4.2.0"
241293
sdks:
294+
<<<<<<< HEAD
242295
dart: ">=2.10.0-0.0.dev <2.10.0"
296+
=======
297+
dart: ">=2.9.0-14.0.dev <3.0.0"
298+
>>>>>>> bd4ea44a12e13d52c4f00d32ba891d0da56fde3c
243299
flutter: ">=1.18.0-6.0.pre <2.0.0"

‎lib/components/accordian/gf_accordian.dart‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@ class GFAccordion extends StatefulWidget {
66
{Key key,
77
this.titleChild,
88
this.content,
9-
this.collapsedTitlebackgroundColor = GFColors.WHITE,
10-
this.expandedTitlebackgroundColor = const Color(0xFFE0E0E0),
9+
this.collapsedTitleBackgroundColor = GFColors.WHITE,
10+
this.expandedTitleBackgroundColor = const Color(0xFFE0E0E0),
1111
this.collapsedIcon = const Icon(Icons.keyboard_arrow_down),
1212
this.expandedIcon = const Icon(Icons.keyboard_arrow_up),
1313
this.title,
1414
this.textStyle = const TextStyle(color: Colors.black, fontSize: 16),
1515
this.titlePadding = const EdgeInsets.all(10),
16-
this.contentbackgroundColor,
16+
this.contentBackgroundColor,
1717
this.contentPadding = const EdgeInsets.all(10),
1818
this.contentChild,
19-
this.titleborder = const Border(),
20-
this.contentBorder = const Border(),
19+
this.titleBorder = const Border(),
20+
this.contentborder = const Border(),
2121
this.margin,
2222
this.showAccordion = false,
23-
this.onToggleCollapsed})
23+
this.onToggleCollapsed,
24+
this.titleBorderRadius = const BorderRadius.all(Radius.circular(0)),
25+
this.contentBorderRadius = const BorderRadius.all(Radius.circular(0))})
2426
: super(key: key);
2527

2628
final Function(bool) onToggleCollapsed;
@@ -38,10 +40,10 @@ class GFAccordion extends StatefulWidget {
3840
final Widget contentChild;
3941

4042
/// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is collapsed
41-
final Color collapsedTitlebackgroundColor;
43+
final Color collapsedTitleBackgroundColor;
4244

4345
/// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is expanded
44-
final Color expandedTitlebackgroundColor;
46+
final Color expandedTitleBackgroundColor;
4547

4648
///collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
4749
final Widget collapsedIcon;
@@ -62,16 +64,22 @@ class GFAccordion extends StatefulWidget {
6264
final EdgeInsets contentPadding;
6365

6466
/// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] description
65-
final Color contentbackgroundColor;
67+
final Color contentBackgroundColor;
6668

6769
///margin of type [EdgeInsets] which is used to set the margin of the [GFAccordion]
6870
final EdgeInsets margin;
6971

70-
///titleborderColor of type [Color] or [GFColors] which is used to change the border color of title
71-
final Border titleborder;
72+
///titleBorderColor of type [Color] or [GFColors] which is used to change the border color of title
73+
final Border titleBorder;
7274

7375
///contentBorderColor of type [Color] or [GFColors] which is used to change the border color of content
74-
final Border contentBorder;
76+
final Border contentborder;
77+
78+
///titleBorderRadius of type [Radius] which is used to change the border radius of title
79+
final BorderRadius titleBorderRadius;
80+
81+
///contentBorderRadius of type [Radius] which is used to change the border radius of content
82+
final BorderRadius contentBorderRadius;
7583

7684
@override
7785
_GFAccordionState createState() => _GFAccordionState();
@@ -124,10 +132,11 @@ class _GFAccordionState extends State<GFAccordion>
124132
onTap: _toggleCollapsed,
125133
child: Container(
126134
decoration: BoxDecoration(
127-
border: widget.titleborder,
135+
borderRadius: widget.titleBorderRadius,
136+
border: widget.titleBorder,
128137
color: showAccordion
129-
? widget.expandedTitlebackgroundColor
130-
: widget.collapsedTitlebackgroundColor,
138+
? widget.expandedTitleBackgroundColor
139+
: widget.collapsedTitleBackgroundColor,
131140
),
132141
padding: widget.titlePadding,
133142
child: Row(
@@ -146,8 +155,9 @@ class _GFAccordionState extends State<GFAccordion>
146155
showAccordion
147156
? Container(
148157
decoration: BoxDecoration(
149-
border: widget.contentBorder,
150-
color: widget.contentbackgroundColor ?? Colors.white70,
158+
borderRadius: widget.contentBorderRadius,
159+
border: widget.contentborder,
160+
color: widget.contentBackgroundColor ?? Colors.white70,
151161
),
152162
width: MediaQuery.of(context).size.width,
153163
padding: widget.contentPadding,

‎lib/components/alert/gf_alert.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
109109
: GFColors.WHITE,
110110
boxShadow: [
111111
BoxShadow(
112-
color: Colors.black.withOpacity(0.40), blurRadius: 3)
112+
color: Colors.black.withOpacity(0.10), blurRadius: 2)
113113
]),
114114
child: Column(
115115
crossAxisAlignment: CrossAxisAlignment.start,

0 commit comments

Comments
 (0)