Skip to content

Commit a5dd791

Browse files
authored
Merge pull request #38 from ionicfirebaseapp/master
master pull
2 parents d69bdb4 + aee3617 commit a5dd791

File tree

14 files changed

+455
-50
lines changed

14 files changed

+455
-50
lines changed

example/pubspec.lock

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,10 @@ class _GFAccordionState extends State<GFAccordion>
9595
@override
9696
void initState() {
9797
showAccordion = widget.showAccordion;
98-
animationController = AnimationController(
99-
duration: const Duration(seconds: 2),
100-
);
98+
animationController =
99+
AnimationController(duration: const Duration(seconds: 2), vsync: this);
101100
controller = AnimationController(
102-
duration: const Duration(milliseconds: 300),
103-
);
101+
duration: const Duration(milliseconds: 300), vsync: this);
104102
offset = Tween(
105103
begin: const Offset(0, -0.06),
106104
end: Offset.zero,

lib/components/alert/gf_alert.dart

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

lib/components/animation/gf_animation.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ class _GFAnimationState extends State<GFAnimation>
118118
if (widget.type == GFAnimationType.rotateTransition) {
119119
controller = widget.controller ??
120120
AnimationController(
121-
duration: widget.duration ?? const Duration(seconds: 2));
121+
duration: widget.duration ?? const Duration(seconds: 2),
122+
vsync: this);
122123
animation = widget.turnsAnimation ??
123124
Tween<double>(begin: 0, end: 20).animate(controller);
124125
if (widget.turnsAnimation == null) {
@@ -127,15 +128,16 @@ class _GFAnimationState extends State<GFAnimation>
127128
} else if (widget.type == GFAnimationType.scaleTransition) {
128129
controller = widget.controller ??
129130
AnimationController(
130-
duration: widget.duration ?? const Duration(seconds: 2));
131+
duration: widget.duration ?? const Duration(seconds: 2),
132+
vsync: this);
131133
animation = widget.scaleAnimation ??
132134
CurvedAnimation(
133135
parent: controller, curve: widget.curve ?? Curves.ease);
134136
controller.forward();
135137
} else if (widget.type == GFAnimationType.slideTransition) {
136138
controller = AnimationController(
137-
duration: widget.duration ?? const Duration(seconds: 2),
138-
)..repeat(reverse: true);
139+
duration: widget.duration ?? const Duration(seconds: 2), vsync: this)
140+
..repeat(reverse: true);
139141
offsetAnimation = Tween<Offset>(
140142
begin: Offset.zero,
141143
end: const Offset(1.5, 0),

0 commit comments

Comments
 (0)