Skip to content

Commit e0a427d

Browse files
author
srinivas
committed
local changes
2 parents 84f0f14 + 82b87ce commit e0a427d

File tree

19 files changed

+586
-312
lines changed

19 files changed

+586
-312
lines changed

example/lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class MyApp extends StatelessWidget {
1414
);
1515
}
1616

17-
//
1817
class MyHomePage extends StatefulWidget {
1918
@override
2019
_MyHomePageState createState() => _MyHomePageState();

example/pubspec.lock

Lines changed: 0 additions & 243 deletions
Original file line numberDiff line numberDiff line change
@@ -1,243 +0,0 @@
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-
plugin_platform_interface:
139-
dependency: transitive
140-
description:
141-
name: plugin_platform_interface
142-
url: "https://pub.dartlang.org"
143-
source: hosted
144-
version: "1.0.1"
145-
sky_engine:
146-
dependency: transitive
147-
description: flutter
148-
source: sdk
149-
version: "0.0.99"
150-
source_span:
151-
dependency: transitive
152-
description:
153-
name: source_span
154-
url: "https://pub.dartlang.org"
155-
source: hosted
156-
version: "1.7.0"
157-
stack_trace:
158-
dependency: transitive
159-
description:
160-
name: stack_trace
161-
url: "https://pub.dartlang.org"
162-
source: hosted
163-
version: "1.9.5"
164-
stream_channel:
165-
dependency: transitive
166-
description:
167-
name: stream_channel
168-
url: "https://pub.dartlang.org"
169-
source: hosted
170-
version: "2.0.0"
171-
string_scanner:
172-
dependency: transitive
173-
description:
174-
name: string_scanner
175-
url: "https://pub.dartlang.org"
176-
source: hosted
177-
version: "1.0.5"
178-
term_glyph:
179-
dependency: transitive
180-
description:
181-
name: term_glyph
182-
url: "https://pub.dartlang.org"
183-
source: hosted
184-
version: "1.1.0"
185-
test_api:
186-
dependency: transitive
187-
description:
188-
name: test_api
189-
url: "https://pub.dartlang.org"
190-
source: hosted
191-
version: "0.2.17"
192-
typed_data:
193-
dependency: transitive
194-
description:
195-
name: typed_data
196-
url: "https://pub.dartlang.org"
197-
source: hosted
198-
version: "1.2.0"
199-
url_launcher:
200-
dependency: "direct main"
201-
description:
202-
name: url_launcher
203-
url: "https://pub.dartlang.org"
204-
source: hosted
205-
version: "5.4.1"
206-
url_launcher_macos:
207-
dependency: transitive
208-
description:
209-
name: url_launcher_macos
210-
url: "https://pub.dartlang.org"
211-
source: hosted
212-
version: "0.0.1+2"
213-
url_launcher_platform_interface:
214-
dependency: transitive
215-
description:
216-
name: url_launcher_platform_interface
217-
url: "https://pub.dartlang.org"
218-
source: hosted
219-
version: "1.0.5"
220-
url_launcher_web:
221-
dependency: transitive
222-
description:
223-
name: url_launcher_web
224-
url: "https://pub.dartlang.org"
225-
source: hosted
226-
version: "0.1.1"
227-
vector_math:
228-
dependency: transitive
229-
description:
230-
name: vector_math
231-
url: "https://pub.dartlang.org"
232-
source: hosted
233-
version: "2.0.8"
234-
xml:
235-
dependency: transitive
236-
description:
237-
name: xml
238-
url: "https://pub.dartlang.org"
239-
source: hosted
240-
version: "4.2.0"
241-
sdks:
242-
dart: ">=2.9.0-14.0.dev <3.0.0"
243-
flutter: ">=1.18.0-6.0.pre <2.0.0"

lib/components/accordian/gf_accordian.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ class _GFAccordionState extends State<GFAccordion>
9797
showAccordion = widget.showAccordion;
9898
animationController = AnimationController(
9999
duration: const Duration(seconds: 2),
100-
vsync: this,
100+
vsync: this
101101
);
102102
controller = AnimationController(
103-
vsync: this,
104103
duration: const Duration(milliseconds: 300),
104+
vsync: this
105105
);
106106
offset = Tween(
107107
begin: const Offset(0, -0.06),

lib/components/alert/gf_alert.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
6868
void initState() {
6969
animationController = AnimationController(
7070
duration: const Duration(milliseconds: 300),
71-
vsync: this,
71+
vsync: this
7272
);
7373
animation = CurvedAnimation(
7474
parent: animationController,

lib/components/animation/gf_animation.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ 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),
122-
vsync: this);
121+
duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
123122
animation = widget.turnsAnimation ??
124123
Tween<double>(begin: 0, end: 20).animate(controller);
125124
if (widget.turnsAnimation == null) {
@@ -128,16 +127,14 @@ class _GFAnimationState extends State<GFAnimation>
128127
} else if (widget.type == GFAnimationType.scaleTransition) {
129128
controller = widget.controller ??
130129
AnimationController(
131-
vsync: this,
132-
duration: widget.duration ?? const Duration(seconds: 2));
130+
duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
133131
animation = widget.scaleAnimation ??
134132
CurvedAnimation(
135133
parent: controller, curve: widget.curve ?? Curves.ease);
136134
controller.forward();
137135
} else if (widget.type == GFAnimationType.slideTransition) {
138136
controller = AnimationController(
139-
duration: widget.duration ?? const Duration(seconds: 2),
140-
vsync: this,
137+
duration: widget.duration ?? const Duration(seconds: 2), vsync: this
141138
)..repeat(reverse: true);
142139
offsetAnimation = Tween<Offset>(
143140
begin: Offset.zero,
@@ -255,7 +252,7 @@ class _GFAnimationState extends State<GFAnimation>
255252
fontWeight: widget.fontWeight ?? FontWeight.normal,
256253
fontSize: widget.fontSize ?? 16,
257254
color: widget.color ?? Colors.blue),
258-
textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
255+
// textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
259256
textAlign: widget.textAlign ?? TextAlign.start,
260257
curve: widget.curve ?? Curves.linear,
261258
duration: widget.duration ?? const Duration(seconds: 2),

lib/components/appbar/gf_appbar.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@ class _GFAppBarState extends State<GFAppBar> {
322322
IconThemeData actionsIconTheme = widget.actionsIconTheme ??
323323
appBarTheme.actionsIconTheme ??
324324
overallIconTheme;
325-
TextStyle centerStyle = widget.textTheme?.headline5 ??
326-
appBarTheme.textTheme?.headline5 ??
327-
theme.primaryTextTheme.headline5;
328-
TextStyle sideStyle = widget.textTheme?.bodyText1 ??
329-
appBarTheme.textTheme?.bodyText1 ??
330-
theme.primaryTextTheme.bodyText1;
325+
TextStyle centerStyle = widget.textTheme?.headline ??
326+
appBarTheme.textTheme?.headline ??
327+
theme.primaryTextTheme.headline;
328+
TextStyle sideStyle = widget.textTheme?.body1 ??
329+
appBarTheme.textTheme?.body1 ??
330+
theme.primaryTextTheme.body1;
331331

332332
if (widget.toolbarOpacity != 1.0) {
333333
final double opacity = const Interval(

lib/components/avatar/gf_avatar.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class GFAvatar extends StatelessWidget {
8787
final Color foregroundColor = this.foregroundColor;
8888
assert(debugCheckHasMediaQuery(context));
8989
final ThemeData theme = Theme.of(context);
90-
TextStyle textStyle = theme.primaryTextTheme.subtitle1.copyWith(
90+
TextStyle textStyle = theme.primaryTextTheme.subtitle.copyWith(
9191
color: foregroundColor,
9292
);
9393
Color effectiveBackgroundColor = backgroundColor;

0 commit comments

Comments
 (0)