Skip to content

Commit f704550

Browse files
authored
Merge pull request #40 from ionicfirebaseapp/master
master pull
2 parents 018b571 + 3fae141 commit f704550

29 files changed

+1822
-147
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: 264 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,264 @@
1-
1+
# Generated by pub
2+
# See https://dart.dev/tools/pub/glossary#lockfile
3+
packages:
4+
async:
5+
dependency: transitive
6+
description:
7+
name: async
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "2.4.2"
11+
boolean_selector:
12+
dependency: transitive
13+
description:
14+
name: boolean_selector
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "2.0.0"
18+
characters:
19+
dependency: transitive
20+
description:
21+
name: characters
22+
url: "https://pub.dartlang.org"
23+
source: hosted
24+
version: "1.0.0"
25+
charcode:
26+
dependency: transitive
27+
description:
28+
name: charcode
29+
url: "https://pub.dartlang.org"
30+
source: hosted
31+
version: "1.1.3"
32+
clock:
33+
dependency: transitive
34+
description:
35+
name: clock
36+
url: "https://pub.dartlang.org"
37+
source: hosted
38+
version: "1.0.1"
39+
collection:
40+
dependency: transitive
41+
description:
42+
name: collection
43+
url: "https://pub.dartlang.org"
44+
source: hosted
45+
version: "1.14.13"
46+
convert:
47+
dependency: transitive
48+
description:
49+
name: convert
50+
url: "https://pub.dartlang.org"
51+
source: hosted
52+
version: "2.1.1"
53+
cupertino_icons:
54+
dependency: "direct main"
55+
description:
56+
name: cupertino_icons
57+
url: "https://pub.dartlang.org"
58+
source: hosted
59+
version: "0.1.3"
60+
fake_async:
61+
dependency: transitive
62+
description:
63+
name: fake_async
64+
url: "https://pub.dartlang.org"
65+
source: hosted
66+
version: "1.1.0"
67+
flutter:
68+
dependency: "direct main"
69+
description: flutter
70+
source: sdk
71+
version: "0.0.0"
72+
flutter_svg:
73+
dependency: "direct main"
74+
description:
75+
name: flutter_svg
76+
url: "https://pub.dartlang.org"
77+
source: hosted
78+
version: "0.18.1"
79+
flutter_test:
80+
dependency: "direct dev"
81+
description: flutter
82+
source: sdk
83+
version: "0.0.0"
84+
flutter_web_plugins:
85+
dependency: transitive
86+
description: flutter
87+
source: sdk
88+
version: "0.0.0"
89+
getwidget:
90+
dependency: "direct main"
91+
description:
92+
path: ".."
93+
relative: true
94+
source: path
95+
version: "1.1.3"
96+
matcher:
97+
dependency: transitive
98+
description:
99+
name: matcher
100+
url: "https://pub.dartlang.org"
101+
source: hosted
102+
version: "0.12.8"
103+
meta:
104+
dependency: transitive
105+
description:
106+
name: meta
107+
url: "https://pub.dartlang.org"
108+
source: hosted
109+
version: "1.1.8"
110+
path:
111+
dependency: transitive
112+
description:
113+
name: path
114+
url: "https://pub.dartlang.org"
115+
source: hosted
116+
version: "1.7.0"
117+
path_drawing:
118+
dependency: transitive
119+
description:
120+
name: path_drawing
121+
url: "https://pub.dartlang.org"
122+
source: hosted
123+
version: "0.4.1+1"
124+
path_parsing:
125+
dependency: transitive
126+
description:
127+
name: path_parsing
128+
url: "https://pub.dartlang.org"
129+
source: hosted
130+
version: "0.1.4"
131+
petitparser:
132+
dependency: transitive
133+
description:
134+
name: petitparser
135+
url: "https://pub.dartlang.org"
136+
source: hosted
137+
version: "3.0.4"
138+
platform_detect:
139+
dependency: transitive
140+
description:
141+
name: platform_detect
142+
url: "https://pub.dartlang.org"
143+
source: hosted
144+
version: "1.4.0"
145+
plugin_platform_interface:
146+
dependency: transitive
147+
description:
148+
name: plugin_platform_interface
149+
url: "https://pub.dartlang.org"
150+
source: hosted
151+
version: "1.0.2"
152+
pub_semver:
153+
dependency: transitive
154+
description:
155+
name: pub_semver
156+
url: "https://pub.dartlang.org"
157+
source: hosted
158+
version: "1.4.4"
159+
sky_engine:
160+
dependency: transitive
161+
description: flutter
162+
source: sdk
163+
version: "0.0.99"
164+
source_span:
165+
dependency: transitive
166+
description:
167+
name: source_span
168+
url: "https://pub.dartlang.org"
169+
source: hosted
170+
version: "1.7.0"
171+
stack_trace:
172+
dependency: transitive
173+
description:
174+
name: stack_trace
175+
url: "https://pub.dartlang.org"
176+
source: hosted
177+
version: "1.9.5"
178+
stream_channel:
179+
dependency: transitive
180+
description:
181+
name: stream_channel
182+
url: "https://pub.dartlang.org"
183+
source: hosted
184+
version: "2.0.0"
185+
string_scanner:
186+
dependency: transitive
187+
description:
188+
name: string_scanner
189+
url: "https://pub.dartlang.org"
190+
source: hosted
191+
version: "1.0.5"
192+
term_glyph:
193+
dependency: transitive
194+
description:
195+
name: term_glyph
196+
url: "https://pub.dartlang.org"
197+
source: hosted
198+
version: "1.1.0"
199+
test_api:
200+
dependency: transitive
201+
description:
202+
name: test_api
203+
url: "https://pub.dartlang.org"
204+
source: hosted
205+
version: "0.2.17"
206+
typed_data:
207+
dependency: transitive
208+
description:
209+
name: typed_data
210+
url: "https://pub.dartlang.org"
211+
source: hosted
212+
version: "1.2.0"
213+
url_launcher:
214+
dependency: "direct main"
215+
description:
216+
name: url_launcher
217+
url: "https://pub.dartlang.org"
218+
source: hosted
219+
version: "5.5.3"
220+
url_launcher_linux:
221+
dependency: transitive
222+
description:
223+
name: url_launcher_linux
224+
url: "https://pub.dartlang.org"
225+
source: hosted
226+
version: "0.0.1+1"
227+
url_launcher_macos:
228+
dependency: transitive
229+
description:
230+
name: url_launcher_macos
231+
url: "https://pub.dartlang.org"
232+
source: hosted
233+
version: "0.0.1+7"
234+
url_launcher_platform_interface:
235+
dependency: transitive
236+
description:
237+
name: url_launcher_platform_interface
238+
url: "https://pub.dartlang.org"
239+
source: hosted
240+
version: "1.0.8"
241+
url_launcher_web:
242+
dependency: transitive
243+
description:
244+
name: url_launcher_web
245+
url: "https://pub.dartlang.org"
246+
source: hosted
247+
version: "0.1.3+2"
248+
vector_math:
249+
dependency: transitive
250+
description:
251+
name: vector_math
252+
url: "https://pub.dartlang.org"
253+
source: hosted
254+
version: "2.0.8"
255+
xml:
256+
dependency: transitive
257+
description:
258+
name: xml
259+
url: "https://pub.dartlang.org"
260+
source: hosted
261+
version: "4.2.0"
262+
sdks:
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,

0 commit comments

Comments
 (0)