Skip to content

Commit 5756757

Browse files
committed
master pull
2 parents 22f06d2 + f704550 commit 5756757

29 files changed

+1585
-167
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[![pub package](https://img.shields.io/pub/v/getwidget.svg)](https://pub.dartlang.org/packages/getwidget) [![Build Status](https://travis-ci.org/ionicfirebaseapp/getwidget.svg?branch=master)](https://travis-ci.com/ionicfirebaseapp/getwidget) [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/MIT) [![License](https://img.shields.io/badge/license-MIT-orange.svg)](https://github.com/ionicfirebaseapp/getwidget/blob/master/LICENSE) [![Twitter Follow](https://img.shields.io/twitter/follow/getwidgetdev.svg?style=social)](https://twitter.com/getwidgetdev)
22

3-
43
<p align="center">
54
<a href="https://docs.getwidget.dev/" target="_blank">
65
<img src="https://ik.imagekit.io/ionicfirebaseapp/logo.black_iOBoLWdj2I.png" alt="GetWidget">
@@ -28,6 +27,7 @@
2827
</p>
2928

3029

30+
3131
## Quick start
3232

3333
Read the [Getting started page](https://docs.getwidget.dev)

example/pubspec.lock

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.5.0-nullsafety"
10+
version: "2.4.2"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "2.1.0-nullsafety"
17+
version: "2.0.0"
1818
characters:
1919
dependency: transitive
2020
description:
2121
name: characters
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "1.1.0-nullsafety.2"
24+
version: "1.0.0"
2525
charcode:
2626
dependency: transitive
2727
description:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0-nullsafety"
31+
version: "1.1.3"
3232
clock:
3333
dependency: transitive
3434
description:
3535
name: clock
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "1.1.0-nullsafety"
38+
version: "1.0.1"
3939
collection:
4040
dependency: transitive
4141
description:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.15.0-nullsafety.2"
45+
version: "1.14.13"
4646
convert:
4747
dependency: transitive
4848
description:
@@ -63,7 +63,7 @@ packages:
6363
name: fake_async
6464
url: "https://pub.dartlang.org"
6565
source: hosted
66-
version: "1.1.0-nullsafety"
66+
version: "1.1.0"
6767
flutter:
6868
dependency: "direct main"
6969
description: flutter
@@ -99,21 +99,21 @@ packages:
9999
name: matcher
100100
url: "https://pub.dartlang.org"
101101
source: hosted
102-
version: "0.12.10-nullsafety"
102+
version: "0.12.8"
103103
meta:
104104
dependency: transitive
105105
description:
106106
name: meta
107107
url: "https://pub.dartlang.org"
108108
source: hosted
109-
version: "1.3.0-nullsafety.2"
109+
version: "1.1.8"
110110
path:
111111
dependency: transitive
112112
description:
113113
name: path
114114
url: "https://pub.dartlang.org"
115115
source: hosted
116-
version: "1.8.0-nullsafety"
116+
version: "1.7.0"
117117
path_drawing:
118118
dependency: transitive
119119
description:
@@ -134,7 +134,7 @@ packages:
134134
name: petitparser
135135
url: "https://pub.dartlang.org"
136136
source: hosted
137-
version: "3.1.0"
137+
version: "3.0.4"
138138
platform_detect:
139139
dependency: transitive
140140
description:
@@ -167,56 +167,56 @@ packages:
167167
name: source_span
168168
url: "https://pub.dartlang.org"
169169
source: hosted
170-
version: "1.8.0-nullsafety"
170+
version: "1.7.0"
171171
stack_trace:
172172
dependency: transitive
173173
description:
174174
name: stack_trace
175175
url: "https://pub.dartlang.org"
176176
source: hosted
177-
version: "1.10.0-nullsafety"
177+
version: "1.9.5"
178178
stream_channel:
179179
dependency: transitive
180180
description:
181181
name: stream_channel
182182
url: "https://pub.dartlang.org"
183183
source: hosted
184-
version: "2.1.0-nullsafety"
184+
version: "2.0.0"
185185
string_scanner:
186186
dependency: transitive
187187
description:
188188
name: string_scanner
189189
url: "https://pub.dartlang.org"
190190
source: hosted
191-
version: "1.1.0-nullsafety"
191+
version: "1.0.5"
192192
term_glyph:
193193
dependency: transitive
194194
description:
195195
name: term_glyph
196196
url: "https://pub.dartlang.org"
197197
source: hosted
198-
version: "1.2.0-nullsafety"
198+
version: "1.1.0"
199199
test_api:
200200
dependency: transitive
201201
description:
202202
name: test_api
203203
url: "https://pub.dartlang.org"
204204
source: hosted
205-
version: "0.2.19-nullsafety"
205+
version: "0.2.17"
206206
typed_data:
207207
dependency: transitive
208208
description:
209209
name: typed_data
210210
url: "https://pub.dartlang.org"
211211
source: hosted
212-
version: "1.3.0-nullsafety.2"
212+
version: "1.2.0"
213213
url_launcher:
214214
dependency: "direct main"
215215
description:
216216
name: url_launcher
217217
url: "https://pub.dartlang.org"
218218
source: hosted
219-
version: "5.6.0"
219+
version: "5.5.3"
220220
url_launcher_linux:
221221
dependency: transitive
222222
description:
@@ -230,7 +230,7 @@ packages:
230230
name: url_launcher_macos
231231
url: "https://pub.dartlang.org"
232232
source: hosted
233-
version: "0.0.1+8"
233+
version: "0.0.1+7"
234234
url_launcher_platform_interface:
235235
dependency: transitive
236236
description:
@@ -245,27 +245,20 @@ packages:
245245
url: "https://pub.dartlang.org"
246246
source: hosted
247247
version: "0.1.3+2"
248-
url_launcher_windows:
249-
dependency: transitive
250-
description:
251-
name: url_launcher_windows
252-
url: "https://pub.dartlang.org"
253-
source: hosted
254-
version: "0.0.1+1"
255248
vector_math:
256249
dependency: transitive
257250
description:
258251
name: vector_math
259252
url: "https://pub.dartlang.org"
260253
source: hosted
261-
version: "2.1.0-nullsafety.2"
254+
version: "2.0.8"
262255
xml:
263256
dependency: transitive
264257
description:
265258
name: xml
266259
url: "https://pub.dartlang.org"
267260
source: hosted
268-
version: "4.5.1"
261+
version: "4.2.0"
269262
sdks:
270-
dart: ">=2.10.0-0.0.dev <2.10.0"
271-
flutter: ">=1.18.0-6.0.pre <2.0.0"
263+
dart: ">=2.9.0-14.0.dev <3.0.0"
264+
flutter: ">=1.18.0-6.0.pre <2.0.0"

example/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ dependencies:
1111
sdk: flutter
1212
getwidget:
1313
path: ../
14-
cupertino_icons: ^0.1.2
15-
flutter_svg: ^0.18.0
16-
url_launcher: ^5.4.1
14+
cupertino_icons: ^0.1.3
15+
flutter_svg: ^0.18.1
16+
url_launcher: ^5.5.3
1717

1818
dev_dependencies:
1919
flutter_test:

lib/components/accordian/gf_accordian.dart

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ class GFAccordion extends StatefulWidget {
1717
this.contentPadding = const EdgeInsets.all(10),
1818
this.contentChild,
1919
this.titleBorder = const Border(),
20-
this.contentborder = const Border(),
20+
this.contentBorder = const Border(),
2121
this.margin,
2222
this.showAccordion = false,
2323
this.onToggleCollapsed,
2424
this.titleBorderRadius = const BorderRadius.all(Radius.circular(0)),
2525
this.contentBorderRadius = const BorderRadius.all(Radius.circular(0))})
2626
: super(key: key);
2727

28-
final Function(bool) onToggleCollapsed;
29-
3028
/// controls if the accordion should be collapsed or not making it possible to be controlled from outside
3129
final bool showAccordion;
3230

@@ -45,10 +43,10 @@ class GFAccordion extends StatefulWidget {
4543
/// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] title when it is expanded
4644
final Color expandedTitleBackgroundColor;
4745

48-
///collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
46+
/// collapsedIcon of type [Widget] which is used to show when the [GFAccordion] is collapsed
4947
final Widget collapsedIcon;
5048

51-
///expandedIcon of type[Widget] which is used when the [GFAccordion] is expanded
49+
/// expandedIcon of type[Widget] which is used when the [GFAccordion] is expanded
5250
final Widget expandedIcon;
5351

5452
/// text of type [String] is alternative to child. text will get priority over titleChild
@@ -57,30 +55,33 @@ class GFAccordion extends StatefulWidget {
5755
/// textStyle of type [textStyle] will be applicable to text only and not for the child
5856
final TextStyle textStyle;
5957

60-
///titlePadding of type [EdgeInsets] which is used to set the padding of the [GFAccordion] title
58+
/// titlePadding of type [EdgeInsets] which is used to set the padding of the [GFAccordion] title
6159
final EdgeInsets titlePadding;
6260

63-
///descriptionPadding of type [EdgeInsets] which is used to set the padding of the [GFAccordion] description
61+
/// descriptionPadding of type [EdgeInsets] which is used to set the padding of the [GFAccordion] description
6462
final EdgeInsets contentPadding;
6563

6664
/// type of [Color] or [GFColors] which is used to change the background color of the [GFAccordion] description
6765
final Color contentBackgroundColor;
6866

69-
///margin of type [EdgeInsets] which is used to set the margin of the [GFAccordion]
67+
/// margin of type [EdgeInsets] which is used to set the margin of the [GFAccordion]
7068
final EdgeInsets margin;
7169

72-
///titleBorderColor of type [Color] or [GFColors] which is used to change the border color of title
70+
/// titleBorderColor of type [Color] or [GFColors] which is used to change the border color of title
7371
final Border titleBorder;
7472

75-
///contentBorderColor of type [Color] or [GFColors] which is used to change the border color of content
76-
final Border contentborder;
73+
/// contentBorderColor of type [Color] or [GFColors] which is used to change the border color of content
74+
final Border contentBorder;
7775

78-
///titleBorderRadius of type [Radius] which is used to change the border radius of title
76+
/// titleBorderRadius of type [Radius] which is used to change the border radius of title
7977
final BorderRadius titleBorderRadius;
8078

81-
///contentBorderRadius of type [Radius] which is used to change the border radius of content
79+
/// contentBorderRadius of type [Radius] which is used to change the border radius of content
8280
final BorderRadius contentBorderRadius;
8381

82+
/// function called when the content body collapsed
83+
final Function(bool) onToggleCollapsed;
84+
8485
@override
8586
_GFAccordionState createState() => _GFAccordionState();
8687
}
@@ -95,14 +96,10 @@ class _GFAccordionState extends State<GFAccordion>
9596
@override
9697
void initState() {
9798
showAccordion = widget.showAccordion;
98-
animationController = AnimationController(
99-
duration: const Duration(seconds: 2),
100-
vsync: this,
101-
);
99+
animationController =
100+
AnimationController(duration: const Duration(seconds: 2), vsync: this);
102101
controller = AnimationController(
103-
vsync: this,
104-
duration: const Duration(milliseconds: 300),
105-
);
102+
duration: const Duration(milliseconds: 300), vsync: this);
106103
offset = Tween(
107104
begin: const Offset(0, -0.06),
108105
end: Offset.zero,
@@ -156,7 +153,7 @@ class _GFAccordionState extends State<GFAccordion>
156153
? Container(
157154
decoration: BoxDecoration(
158155
borderRadius: widget.contentBorderRadius,
159-
border: widget.contentborder,
156+
border: widget.contentBorder,
160157
color: widget.contentBackgroundColor ?? Colors.white70,
161158
),
162159
width: MediaQuery.of(context).size.width,

lib/components/alert/gf_alert.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
6767
@override
6868
void initState() {
6969
animationController = AnimationController(
70-
duration: const Duration(milliseconds: 300),
71-
vsync: this,
72-
);
70+
duration: const Duration(milliseconds: 300), vsync: this);
7371
animation = CurvedAnimation(
7472
parent: animationController,
7573
curve: Curves.fastOutSlowIn,

0 commit comments

Comments
 (0)